From 4d5881b8c3d34cab5baf5ae9bea68bd0ed7916e1 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 Oct 2023 09:34:40 -0700 Subject: [PATCH 1/3] Add 9.x bundles --- circuitpython_build_tools/target_versions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/circuitpython_build_tools/target_versions.py b/circuitpython_build_tools/target_versions.py index be054ab..1f807cd 100644 --- a/circuitpython_build_tools/target_versions.py +++ b/circuitpython_build_tools/target_versions.py @@ -26,4 +26,5 @@ # The name is used when constructing the zip file names. VERSIONS = [ {"tag": "8.0.0", "name": "8.x"}, + {"tag": "9.0.0-alpha.2", "name": "9.x"}, ] From af26b78ea91cdd25023a02e8c870639b65d32740 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 Oct 2023 10:11:11 -0700 Subject: [PATCH 2/3] Update mpy-cross locations --- circuitpython_build_tools/build.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/circuitpython_build_tools/build.py b/circuitpython_build_tools/build.py index 4b04604..bf6d398 100644 --- a/circuitpython_build_tools/build.py +++ b/circuitpython_build_tools/build.py @@ -38,7 +38,7 @@ IGNORE_PY = ["setup.py", "conf.py", "__init__.py"] GLOB_PATTERNS = ["*.py", "font5x8.bin"] -S3_MPY_PREFIX = "https://adafruit-circuit-python.s3.amazonaws.com/bin/mpy-cross/" +S3_MPY_PREFIX = "https://adafruit-circuit-python.s3.amazonaws.com/bin/mpy-cross" def version_string(path=None, *, valid_semver=False): version = None @@ -74,13 +74,13 @@ def mpy_cross(mpy_cross_filename, circuitpython_tag, quiet=False): uname = platform.uname() s3_url = None if uname[0].title() == 'Linux' and uname[4].lower() in ('amd64', 'x86_64'): - s3_url = f"{S3_MPY_PREFIX}mpy-cross.static-amd64-linux-{circuitpython_tag}" + s3_url = f"{S3_MPY_PREFIX}/linux-amd64/mpy-cross-linux-amd64-{circuitpython_tag}.static" elif uname[0].title() == 'Linux' and uname[4].lower() == 'armv7l': - s3_url = f"{S3_MPY_PREFIX}mpy-cross.static-raspbian-{circuitpython_tag}" - elif uname[0].title() == 'Darwin' and uname[4].lower() == 'x86_64': - s3_url = f"{S3_MPY_PREFIX}mpy-cross-macos-catalina-{circuitpython_tag}" + s3_url = f"{S3_MPY_PREFIX}/linux-raspbian/mpy-cross-linux-raspbian-{circuitpython_tag}.static-raspbian" + elif uname[0].title() == 'Darwin': + s3_url = f"{S3_MPY_PREFIX}/macos-11/mpy-cross-macos-11-{circuitpython_tag}-universal" elif uname[0].title() == "Windows" and uname[4].lower() in ("amd64", "x86_64"): - s3_url = f"{S3_MPY_PREFIX}mpy-cross.static-x64-windows-{circuitpython_tag}.exe" + s3_url = f"{S3_MPY_PREFIX}/windows/mpy-cross-windows-{circuitpython_tag}.static.exe" elif not quiet: print(f"Pre-built mpy-cross not available for sysname='{uname[0]}' release='{uname[2]}' machine='{uname[4]}'.") From 653f4e9e501443b70d14ec82037ff4398d86ddd4 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 27 Oct 2023 14:58:29 -0400 Subject: [PATCH 3/3] Use 8.2.0 mpy-cross instead of 8.0.0 Its pathname will match the 9.0.0 name. --- circuitpython_build_tools/target_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuitpython_build_tools/target_versions.py b/circuitpython_build_tools/target_versions.py index 1f807cd..e6afad0 100644 --- a/circuitpython_build_tools/target_versions.py +++ b/circuitpython_build_tools/target_versions.py @@ -25,6 +25,6 @@ # The tag specifies which version of CircuitPython to use for mpy-cross. # The name is used when constructing the zip file names. VERSIONS = [ - {"tag": "8.0.0", "name": "8.x"}, + {"tag": "8.2.0", "name": "8.x"}, {"tag": "9.0.0-alpha.2", "name": "9.x"}, ]