windows fixes

peakschris · peakschris · commit 96ac81034d3f · 2025-11-11T11:12:24.000-05:00
diff --git a/.bazelrc b/.bazelrc
@@ -6,6 +6,15 @@ test --test_output=errors
 
 # TODO(alex): enable
 common --noenable_bzlmod
+common --enable_workspace
+
+# Windows settings
+startup --windows_enable_symlinks
+
+# Point tools such as coursier (used in rules_jvm_external) to Bazel's downloaded JDK
+# suggested in https://github.com/bazelbuild/rules_jvm_external/issues/445
+common --repo_env=JAVA_HOME=../bazel_tools/jdk
+common --action_env=JAVA_HOME=../bazel_tools/jdk
 
 # Define value used by tests
 build --define=SOME_VAR=SOME_VALUE
diff --git a/.bazelversion b/.bazelversion
@@ -1,4 +1,4 @@
-7.0.2
+7.6.1
 # The first line of this file is used by Bazelisk and Bazel to be sure
 # the right version of Bazel is used to build and test this repo.
 # This also defines which version is used on CI.
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "32b494853fa6e3f2c2ea61a76720e873e7384da14889aadcba90bfcd4f1916e3",
+  "checksum": "aa56303cf8eaea6e963e8ba41da8c3381eff6977a795dadf3fe0b3f846012e31",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",
@@ -8536,9 +8536,9 @@
       "version": "0.6.0",
       "repository": {
         "Git": {
-          "remote": "https://github.com/prefix-dev/rip",
+          "remote": "https://github.com/peakschris/rip",
           "commitish": {
-            "Rev": "b047c9ec0b42125a67d35346f08b7e7848ac24f4"
+            "Rev": "3de9ee95eab577c9e48526464013e217287c6937"
           },
           "strip_prefix": "crates/rattler_installs_packages"
         }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -10,7 +10,7 @@ module(
 # When bumping, add a comment explaining what's required from the newer release.
 bazel_dep(name = "aspect_bazel_lib", version = "1.40.0")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
-bazel_dep(name = "rules_python", version = "0.29.0")
+bazel_dep(name = "rules_python", version = "0.40.0")
 bazel_dep(name = "platforms", version = "0.0.7")
 
 
@@ -21,6 +21,12 @@ python.toolchain(
     python_version = "3.8.12",
 )
 
+python_stdlib_list = use_extension("@rules_python//python:extensions.bzl", "python_stdlib_list")
+use_repo(
+    python_stdlib_list,
+    "python_stdlib_list",
+)
+
 tools = use_extension("//py:extensions.bzl", "py_tools")
 tools.rules_py_tools()
 use_repo(tools, "rules_py_tools")
@@ -38,9 +44,10 @@ register_toolchains(
 # NOTE: when publishing to BCR, we patch these to be dev_dependency, as we publish pre-built binaries
 # along with our releases.
 
+# Versions newer than 0.58 fail with https://github.com/bazelbuild/rules_rust/issues/3441
 bazel_dep(
     name = "rules_rust",
-    version = "0.38.0",
+    version = "0.58.0",
     # In released versions: dev_dependency = True
 )
 
diff --git a/e2e/repository-rule-deps/.bazelrc b/e2e/repository-rule-deps/.bazelrc
@@ -5,3 +5,6 @@ common --enable_bzlmod
 
 # The imports=[".."] only works properly when this matches the python toolchain major version.
 common --@aspect_rules_py//py:interpreter_version=3.11.6
+
+# Windows settings
+startup --windows_enable_symlinks
diff --git a/e2e/smoke/.bazelrc b/e2e/smoke/.bazelrc
@@ -1,2 +1,13 @@
 # Under Bazel 7 or later, this flag is ignored as the PyRuntimeInfo gives this information.
 common --@aspect_rules_py//py:interpreter_version=3.9.18
+
+# Windows settings
+startup --windows_enable_symlinks
+
+# Attempt to shorten paths as much as possible to avoid windows limits
+common --nolegacy_external_runfiles
+common --experimental_sibling_repository_layout
+
+common --override_module=rules_rust=d:/workdir/github/rules_rust2
+
+common --incompatible_use_plus_in_repo_names=false
diff --git a/e2e/smoke/.bazelversion b/e2e/smoke/.bazelversion
@@ -1 +1,2 @@
-../../.bazelversion
+8.2.1
+# bazel 7.0.1 and 7.6.1 fails due to path too long during git reset - tracked to bazel_tools git submodule
diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel
@@ -7,7 +7,8 @@ local_path_override(
 )
 
 # Because we use a prerelease of rules_py, we must compile the rust tools from source.
-bazel_dep(name = "rules_rust", version = "0.40.0")
+# Versions newer than 0.58 fail with https://github.com/bazelbuild/rules_rust/issues/3441
+bazel_dep(name = "rules_rust", version = "0.58.0")
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
diff --git a/e2e/system-interpreter/.bazelrc b/e2e/system-interpreter/.bazelrc
@@ -1,2 +1,5 @@
 # Under Bazel 7 or later, this flag is ignored as the PyRuntimeInfo gives this information.
 common --@aspect_rules_py//py:interpreter_version=3.9.6
+
+# Windows settings
+startup --windows_enable_symlinks
diff --git a/internal_deps.bzl b/internal_deps.bzl
@@ -87,9 +87,9 @@ def rules_py_internal_deps():
 
     http_archive(
         name = "rules_python_gazelle_plugin",
-        sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
-        strip_prefix = "rules_python-0.31.0/gazelle",
-        url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
+        sha256 = "690e0141724abb568267e003c7b6d9a54925df40c275a870a4d934161dc9dd53",
+        strip_prefix = "rules_python-0.40.0/gazelle",
+        url = "https://github.com/bazelbuild/rules_python/releases/download/0.40.0/rules_python-0.40.0.tar.gz",
     )
 
     http_archive(
diff --git a/py/private/py_binary.bzl b/py/private/py_binary.bzl
@@ -3,6 +3,7 @@
 load("@rules_python//python:defs.bzl", "PyInfo")
 load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
 load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
+load("@aspect_bazel_lib//lib:windows_utils.bzl", "create_windows_native_launcher_script")
 load("//py/private:py_library.bzl", _py_library = "py_library_utils")
 load("//py/private:py_semantics.bzl", _py_semantics = "semantics")
 load("//py/private/toolchain:types.bzl", "PY_TOOLCHAIN", "VENV_TOOLCHAIN")
@@ -14,6 +15,7 @@ def _dict_to_exports(env):
     ]
 
 def _py_binary_rule_impl(ctx):
+    is_windows = ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo])
     venv_toolchain = ctx.toolchains[VENV_TOOLCHAIN]
     py_toolchain = _py_semantics.resolve_toolchain(ctx)
 
@@ -62,10 +64,15 @@ def _py_binary_rule_impl(ctx):
             attribute_name = "env",
         )
 
