Get rid of hardcoded self-ref repo names in implementation.

The goal is to use @rules_pycross with bzlmod rather than @jvolkman_rules_pycross. With these changes, either name can be used in WORKSPACE rules. Examples and tests/smoke are updated to be @rules_pycross.
jvolkman · Dec 12, 2023 · 08e99be · 08e99be
1 parent b51fde1
commit 08e99be
Show file tree

Hide file tree

Showing 36 changed files with 174 additions and 95 deletions.
diff --git a/.github/workflows/workspace_snippet.sh b/.github/workflows/workspace_snippet.sh
@@ -13,7 +13,7 @@ WORKSPACE snippet:
 \`\`\`starlark
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
     sha256 = "${SHA}",
     strip_prefix = "${PREFIX}",
     url = "https://github.com/jvolkman/rules_pycross/archive/refs/tags/${TAG}.tar.gz",
@@ -24,7 +24,7 @@ http_archive(
 # you should fetch it *before* calling this.
 # Alternatively, you can skip calling this function, so long as you've
 # already fetched all the dependencies.
-load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
+load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 rules_pycross_dependencies()
 
 \`\`\`

diff --git a/WORKSPACE b/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
 )
 
 load(":internal_deps.bzl", "rules_pycross_internal_deps")

diff --git a/examples/bzlmod/WORKSPACE b/examples/bzlmod/WORKSPACE
@@ -0,0 +1,66 @@
+# workspace(
+#     name = "rules_pycross_example",
+# )
+
+# load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+# http_archive(
+#     name = "rules_python",
+#     sha256 = "9acc0944c94adb23fba1c9988b48768b1bacc6583b52a2586895c5b7491e2e31",
+#     strip_prefix = "rules_python-0.27.0",
+#     url = "https://github.com/bazelbuild/rules_python/releases/download/0.27.0/rules_python-0.27.0.tar.gz",
+# )
+
+# load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_multi_toolchains")
+
+# py_repositories()
+
+# python_register_multi_toolchains(
+#     name = "python",
+#     default_version = "3.12",
+#     python_versions = [
+#         "3.10",
+#         "3.11",
+#         "3.12",
+#     ],
+# )
+
+# load("@python//3.12:defs.bzl", python_interpreter = "interpreter")
+
+# local_repository(
+#     name = "rules_pycross",
+#     path = "../..",
+# )
+
+# load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
+
+# rules_pycross_dependencies(
+#     python_interpreter_target = python_interpreter,
+# )
+
+# load(
+#     "@rules_pycross//pycross:defs.bzl",
+#     "pkg_repo_model_pdm",
+#     "pycross_pkg_repo",
+#     "pycross_register_for_python_toolchains",
+# )
+
+# pycross_register_for_python_toolchains(
+#     name = "pycross_toolchains",
+#     python_toolchains_repo_name = "python",
+# )
+
+# load("@pycross_toolchains//:defs.bzl", "environments")
+
+# pycross_pkg_repo(
+#     name = "pdm",
+#     lock_model = pkg_repo_model_pdm(
+#         lock_file = "@//:pdm.lock",
+#         project_file = "@//:pyproject.toml",
+#     ),
+#     target_environments = environments,
+# )
+
+# load("@pdm//:defs.bzl", "install_deps")
+
+# install_deps()
diff --git a/examples/external_linking/BUILD.bazel b/examples/external_linking/BUILD.bazel
@@ -1,12 +1,12 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(
-    "@jvolkman_rules_pycross//pycross:defs.bzl",
+    "@rules_pycross//pycross:defs.bzl",
     "pycross_lock_file",
     "pycross_pdm_lock_model",
     "pycross_target_environment",
 )
 load(
-    "@jvolkman_rules_pycross//pycross:toolchain.bzl",
+    "@rules_pycross//pycross:toolchain.bzl",
     "pycross_hermetic_toolchain",
 )
 
@@ -107,7 +107,7 @@ toolchain(
     exec_compatible_with = _darwin_arm64,
     target_compatible_with = _linux_x86_64,
     toolchain = ":pycross_darwin_linux",
-    toolchain_type = "@jvolkman_rules_pycross//pycross:toolchain_type",
+    toolchain_type = "@rules_pycross//pycross:toolchain_type",
 )
 
 pycross_hermetic_toolchain(
@@ -122,7 +122,7 @@ toolchain(
     exec_compatible_with = _linux_x86_64,
     target_compatible_with = _darwin_arm64,
     toolchain = ":pycross_linux_darwin",
-    toolchain_type = "@jvolkman_rules_pycross//pycross:toolchain_type",
+    toolchain_type = "@rules_pycross//pycross:toolchain_type",
 )
 
 pycross_hermetic_toolchain(
@@ -137,7 +137,7 @@ toolchain(
     exec_compatible_with = _linux_x86_64,
     target_compatible_with = _linux_arm64,
     toolchain = ":pycross_linux_x86_64_linux_arm64",
-    toolchain_type = "@jvolkman_rules_pycross//pycross:toolchain_type",
+    toolchain_type = "@rules_pycross//pycross:toolchain_type",
 )
 
 pycross_pdm_lock_model(

diff --git a/examples/external_linking/WORKSPACE b/examples/external_linking/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "jvolkman_rules_pycross_example",
+    name = "rules_pycross_example",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -23,18 +23,18 @@ python_register_toolchains(
 )
 
 local_repository(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
     path = "../..",
 )
 
-load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 load("@python3_10//:defs.bzl", python_interpreter = "interpreter")
+load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
 rules_pycross_dependencies(
     python_interpreter_target = python_interpreter,
 )
 
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
+load("@rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
 
 pycross_lock_repo(
     name = "example_lock_repo",

diff --git a/examples/external_linking/deps/numpy/BUILD.bazel b/examples/external_linking/deps/numpy/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -15,7 +15,7 @@ pycross_wheel_build(
         "//third_party/openblas:libopenblas.a",
     ],
     post_build_hooks = [
-        "@jvolkman_rules_pycross//pycross/hooks:repair_wheel",
+        "@rules_pycross//pycross/hooks:repair_wheel",
     ],
     pre_build_hooks = [
         ":gen_site_cfg",

diff --git a/examples/external_linking/deps/psycopg2/BUILD.bazel b/examples/external_linking/deps/psycopg2/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -12,7 +12,7 @@ pycross_wheel_build(
         ":pg_config": "pg_config",
     },
     post_build_hooks = [
-        "@jvolkman_rules_pycross//pycross/hooks:repair_wheel",
+        "@rules_pycross//pycross/hooks:repair_wheel",
     ],
     sdist = "@example_lock_sdist_psycopg2_2.9.5//file",
     tags = ["manual"],

diff --git a/examples/external_linking/example_lock.bzl b/examples/external_linking/example_lock.bzl
@@ -4,7 +4,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library")
 
 PINS = {
     "appnope": "appnope_0.1.3",
@@ -80,10 +80,10 @@ def targets():
 
     # buildifier: disable=unused-variable
     _target = select({
-        ":_env_python_darwin_arm64": "@jvolkman_rules_pycross_example//:python_darwin_arm64",
-        ":_env_python_darwin_x86_64": "@jvolkman_rules_pycross_example//:python_darwin_x86_64",
-        ":_env_python_linux_arm64": "@jvolkman_rules_pycross_example//:python_linux_arm64",
-        ":_env_python_linux_x86_64": "@jvolkman_rules_pycross_example//:python_linux_x86_64",
+        ":_env_python_darwin_arm64": "@rules_pycross_example//:python_darwin_arm64",
+        ":_env_python_darwin_x86_64": "@rules_pycross_example//:python_darwin_x86_64",
+        ":_env_python_linux_arm64": "@rules_pycross_example//:python_linux_arm64",
+        ":_env_python_linux_x86_64": "@rules_pycross_example//:python_linux_x86_64",
     })
 
     pycross_wheel_library(

diff --git a/examples/pdm/BUILD.bazel b/examples/pdm/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(
-    "@jvolkman_rules_pycross//pycross:defs.bzl",
+    "@rules_pycross//pycross:defs.bzl",
     "pycross_lock_file",
     "pycross_pdm_lock_model",
     "pycross_target_environment",

diff --git a/examples/pdm/WORKSPACE b/examples/pdm/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "jvolkman_rules_pycross_example",
+    name = "rules_pycross_example",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -23,18 +23,18 @@ python_register_toolchains(
 )
 
 local_repository(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
     path = "../..",
 )
 
-load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 load("@python3_11//:defs.bzl", python_interpreter = "interpreter")
+load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
 rules_pycross_dependencies(
     python_interpreter_target = python_interpreter,
 )
 
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
+load("@rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
 
 pycross_lock_repo(
     name = "example_lock_repo",

diff --git a/examples/pdm/deps/BUILD.bazel b/examples/pdm/deps/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
 load("//:example_lock.bzl", "targets")
 
 package(default_visibility = ["//visibility:public"])

diff --git a/examples/pdm/example_lock.bzl b/examples/pdm/example_lock.bzl
@@ -4,7 +4,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library")
 
 PINS = {
     "alabaster": "alabaster_0.7.13",
@@ -167,9 +167,9 @@ def targets():
 
     # buildifier: disable=unused-variable
     _target = select({
-        ":_env_python_darwin_arm64": "@jvolkman_rules_pycross_example//:python_darwin_arm64",
-        ":_env_python_darwin_x86_64": "@jvolkman_rules_pycross_example//:python_darwin_x86_64",
-        ":_env_python_linux_x86_64": "@jvolkman_rules_pycross_example//:python_linux_x86_64",
+        ":_env_python_darwin_arm64": "@rules_pycross_example//:python_darwin_arm64",
+        ":_env_python_darwin_x86_64": "@rules_pycross_example//:python_darwin_x86_64",
+        ":_env_python_linux_x86_64": "@rules_pycross_example//:python_linux_x86_64",
     })
 
     pycross_wheel_library(

diff --git a/examples/pkg_repo/WORKSPACE b/examples/pkg_repo/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "jvolkman_rules_pycross_example",
+    name = "rules_pycross_example",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -28,18 +28,18 @@ python_register_multi_toolchains(
 load("@python//3.12:defs.bzl", python_interpreter = "interpreter")
 
 local_repository(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
     path = "../..",
 )
 
-load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
+load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
 rules_pycross_dependencies(
     python_interpreter_target = python_interpreter,
 )
 
 load(
-    "@jvolkman_rules_pycross//pycross:defs.bzl",
+    "@rules_pycross//pycross:defs.bzl",
     "pkg_repo_model_pdm",
     "pycross_pkg_repo",
     "pycross_register_for_python_toolchains",

diff --git a/examples/poetry/BUILD.bazel b/examples/poetry/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(
-    "@jvolkman_rules_pycross//pycross:defs.bzl",
+    "@rules_pycross//pycross:defs.bzl",
     "pycross_lock_file",
     "pycross_poetry_lock_model",
     "pycross_target_environment",

diff --git a/examples/poetry/WORKSPACE b/examples/poetry/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "jvolkman_rules_pycross_example",
+    name = "rules_pycross_example",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -23,18 +23,18 @@ python_register_toolchains(
 )
 
 local_repository(
-    name = "jvolkman_rules_pycross",
+    name = "rules_pycross",
     path = "../..",
 )
 
-load("@jvolkman_rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 load("@python3_11//:defs.bzl", python_interpreter = "interpreter")
+load("@rules_pycross//pycross:repositories.bzl", "rules_pycross_dependencies")
 
 rules_pycross_dependencies(
     python_interpreter_target = python_interpreter,
 )
 
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
+load("@rules_pycross//pycross:defs.bzl", "pycross_lock_repo")
 
 pycross_lock_repo(
     name = "example_lock_repo",

diff --git a/examples/poetry/deps/BUILD.bazel b/examples/poetry/deps/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build")
 load("//:example_lock.bzl", "targets")
 
 package(default_visibility = ["//visibility:public"])

diff --git a/examples/poetry/example_lock.bzl b/examples/poetry/example_lock.bzl
@@ -4,7 +4,7 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("@jvolkman_rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library", "pypi_file")
+load("@rules_pycross//pycross:defs.bzl", "pycross_wheel_build", "pycross_wheel_library", "pypi_file")
 
 PINS = {
     "annotated_types": "annotated_types_0.6.0",
@@ -147,9 +147,9 @@ def targets():
 
     # buildifier: disable=unused-variable
     _target = select({
-        ":_env_python_darwin_arm64": "@jvolkman_rules_pycross_example//:python_darwin_arm64",
-        ":_env_python_darwin_x86_64": "@jvolkman_rules_pycross_example//:python_darwin_x86_64",
-        ":_env_python_linux_x86_64": "@jvolkman_rules_pycross_example//:python_linux_x86_64",
+        ":_env_python_darwin_arm64": "@rules_pycross_example//:python_darwin_arm64",
+        ":_env_python_darwin_x86_64": "@rules_pycross_example//:python_darwin_x86_64",
+        ":_env_python_linux_x86_64": "@rules_pycross_example//:python_linux_x86_64",
     })
 
     pycross_wheel_library(