[NO TESTS] WIP

Author: arrdem

.bazelrc

@@ -1,6 +1,7 @@
 import %workspace%/bazel/defaults.bazelrc
 
 test --test_output=errors
+test --test_tag_filters=-manual
 common --enable_bzlmod
 
 # Define value used by tests

bazel/include/oci.MODULE.bazel

@@ -23,3 +23,7 @@ git_override(
 
 # Used for testing container layers
 bazel_dep(name = "tar.bzl", version = "0.5.5")
+bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
+use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
+
+register_toolchains("@bsd_tar_toolchains//:all")

bazel/include/rust.MODULE.bazel

@@ -27,6 +27,7 @@ crate.from_cargo(
         "//py/tools/unpack_bin:Cargo.toml",
         "//py/tools/venv_bin:Cargo.toml",
         "//py/tools/venv_shim:Cargo.toml",
+        "//py/tools/runfiles:Cargo.toml",
     ],
     supported_platform_triples = [
         "aarch64-apple-darwin",

docs/virtual_deps.md

@@ -17,7 +17,7 @@ https://github.com/aspect-build/rules_py/issues/213
 Simply move an element from the `deps` attribute to `virtual_deps`.
 
 For example, instead of getting a specific version of Django from
-`deps = ["@pypi_django//:pkg"]` on a `py_library` target,
+`deps = ["@pypi//django"]` on a `py_library` target,
 provide the package name with `virtual_deps = ["django"]`.
 
 > Note that any `py_binary` or `py_test` transitively depending on this `py_library` must be loaded from `aspect_rules_py` rather than `rules_python`, as the latter does not have a feature of resolving the virtual dep.

examples/django/BUILD.bazel

@@ -5,6 +5,6 @@ py_binary(
     srcs = ["manage.py"],
     deps = [
         "//examples/django/mysite",
-        "@pypi_django//:pkg",
+        "@pypi//django",
     ],
 )

examples/django/mysite/BUILD.bazel

@@ -11,6 +11,6 @@ py_library(
     ],
     visibility = ["//examples/django:__pkg__"],
     deps = [
-        "@pypi_django//:pkg",
+        "@pypi//django",
     ],
 )

examples/multi_version/BUILD.bazel

@@ -11,7 +11,7 @@ py_binary(
 
 py_pytest_main(
     name = "__test__",
-    deps = ["@pipi//pytest"],
+    deps = ["@pypi//pytest"],
 )
 
 py_test(

examples/pytest/BUILD.bazel

@@ -21,10 +21,10 @@ py_test(
     pytest_main = True,
     deps = [
         ":lib",
-        "@pypi_coverage//:pkg",
-        "@pypi_ftfy//:pkg",
-        "@pypi_neptune//:pkg",
-        "@pipi//pytest",
+        "@pypi//coverage",
+        "@pypi//ftfy",
+        "@pypi//neptune",
+        "@pypi//pytest",
     ],
 )
 
@@ -36,5 +36,5 @@ py_test(
     package_collisions = "warning",
     pytest_main = True,
     shard_count = 2,
-    deps = ["@pipi//pytest"],
+    deps = ["@pipy//pytest"],
 )

examples/pytest/README.md

@@ -14,7 +14,7 @@ load("@aspect_rules_py//py:defs.bzl", "py_pytest_main")
 
 py_pytest_main(
     name = "__test__",
-    deps = ["@pypi_pytest//:pkg"], # change this to the pytest target in your repo.
+    deps = ["@pypi//pytest"], # change this to the pytest target in your repo.
 )
 ```
 

py/tests/import-pathing/tests.bzl

@@ -10,7 +10,8 @@ def _ctx_with_imports(imports, deps = []):
         ),
         build_file_path = "foo/bar/BUILD.bazel",
         workspace_name = "aspect_rules_py",
-        label = Label("//foo/bar:baz"),
+        # Under bzlmod we have to set the workspace name otherwise we get _main
+        label = Label("@@aspect_rules_py//foo/bar:baz"),
     )
 
 def _can_resolve_path_in_workspace_test_impl(ctx):