-    executable_launcher = ctx.actions.declare_file(ctx.attr.name)
+    print(py_toolchain.python)
+    print(py_toolchain.runfiles_interpreter)
+    print(py_toolchain.python.path)
+    print(to_rlocation_path(ctx, py_toolchain.python))
+
+    bash_launcher = ctx.actions.declare_file(ctx.attr.name)
     ctx.actions.expand_template(
         template = ctx.file._run_tmpl,
-        output = executable_launcher,
+        output = bash_launcher,
         substitutions = {
             "{{BASH_RLOCATION_FN}}": BASH_RLOCATION_FUNCTION,
             "{{INTERPRETER_FLAGS}}": " ".join(py_toolchain.flags),
@@ -88,6 +95,8 @@ def _py_binary_rule_impl(ctx):
         is_executable = True,
     )
 
+    launcher = create_windows_native_launcher_script(ctx, bash_launcher) if is_windows else bash_launcher
+
     srcs_depset = _py_library.make_srcs_depset(ctx)
 
     runfiles = _py_library.make_merged_runfiles(
@@ -97,6 +106,8 @@ def _py_binary_rule_impl(ctx):
             srcs_depset,
         ] + virtual_resolution.srcs + virtual_resolution.runfiles,
         extra_runfiles = [
+            launcher,
+            bash_launcher,
             site_packages_pth_file,
         ] + ctx.files._runfiles_lib,
         extra_runfiles_depsets = [
@@ -112,11 +123,11 @@ def _py_binary_rule_impl(ctx):
     return [
         DefaultInfo(
             files = depset([
-                executable_launcher,
+                launcher,
                 ctx.file.main,
                 site_packages_pth_file,
             ]),
-            executable = executable_launcher,
+            executable = launcher,
             runfiles = runfiles,
         ),
         PyInfo(
@@ -189,6 +200,7 @@ python.toolchain(python_version = "3.9", is_default = True)
     "_allowlist_function_transition": attr.label(
         default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
     ),
+    "_windows_constraint": attr.label(default = "@platforms//os:windows"),
 })
 
 _attrs.update(**_py_library.attrs)
@@ -210,6 +222,7 @@ py_base = struct(
     toolchains = [
         PY_TOOLCHAIN,
         VENV_TOOLCHAIN,
+        "@bazel_tools//tools/sh:toolchain_type",
     ],
     cfg = _python_version_transition
 )
diff --git a/py/tools/py/Cargo.toml b/py/tools/py/Cargo.toml
@@ -6,11 +6,12 @@ homepage.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-readme.workspace = true
 rust-version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 miette = { version = "5.10", features = ["fancy"] }
-rattler_installs_packages = { git = "https://github.com/prefix-dev/rip", rev = "b047c9ec0b42125a67d35346f08b7e7848ac24f4", default-features = false, features = ["rustls-tls"] }
+# workaround issue with this package building with rules_rust on windows; the snap files used in their unit tests have
+# too long a path and import of this module is failing (even when tests are not run)
+rattler_installs_packages = { git = "https://github.com/peakschris/rip", rev = "3de9ee95eab577c9e48526464013e217287c6937", default-features = false, features = ["rustls-tls"] }
diff --git a/py/tools/py/src/pth.rs b/py/tools/py/src/pth.rs
@@ -151,13 +151,7 @@ fn create_symlink(e: &DirEntry, root_dir: &Path, dst_dir: &Path) -> miette::Resu
         );
     }
 
