aboutsummaryrefslogtreecommitdiff
path: root/pw_package/py/pw_package
diff options
context:
space:
mode:
Diffstat (limited to 'pw_package/py/pw_package')
-rw-r--r--pw_package/py/pw_package/packages/abseil_cpp.py2
-rw-r--r--pw_package/py/pw_package/packages/fuzztest.py2
-rw-r--r--pw_package/py/pw_package/packages/googletest.py4
-rw-r--r--pw_package/py/pw_package/packages/icu.py43
-rw-r--r--pw_package/py/pw_package/packages/mbedtls.py4
-rw-r--r--pw_package/py/pw_package/packages/pico_sdk.py9
-rw-r--r--pw_package/py/pw_package/packages/picotool.py1
-rw-r--r--pw_package/py/pw_package/packages/zephyr.py16
-rw-r--r--pw_package/py/pw_package/pigweed_packages.py1
9 files changed, 64 insertions, 18 deletions
diff --git a/pw_package/py/pw_package/packages/abseil_cpp.py b/pw_package/py/pw_package/packages/abseil_cpp.py
index df880fded..96ce9dd16 100644
--- a/pw_package/py/pw_package/packages/abseil_cpp.py
+++ b/pw_package/py/pw_package/packages/abseil_cpp.py
@@ -31,7 +31,7 @@ class AbseilCPP(pw_package.git_repo.GitRepo):
'https://pigweed.googlesource.com/'
'third_party/github/abseil/abseil-cpp'
),
- commit='65109ecdf01a829bdb5e428174b3abb181e75826',
+ commit='3ab97e7212bff931a201c794fa1331960158bbfa',
**kwargs,
)
diff --git a/pw_package/py/pw_package/packages/fuzztest.py b/pw_package/py/pw_package/packages/fuzztest.py
index 5fcf92012..7b650d6bf 100644
--- a/pw_package/py/pw_package/packages/fuzztest.py
+++ b/pw_package/py/pw_package/packages/fuzztest.py
@@ -31,7 +31,7 @@ class FuzzTest(pw_package.git_repo.GitRepo):
'https://pigweed.googlesource.com/'
'third_party/github/google/fuzztest'
),
- commit='34e42dc7130ad73cb27c117ac063fe42ad92209d',
+ commit='6eb010c7223a6aa609b94d49bfc06ac88f922961',
**kwargs,
)
diff --git a/pw_package/py/pw_package/packages/googletest.py b/pw_package/py/pw_package/packages/googletest.py
index 685342484..1f1486957 100644
--- a/pw_package/py/pw_package/packages/googletest.py
+++ b/pw_package/py/pw_package/packages/googletest.py
@@ -31,7 +31,7 @@ class Googletest(pw_package.git_repo.GitRepo):
'https://pigweed.googlesource.com/'
'third_party/github/google/googletest'
),
- commit="dea0484e4d3b6a2c50055c24c5617cd662a50c5f",
+ commit="f8d7d77c06936315286eb55f8de22cd23c188571",
**kwargs,
)
@@ -41,7 +41,7 @@ class Googletest(pw_package.git_repo.GitRepo):
"Enable by running 'gn args out' and adding these lines:",
f' dir_pw_third_party_googletest = "{path}"',
' pw_unit_test_MAIN = "//third_party/googletest:gmock_main"',
- ' pw_unit_test_GOOGLETEST_BACKEND = "//third_party/googletest"',
+ ' pw_unit_test_BACKEND = "//pw_unit_test:googletest"',
)
diff --git a/pw_package/py/pw_package/packages/icu.py b/pw_package/py/pw_package/packages/icu.py
new file mode 100644
index 000000000..c7a05bdef
--- /dev/null
+++ b/pw_package/py/pw_package/packages/icu.py
@@ -0,0 +1,43 @@
+# Copyright 2023 The Pigweed Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+"""Install and check status of ICU."""
+
+import pathlib
+from typing import Sequence
+
+import pw_package.git_repo
+import pw_package.package_manager
+
+
+class ICU(pw_package.git_repo.GitRepo):
+ """Install and check status of ICU."""
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(
+ *args,
+ name="icu",
+ url=("https://fuchsia.googlesource.com/third_party/icu"),
+ commit="ef02cc27c0faceffc9345e11a35769ae92b836fb",
+ **kwargs,
+ )
+
+ def info(self, path: pathlib.Path) -> Sequence[str]:
+ return (
+ f"{self.name} installed in: {path}",
+ "Enable by running 'gn args out' and adding this line:",
+ f' dir_pw_third_party_icu = "{path}"',
+ )
+
+
+pw_package.package_manager.register(ICU)
diff --git a/pw_package/py/pw_package/packages/mbedtls.py b/pw_package/py/pw_package/packages/mbedtls.py
index cc905d2ba..a67894647 100644
--- a/pw_package/py/pw_package/packages/mbedtls.py
+++ b/pw_package/py/pw_package/packages/mbedtls.py
@@ -33,8 +33,8 @@ class MbedTLS(pw_package.git_repo.GitRepo):
"/third_party/github/ARMmbed/mbedtls",
]
),
- # mbedtls-3.2.1 released 2022-07-12
- commit='869298bffeea13b205343361b7a7daf2b210e33d',
+ # mbedtls-3.5.0 released 2023-10-04
+ commit='f7e81d97de7625648925b31e72ed0ca800cc3ad5',
**kwargs,
)
diff --git a/pw_package/py/pw_package/packages/pico_sdk.py b/pw_package/py/pw_package/packages/pico_sdk.py
index ef4713def..5337670a2 100644
--- a/pw_package/py/pw_package/packages/pico_sdk.py
+++ b/pw_package/py/pw_package/packages/pico_sdk.py
@@ -14,6 +14,7 @@
"""Install and check status of the Raspberry Pi Pico SDK."""
from contextlib import contextmanager
+import logging
import os
from pathlib import Path
from typing import Sequence
@@ -22,6 +23,8 @@ import subprocess
import pw_package.git_repo
import pw_package.package_manager
+_LOG = logging.getLogger(__package__)
+
@contextmanager
def change_working_dir(directory: Path):
@@ -52,9 +55,9 @@ class PiPicoSdk(pw_package.package_manager.Package):
# Run submodule update --init to fetch tinyusb.
with change_working_dir(path) as _pico_sdk_repo:
- subprocess.run(
- ['git', 'submodule', 'update', '--init'], capture_output=True
- )
+ command = ['git', 'submodule', 'update', '--init']
+ _LOG.info('==> %s', ' '.join(command))
+ subprocess.run(command)
def info(self, path: Path) -> Sequence[str]:
return (
diff --git a/pw_package/py/pw_package/packages/picotool.py b/pw_package/py/pw_package/packages/picotool.py
index 94acc55bb..cce15e66a 100644
--- a/pw_package/py/pw_package/packages/picotool.py
+++ b/pw_package/py/pw_package/packages/picotool.py
@@ -71,7 +71,6 @@ class Picotool(pw_package.package_manager.Package):
subprocess.run(
command,
env=env,
- capture_output=True,
check=True,
)
diff --git a/pw_package/py/pw_package/packages/zephyr.py b/pw_package/py/pw_package/packages/zephyr.py
index 89646d711..ecfaf42b1 100644
--- a/pw_package/py/pw_package/packages/zephyr.py
+++ b/pw_package/py/pw_package/packages/zephyr.py
@@ -15,7 +15,6 @@
import importlib.resources
import json
import pathlib
-import os
import subprocess
import sys
import tempfile
@@ -27,6 +26,10 @@ import pw_env_setup.virtualenv_setup
import pw_package.git_repo
import pw_package.package_manager
+# Main branch, this commit is close to the v3.6 RC3 tag which contains some
+# bug fixes for Twister and support for GTEST_SKIP()
+_ZEPHYR_COMMIT_SHA = 'f9778472105d756fff7d1e5b54353421d356ed43'
+
class Zephyr(pw_package.git_repo.GitRepo):
"""Install and check status of Zephyr."""
@@ -39,7 +42,7 @@ class Zephyr(pw_package.git_repo.GitRepo):
'https://pigweed.googlesource.com/third_party/'
'github/zephyrproject-rtos/zephyr'
),
- commit='a6eef0ba3755f2530c5ce93524e5ac4f5be30194', # v3.5 release
+ commit=_ZEPHYR_COMMIT_SHA,
**kwargs,
)
@@ -107,14 +110,11 @@ class Zephyr(pw_package.git_repo.GitRepo):
]
)
# Setup Zephyr SDK
- setup_file = 'setup.cmd' if os.name == 'nt' else 'setup.sh'
subprocess.check_call(
[
- str(core_cache_path / setup_file),
- '-t',
- 'all',
- '-c',
- '-h',
+ 'cmake',
+ '-P',
+ str(core_cache_path / 'cmake' / 'zephyr_sdk_export.cmake'),
]
)
diff --git a/pw_package/py/pw_package/pigweed_packages.py b/pw_package/py/pw_package/pigweed_packages.py
index 50b48ebc6..a69b37fcb 100644
--- a/pw_package/py/pw_package/pigweed_packages.py
+++ b/pw_package/py/pw_package/pigweed_packages.py
@@ -27,6 +27,7 @@ from pw_package.packages import emboss
from pw_package.packages import freertos
from pw_package.packages import fuzztest
from pw_package.packages import googletest
+from pw_package.packages import icu
from pw_package.packages import mbedtls
from pw_package.packages import mcuxpresso
from pw_package.packages import micro_ecc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 12:27:09 +0000