Skip to content

Commit ab5a349

Browse files
Ahajhakeith
andauthored
Update to latest nightly, use new index URL (#71)
We've moved our wheels to this new URL. Also updating a test to account for recent Mojo changes. --------- Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
1 parent 9844f8a commit ab5a349

7 files changed

Lines changed: 11 additions & 27 deletions

File tree

MODULE.bazel

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,3 @@ versions(
5656
dev_dependency = True,
5757
python_versions = _PYTHON_VERSIONS,
5858
)
59-
60-
link_hack = use_repo_rule("//mojo/private:link_hack.bzl", "link_hack")
61-
62-
link_hack(
63-
name = "build_bazel_rules_android", # See link_hack.bzl for details
64-
)

mojo/extensions.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ load("//mojo:mojo_host_platform.bzl", "mojo_host_platform")
44
load("//mojo/private:mojo_gpu_toolchains_repository.bzl", "mojo_gpu_toolchains_repository")
55

66
_PLATFORMS = ["linux_aarch64", "linux_x86_64", "macos_arm64"]
7-
_DEFAULT_VERSION = "0.25.7.0.dev2025101005"
7+
_DEFAULT_VERSION = "0.26.1.0.dev2026011405"
88
_KNOWN_SHAS = {
9-
"0.25.7.0.dev2025101005": {
10-
"linux_aarch64": "ea10104453b8fe04398afaf78815f988bb12f824e1876ebbc16c3ef893d7568b",
11-
"linux_x86_64": "5769a8930c9dddc621ba3da2ac088dd892bcc63fec0aa5f1645aa9c905247019",
12-
"macos_arm64": "864e63f4a07af8387837e6c3f130d60fa1bc5ab66e5fc4815751ec25ebd37510",
9+
"0.26.1.0.dev2026011405": {
10+
"linux_aarch64": "f365b74545234d891f76db0395dfcfc41eb4591a611d361251738ba197d8281b",
11+
"linux_x86_64": "4f0f0aa0eb6c815cd081c76a8218865a3d22d0a33fa502245d41e1a6ad836a15",
12+
"macos_arm64": "0ea255379d009779e6a3ccda7039146f33cdd15324c3e97d659a6fb1644f2519",
1313
},
1414
}
1515
_PLATFORM_MAPPINGS = {
@@ -24,7 +24,7 @@ _NULL_SHAS = {
2424
}
2525

2626
def _mojo_toolchain_impl(rctx):
27-
base_url = rctx.attr.base_url or "https://dl.modular.com/public/nightly/python"
27+
base_url = rctx.attr.base_url or "https://whl.modular.com/nightly/mojo-compiler"
2828
rctx.download_and_extract(
2929
url = "{}/mojo_compiler-{}-py3-none-{}.whl".format(
3030
base_url,

mojo/private/mojo_binary_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
load("@bazel_skylib//lib:paths.bzl", "paths")
44
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
55
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
6-
load("@build_bazel_rules_android//:link_hack.bzl", "link_hack") # See link_hack.bzl for details
76
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
87
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
98
load("@rules_python//python:py_info.bzl", "PyInfo")
109
load("//mojo:providers.bzl", "MojoInfo")
10+
load("//tools/build_defs/android:link_hack.bzl", "link_hack") # See link_hack.bzl for details
1111
load(":transitions.bzl", "python_version_transition")
1212
load(":utils.bzl", "MOJO_EXTENSIONS", "collect_mojoinfo")
1313

tests/python/python_shared_library.mojo

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ fn PyInit_python_shared_library() -> PythonObject:
1818
)
1919
return b.finalize()
2020
except e:
21-
return abort[PythonObject](
22-
String("failed to create Python module: ", e)
23-
)
21+
abort(String("failed to create Python module: ", e))
2422

2523

2624
@export

tools/build_defs/android/BUILD.bazel

Whitespace-only changes.
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@
33
https://github.com/bazelbuild/bazel/pull/23838
44
"""
55

6-
def _link_hack_impl(rctx):
7-
rctx.file("BUILD.bazel", "")
8-
rctx.file("link_hack.bzl", """\
96
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
107

118
def link_hack(**kwargs):
129
return cc_common.link(**kwargs)
13-
""")
14-
15-
link_hack = repository_rule(
16-
implementation = _link_hack_impl,
17-
)

tools/getshas.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ fi
1414
readonly version=$1
1515
directory=$(mktemp -d)
1616

17-
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"
18-
curl --location --fail --output "$directory/linux_aarch64" "https://dl.modular.com/public/nightly/python/mojo_compiler-$version-py3-none-manylinux_2_34_aarch64.whl"
19-
curl --location --fail --output "$directory/macos" "https://dl.modular.com/public/nightly/python/mojo_compiler-$version-py3-none-macosx_13_0_arm64.whl"
17+
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"
18+
curl --location --fail --output "$directory/linux_aarch64" "https://whl.modular.com/nightly/mojo-compiler/mojo_compiler-$version-py3-none-manylinux_2_34_aarch64.whl"
19+
curl --location --fail --output "$directory/macos" "https://whl.modular.com/nightly/mojo-compiler/mojo_compiler-$version-py3-none-macosx_13_0_arm64.whl"
2020

2121
cat <<EOF
2222
"$version": {

0 commit comments

Comments
 (0)