Skip to content

Commit 6234b9f

Browse files
committed
more fixes
1 parent 53bb964 commit 6234b9f

File tree

7 files changed

+862
-673
lines changed

7 files changed

+862
-673
lines changed

.bazelrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ common --enable_workspace
1111
# Windows settings
1212
startup --windows_enable_symlinks
1313

14+
# Point tools such as coursier (used in rules_jvm_external) to Bazel's downloaded JDK
15+
# suggested in https://github.com/bazelbuild/rules_jvm_external/issues/445
16+
common --repo_env=JAVA_HOME=../bazel_tools/jdk
17+
common --action_env=JAVA_HOME=../bazel_tools/jdk
18+
1419
# Define value used by tests
1520
build --define=SOME_VAR=SOME_VALUE
1621

Cargo.Bazel.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "afff514f45f1d900b8218ad4704b83734c506a79afa620ac511678d84f8978af",
2+
"checksum": "aa56303cf8eaea6e963e8ba41da8c3381eff6977a795dadf3fe0b3f846012e31",
33
"crates": {
44
"addr2line 0.21.0": {
55
"name": "addr2line",
@@ -8538,7 +8538,7 @@
85388538
"Git": {
85398539
"remote": "https://github.com/peakschris/rip",
85408540
"commitish": {
8541-
"Rev": "412805fabaf3e7811ff6ac68d65d3c9f84c9d1a0"
8541+
"Rev": "3de9ee95eab577c9e48526464013e217287c6937"
85428542
},
85438543
"strip_prefix": "crates/rattler_installs_packages"
85448544
}

MODULE.bazel

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module(
1010
# When bumping, add a comment explaining what's required from the newer release.
1111
bazel_dep(name = "aspect_bazel_lib", version = "1.40.0")
1212
bazel_dep(name = "bazel_skylib", version = "1.4.2")
13-
bazel_dep(name = "rules_python", version = "0.29.0")
13+
bazel_dep(name = "rules_python", version = "0.40.0")
1414
bazel_dep(name = "platforms", version = "0.0.7")
1515

1616

@@ -21,6 +21,12 @@ python.toolchain(
2121
python_version = "3.8.12",
2222
)
2323

24+
python_stdlib_list = use_extension("@rules_python//python:extensions.bzl", "python_stdlib_list")
25+
use_repo(
26+
python_stdlib_list,
27+
"python_stdlib_list",
28+
)
29+
2430
tools = use_extension("//py:extensions.bzl", "py_tools")
2531
tools.rules_py_tools()
2632
use_repo(tools, "rules_py_tools")

internal_deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ def rules_py_internal_deps():
8787

8888
http_archive(
8989
name = "rules_python_gazelle_plugin",
90-
sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
91-
strip_prefix = "rules_python-0.31.0/gazelle",
92-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
90+
sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53",
91+
strip_prefix = "rules_python-0.40.0/gazelle",
92+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz",
9393
)
9494

9595
http_archive(

py/tools/py/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ rust-version.workspace = true
1212

1313
[dependencies]
1414
miette = { version = "5.10", features = ["fancy"] }
15+
# workaround issue with this package building with rules_rust on windows; the snap files used in their unit tests have
16+
# too long a path and import of this module is failing (even when tests are not run)
1517
rattler_installs_packages = { git = "https://github.com/peakschris/rip", rev = "3de9ee95eab577c9e48526464013e217287c6937", default-features = false, features = ["rustls-tls"] }

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
django~=4.2.7
1+
django==4.2.7
22
colorama~=0.4.0
33
click
44
pytest

requirements.txt

Lines changed: 842 additions & 666 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)