From af9be347e39ad0542566f840838334b91bcc6211 Mon Sep 17 00:00:00 2001 From: Alex Trotta Date: Wed, 14 Jan 2026 23:12:06 -0500 Subject: [PATCH 1/2] Update to latest nightly, use new index URL We've moved our wheels to this new URL. Also updating a test to account for recent Mojo changes. --- mojo/extensions.bzl | 12 ++++++------ tests/python/python_shared_library.mojo | 4 +--- tools/getshas.sh | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mojo/extensions.bzl b/mojo/extensions.bzl index 775e560..bc8646a 100644 --- a/mojo/extensions.bzl +++ b/mojo/extensions.bzl @@ -4,12 +4,12 @@ load("//mojo:mojo_host_platform.bzl", "mojo_host_platform") load("//mojo/private:mojo_gpu_toolchains_repository.bzl", "mojo_gpu_toolchains_repository") _PLATFORMS = ["linux_aarch64", "linux_x86_64", "macos_arm64"] -_DEFAULT_VERSION = "0.25.7.0.dev2025101005" +_DEFAULT_VERSION = "0.26.1.0.dev2026011405" _KNOWN_SHAS = { - "0.25.7.0.dev2025101005": { - "linux_aarch64": "ea10104453b8fe04398afaf78815f988bb12f824e1876ebbc16c3ef893d7568b", - "linux_x86_64": "5769a8930c9dddc621ba3da2ac088dd892bcc63fec0aa5f1645aa9c905247019", - "macos_arm64": "864e63f4a07af8387837e6c3f130d60fa1bc5ab66e5fc4815751ec25ebd37510", + "0.26.1.0.dev2026011405": { + "linux_aarch64": "f365b74545234d891f76db0395dfcfc41eb4591a611d361251738ba197d8281b", + "linux_x86_64": "4f0f0aa0eb6c815cd081c76a8218865a3d22d0a33fa502245d41e1a6ad836a15", + "macos_arm64": "0ea255379d009779e6a3ccda7039146f33cdd15324c3e97d659a6fb1644f2519", }, } _PLATFORM_MAPPINGS = { @@ -24,7 +24,7 @@ _NULL_SHAS = { } def _mojo_toolchain_impl(rctx): - base_url = rctx.attr.base_url or "https://dl.modular.com/public/nightly/python" + base_url = rctx.attr.base_url or "https://whl.modular.com/nightly/mojo-compiler" rctx.download_and_extract( url = "{}/mojo_compiler-{}-py3-none-{}.whl".format( base_url, diff --git a/tests/python/python_shared_library.mojo b/tests/python/python_shared_library.mojo index 20179a6..77eef70 100644 --- a/tests/python/python_shared_library.mojo +++ b/tests/python/python_shared_library.mojo @@ -18,9 +18,7 @@ fn PyInit_python_shared_library() -> PythonObject: ) return b.finalize() except e: - return abort[PythonObject]( - String("failed to create Python module: ", e) - ) + abort(String("failed to create Python module: ", e)) @export diff --git a/tools/getshas.sh b/tools/getshas.sh index e24603e..3c23753 100755 --- a/tools/getshas.sh +++ b/tools/getshas.sh @@ -14,9 +14,9 @@ fi readonly version=$1 directory=$(mktemp -d) -curl --location --fail --output "$directory/linux_x86_64" "https://dl.modular.com/public/nightly/python/mojo_compiler-$version-py3-none-manylinux_2_34_x86_64.whl" -curl --location --fail --output "$directory/linux_aarch64" "https://dl.modular.com/public/nightly/python/mojo_compiler-$version-py3-none-manylinux_2_34_aarch64.whl" -curl --location --fail --output "$directory/macos" "https://dl.modular.com/public/nightly/python/mojo_compiler-$version-py3-none-macosx_13_0_arm64.whl" +curl --location --fail --output "$directory/linux_x86_64" "https://whl.modular.com/nightly/mojo-compiler/mojo_compiler-$version-py3-none-manylinux_2_34_x86_64.whl" +curl --location --fail --output "$directory/linux_aarch64" "https://whl.modular.com/nightly/mojo-compiler/mojo_compiler-$version-py3-none-manylinux_2_34_aarch64.whl" +curl --location --fail --output "$directory/macos" "https://whl.modular.com/nightly/mojo-compiler/mojo_compiler-$version-py3-none-macosx_13_0_arm64.whl" cat < Date: Thu, 15 Jan 2026 18:54:59 +0000 Subject: [PATCH 2/2] Update link_hack for bazel HEAD --- MODULE.bazel | 6 ------ mojo/private/mojo_binary_test.bzl | 2 +- tools/build_defs/android/BUILD.bazel | 0 {mojo/private => tools/build_defs/android}/link_hack.bzl | 8 -------- 4 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 tools/build_defs/android/BUILD.bazel rename {mojo/private => tools/build_defs/android}/link_hack.bzl (64%) diff --git a/MODULE.bazel b/MODULE.bazel index dc92c2c..8036752 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -56,9 +56,3 @@ versions( dev_dependency = True, python_versions = _PYTHON_VERSIONS, ) - -link_hack = use_repo_rule("//mojo/private:link_hack.bzl", "link_hack") - -link_hack( - name = "build_bazel_rules_android", # See link_hack.bzl for details -) diff --git a/mojo/private/mojo_binary_test.bzl b/mojo/private/mojo_binary_test.bzl index 9f86ed6..7569cf5 100644 --- a/mojo/private/mojo_binary_test.bzl +++ b/mojo/private/mojo_binary_test.bzl @@ -3,11 +3,11 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") -load("@build_bazel_rules_android//:link_hack.bzl", "link_hack") # See link_hack.bzl for details load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("@rules_python//python:py_info.bzl", "PyInfo") load("//mojo:providers.bzl", "MojoInfo") +load("//tools/build_defs/android:link_hack.bzl", "link_hack") # See link_hack.bzl for details load(":transitions.bzl", "python_version_transition") load(":utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo") diff --git a/tools/build_defs/android/BUILD.bazel b/tools/build_defs/android/BUILD.bazel new file mode 100644 index 0000000..e69de29 diff --git a/mojo/private/link_hack.bzl b/tools/build_defs/android/link_hack.bzl similarity index 64% rename from mojo/private/link_hack.bzl rename to tools/build_defs/android/link_hack.bzl index 0c57ada..3fc2a7d 100644 --- a/mojo/private/link_hack.bzl +++ b/tools/build_defs/android/link_hack.bzl @@ -3,15 +3,7 @@ https://github.com/bazelbuild/bazel/pull/23838 """ -def _link_hack_impl(rctx): - rctx.file("BUILD.bazel", "") - rctx.file("link_hack.bzl", """\ load("@rules_cc//cc/common:cc_common.bzl", "cc_common") def link_hack(**kwargs): return cc_common.link(**kwargs) -""") - -link_hack = repository_rule( - implementation = _link_hack_impl, -)