-    std::os::unix::fs::symlink(&tgt, &link)
-        .into_diagnostic()
-        .wrap_err(format!(
-            "Unable to create symlink: {} -> {}",
-            tgt.to_string_lossy(),
-            link.to_string_lossy()
-        ))?;
+    create_cross_platform_symlink(&tgt, &link)?;
 
     Ok(())
 }
@@ -186,3 +180,37 @@ fn is_same_file(p1: &Path, p2: &Path) -> miette::Result<bool> {
 
     return Ok(true);
 }
+
+fn create_cross_platform_symlink(tgt: &Path, link: &Path) -> miette::Result<()> {
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(tgt, link)
+            .into_diagnostic()
+            .wrap_err(format!(
+                "Unable to create symlink: {} -> {}",
+                tgt.to_string_lossy(),
+                link.to_string_lossy()
+            ))
+    }
+
+    #[cfg(windows)]
+    {
+        if tgt.is_dir() {
+            std::os::windows::fs::symlink_dir(tgt, link)
+                .into_diagnostic()
+                .wrap_err(format!(
+                    "Unable to create directory symlink: {} -> {}",
+                    tgt.to_string_lossy(),
+                    link.to_string_lossy()
+                ))
+        } else {
+            std::os::windows::fs::symlink_file(tgt, link)
+                .into_diagnostic()
+                .wrap_err(format!(
+                    "Unable to create file symlink: {} -> {}",
+                    tgt.to_string_lossy(),
+                    link.to_string_lossy()
+                ))
+        }
+    }
+}
diff --git a/py/tools/py/src/venv.rs b/py/tools/py/src/venv.rs
@@ -35,7 +35,7 @@ pub fn create_venv(
         .into_diagnostic()
         .wrap_err("Unable to determine absolute directory to venv directory")?;
 
-    let install_paths = interpreter.install_paths(false);
+    let install_paths = interpreter.install_paths(cfg!(windows));
 
     VEnv::create_install_paths(&venv_location, &install_paths)
         .into_diagnostic()
diff --git a/py/tools/unpack_bin/BUILD.bazel b/py/tools/unpack_bin/BUILD.bazel
@@ -34,3 +34,10 @@ multi_arch_rust_binary_release(
     os = "linux",
     visibility = ["//tools/release:__pkg__"],
 )
+
+multi_arch_rust_binary_release(
+    name = "windows",
+    src = ":unpack",
+    os = "windows",
+    visibility = ["//tools/release:__pkg__"],
+)
diff --git a/py/tools/unpack_bin/src/main.rs b/py/tools/unpack_bin/src/main.rs
@@ -41,5 +41,5 @@ fn unpack_cmd_handler(args: UnpackArgs) -> miette::Result<()> {
 
 fn main() -> miette::Result<()> {
     let args = UnpackArgs::parse();
-    unpack_cmd_handler(args).wrap_err("Unable to run command:")
+    unpack_cmd_handler(args).wrap_err("Unable to run command (unpack):")
 }
diff --git a/py/tools/venv_bin/BUILD.bazel b/py/tools/venv_bin/BUILD.bazel
@@ -34,3 +34,10 @@ multi_arch_rust_binary_release(
     os = "linux",
     visibility = ["//tools/release:__pkg__"],
 )
+
+multi_arch_rust_binary_release(
+    name = "windows",
+    src = ":venv",
+    os = "windows",
+    visibility = ["//tools/release:__pkg__"],
+)
diff --git a/py/tools/venv_bin/src/main.rs b/py/tools/venv_bin/src/main.rs
@@ -5,7 +5,7 @@ use miette::Context;
 
 use py;
 
-#[derive(Parser, Debug)]
+#[derive(Parser, Debug, Clone)]
 struct VenvArgs {
     /// Source Python interpreter path to symlink into the venv.
     #[arg(long)]
@@ -41,5 +41,5 @@ fn venv_cmd_handler(args: VenvArgs) -> miette::Result<()> {
 
 fn main() -> miette::Result<()> {
     let args = VenvArgs::parse();
-    venv_cmd_handler(args).wrap_err("Unable to run command:")
+    venv_cmd_handler(args.clone()).wrap_err_with(|| format!("Unable to run command (venv): {:?}", args))
 }
diff --git a/requirements.in b/requirements.in
@@ -1,4 +1,4 @@
-django~=4.2.7
+django==4.2.7
 colorama~=0.4.0
 click
 pytest
diff --git a/requirements.txt b/requirements.txt
diff --git a/tools/release/BUILD.bazel b/tools/release/BUILD.bazel
diff --git a/tools/release/defs.bzl b/tools/release/defs.bzl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-7.0.2`
	`1`	`+7.6.1`
`2`	`2`	`# The first line of this file is used by Bazelisk and Bazel to be sure`
`3`	`3`	`# the right version of Bazel is used to build and test this repo.`
`4`	`4`	`# This also defines which version is used on CI.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-../../.bazelversion`
	`1`	`+8.2.1`
	`2`	`+# bazel 7.0.1 and 7.6.1 fails due to path too long during git reset - tracked to bazel_tools git submodule`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ local_path_override(`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`# Because we use a prerelease of rules_py, we must compile the rust tools from source.`
`10`		`-bazel_dep(name = "rules_rust", version = "0.40.0")`
	`10`	`+# Versions newer than 0.58 fail with https://github.com/bazelbuild/rules_rust/issues/3441`
	`11`	`+bazel_dep(name = "rules_rust", version = "0.58.0")`
`11`	`12`
`12`	`13`	`rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")`
`13`	`14`	`rust.toolchain(`