tests: Move base rule tests under tests instead of //tools/build_defs/python (#1440)
The tools/build_defs/python path is an artifact of some Google-internal
naming that isn't applicable to the rules_python source tree layout.
With the Starlark implementation running in CI and working in some
capacity, it's time to move them to a less mysterious location.
* Also moves the py_wheel tests out of the base rule tests. Not sure
how they ended up there.
Work towards #1069
diff --git a/tools/build_defs/python/tests/BUILD.bazel b/tests/base_rules/BUILD.bazel
similarity index 100%
rename from tools/build_defs/python/tests/BUILD.bazel
rename to tests/base_rules/BUILD.bazel
diff --git a/tools/build_defs/python/tests/base_tests.bzl b/tests/base_rules/base_tests.bzl
similarity index 95%
rename from tools/build_defs/python/tests/base_tests.bzl
rename to tests/base_rules/base_tests.bzl
index 467611f..5300163 100644
--- a/tools/build_defs/python/tests/base_tests.bzl
+++ b/tests/base_rules/base_tests.bzl
@@ -17,8 +17,8 @@
load("@rules_testing//lib:truth.bzl", "matching")
load("@rules_testing//lib:util.bzl", "PREVENT_IMPLICIT_BUILDING_TAGS", rt_util = "util")
load("//python:defs.bzl", "PyInfo")
-load("//tools/build_defs/python/tests:py_info_subject.bzl", "py_info_subject")
-load("//tools/build_defs/python/tests:util.bzl", pt_util = "util")
+load("//tests/base_rules:py_info_subject.bzl", "py_info_subject")
+load("//tests/base_rules:util.bzl", pt_util = "util")
_tests = []
diff --git a/tools/build_defs/python/tests/py_binary/BUILD.bazel b/tests/base_rules/py_binary/BUILD.bazel
similarity index 100%
rename from tools/build_defs/python/tests/py_binary/BUILD.bazel
rename to tests/base_rules/py_binary/BUILD.bazel
diff --git a/tools/build_defs/python/tests/py_binary/py_binary_tests.bzl b/tests/base_rules/py_binary/py_binary_tests.bzl
similarity index 92%
rename from tools/build_defs/python/tests/py_binary/py_binary_tests.bzl
rename to tests/base_rules/py_binary/py_binary_tests.bzl
index 8d32632..571955d 100644
--- a/tools/build_defs/python/tests/py_binary/py_binary_tests.bzl
+++ b/tests/base_rules/py_binary/py_binary_tests.bzl
@@ -15,7 +15,7 @@
load("//python:defs.bzl", "py_binary")
load(
- "//tools/build_defs/python/tests:py_executable_base_tests.bzl",
+ "//tests/base_rules:py_executable_base_tests.bzl",
"create_executable_tests",
)
diff --git a/tools/build_defs/python/tests/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl
similarity index 97%
rename from tools/build_defs/python/tests/py_executable_base_tests.bzl
rename to tests/base_rules/py_executable_base_tests.bzl
index c66ea11..13ec946 100644
--- a/tools/build_defs/python/tests/py_executable_base_tests.bzl
+++ b/tests/base_rules/py_executable_base_tests.bzl
@@ -16,8 +16,8 @@
load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
load("@rules_testing//lib:truth.bzl", "matching")
load("@rules_testing//lib:util.bzl", rt_util = "util")
-load("//tools/build_defs/python/tests:base_tests.bzl", "create_base_tests")
-load("//tools/build_defs/python/tests:util.bzl", "WINDOWS_ATTR", pt_util = "util")
+load("//tests/base_rules:base_tests.bzl", "create_base_tests")
+load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
_tests = []
diff --git a/tools/build_defs/python/tests/py_info_subject.bzl b/tests/base_rules/py_info_subject.bzl
similarity index 100%
rename from tools/build_defs/python/tests/py_info_subject.bzl
rename to tests/base_rules/py_info_subject.bzl
diff --git a/tools/build_defs/python/tests/py_library/BUILD.bazel b/tests/base_rules/py_library/BUILD.bazel
similarity index 100%
rename from tools/build_defs/python/tests/py_library/BUILD.bazel
rename to tests/base_rules/py_library/BUILD.bazel
diff --git a/tools/build_defs/python/tests/py_library/py_library_tests.bzl b/tests/base_rules/py_library/py_library_tests.bzl
similarity index 96%
rename from tools/build_defs/python/tests/py_library/py_library_tests.bzl
rename to tests/base_rules/py_library/py_library_tests.bzl
index 1fcb0c1..526735a 100644
--- a/tools/build_defs/python/tests/py_library/py_library_tests.bzl
+++ b/tests/base_rules/py_library/py_library_tests.bzl
@@ -4,8 +4,8 @@
load("@rules_testing//lib:truth.bzl", "matching")
load("@rules_testing//lib:util.bzl", rt_util = "util")
load("//python:defs.bzl", "PyRuntimeInfo", "py_library")
-load("//tools/build_defs/python/tests:base_tests.bzl", "create_base_tests")
-load("//tools/build_defs/python/tests:util.bzl", pt_util = "util")
+load("//tests/base_rules:base_tests.bzl", "create_base_tests")
+load("//tests/base_rules:util.bzl", pt_util = "util")
_tests = []
diff --git a/tools/build_defs/python/tests/py_test/BUILD.bazel b/tests/base_rules/py_test/BUILD.bazel
similarity index 100%
rename from tools/build_defs/python/tests/py_test/BUILD.bazel
rename to tests/base_rules/py_test/BUILD.bazel
diff --git a/tools/build_defs/python/tests/py_test/py_test_tests.bzl b/tests/base_rules/py_test/py_test_tests.bzl
similarity index 93%
rename from tools/build_defs/python/tests/py_test/py_test_tests.bzl
rename to tests/base_rules/py_test/py_test_tests.bzl
index 1ecb252..4d0f7d1 100644
--- a/tools/build_defs/python/tests/py_test/py_test_tests.bzl
+++ b/tests/base_rules/py_test/py_test_tests.bzl
@@ -17,17 +17,17 @@
load("@rules_testing//lib:util.bzl", rt_util = "util")
load("//python:defs.bzl", "py_test")
load(
- "//tools/build_defs/python/tests:py_executable_base_tests.bzl",
+ "//tests/base_rules:py_executable_base_tests.bzl",
"create_executable_tests",
)
-load("//tools/build_defs/python/tests:util.bzl", pt_util = "util")
+load("//tests/base_rules:util.bzl", pt_util = "util")
# Explicit Label() calls are required so that it resolves in @rules_python context instead of
# @rules_testing context.
_FAKE_CC_TOOLCHAIN = Label("//tests/cc:cc_toolchain_suite")
_FAKE_CC_TOOLCHAINS = [str(Label("//tests/cc:all"))]
-_PLATFORM_MAC = Label("//tools/build_defs/python/tests:mac")
-_PLATFORM_LINUX = Label("//tools/build_defs/python/tests:linux")
+_PLATFORM_MAC = Label("//tests/base_rules:mac")
+_PLATFORM_LINUX = Label("//tests/base_rules:linux")
_tests = []
diff --git a/tools/build_defs/python/tests/util.bzl b/tests/base_rules/util.bzl
similarity index 100%
rename from tools/build_defs/python/tests/util.bzl
rename to tests/base_rules/util.bzl
diff --git a/tools/build_defs/python/tests/py_wheel/BUILD.bazel b/tests/py_wheel/py_wheel/BUILD.bazel
similarity index 100%
rename from tools/build_defs/python/tests/py_wheel/BUILD.bazel
rename to tests/py_wheel/py_wheel/BUILD.bazel
diff --git a/tools/build_defs/python/tests/py_wheel/py_wheel_tests.bzl b/tests/py_wheel/py_wheel/py_wheel_tests.bzl
similarity index 94%
rename from tools/build_defs/python/tests/py_wheel/py_wheel_tests.bzl
rename to tests/py_wheel/py_wheel/py_wheel_tests.bzl
index 4408592..c70163e 100644
--- a/tools/build_defs/python/tests/py_wheel/py_wheel_tests.bzl
+++ b/tests/py_wheel/py_wheel/py_wheel_tests.bzl
@@ -4,7 +4,7 @@
load("@rules_testing//lib:truth.bzl", "matching")
load("@rules_testing//lib:util.bzl", rt_util = "util")
load("//python:packaging.bzl", "py_wheel")
-load("//tools/build_defs/python/tests:util.bzl", pt_util = "util")
+load("//tests/base_rules:util.bzl", pt_util = "util")
_tests = []
