From d85c3acc8bedf385dbc7c8af72fa3768f8266435 Mon Sep 17 00:00:00 2001 From: August Karlstedt Date: Mon, 24 Oct 2022 17:27:03 +0000 Subject: [PATCH] add imports to fix bazel --noexperimental_python_import_all_repositories flag --- distro/BUILD | 1 + pkg/BUILD | 2 ++ pkg/private/BUILD | 4 ++++ pkg/private/deb/BUILD | 2 ++ pkg/private/tar/BUILD | 2 ++ pkg/private/zip/BUILD | 1 + pkg/releasing/BUILD | 2 ++ tests/BUILD | 2 ++ tests/deb/BUILD | 2 ++ tests/install/BUILD | 1 + tests/mappings/BUILD | 1 + tests/rpm/BUILD | 1 + tests/tar/BUILD | 2 ++ tests/zip/BUILD | 1 + 14 files changed, 24 insertions(+) diff --git a/distro/BUILD b/distro/BUILD index 024faa24..8d10450f 100644 --- a/distro/BUILD +++ b/distro/BUILD @@ -84,6 +84,7 @@ py_test( "packaging_test.py", ":release_version.py", ], + imports = [".."], data = [ "testdata/BUILD.tpl", ":distro", diff --git a/pkg/BUILD b/pkg/BUILD index 8b834403..9c20ed07 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -67,6 +67,7 @@ starlark_library( py_binary( name = "make_rpm", srcs = ["make_rpm.py"], + imports = [".."], python_version = "PY3", srcs_version = "PY3", target_compatible_with = select({ @@ -83,6 +84,7 @@ py_binary( py_library( name = "make_rpm_lib", srcs = ["make_rpm.py"], + imports = [".."], srcs_version = "PY3", visibility = [ "//experimental:__subpackages__", diff --git a/pkg/private/BUILD b/pkg/private/BUILD index f782d16d..16fc5ea3 100644 --- a/pkg/private/BUILD +++ b/pkg/private/BUILD @@ -62,6 +62,7 @@ py_library( srcs = [ "build_info.py", ], + imports = ["../.."], srcs_version = "PY3", visibility = [ "//:__subpackages__", @@ -75,6 +76,7 @@ py_library( "__init__.py", "archive.py", ], + imports = ["../.."], srcs_version = "PY3", visibility = [ "//:__subpackages__", @@ -88,6 +90,7 @@ py_library( "__init__.py", "helpers.py", ], + imports = ["../.."], srcs_version = "PY3", visibility = [ "//:__subpackages__", @@ -98,6 +101,7 @@ py_library( py_library( name = "manifest", srcs = ["manifest.py"], + imports = ["../.."], srcs_version = "PY3", visibility = ["//visibility:public"], ) diff --git a/pkg/private/deb/BUILD b/pkg/private/deb/BUILD index c38da64b..646877b1 100644 --- a/pkg/private/deb/BUILD +++ b/pkg/private/deb/BUILD @@ -48,6 +48,7 @@ exports_files( py_binary( name = "make_deb", srcs = ["make_deb.py"], + imports = ["../../.."], python_version = "PY3", visibility = ["//visibility:public"], deps = [ @@ -58,6 +59,7 @@ py_binary( py_library( name = "make_deb_lib", srcs = ["make_deb.py"], + imports = ["../../.."], srcs_version = "PY3", visibility = ["//tests/deb:__pkg__"], deps = [ diff --git a/pkg/private/tar/BUILD b/pkg/private/tar/BUILD index fb9ab50a..6bfeb1e0 100644 --- a/pkg/private/tar/BUILD +++ b/pkg/private/tar/BUILD @@ -45,6 +45,7 @@ exports_files( py_binary( name = "build_tar", srcs = ["build_tar.py"], + imports = ["../../.."], python_version = "PY3", srcs_version = "PY3", visibility = ["//visibility:public"], @@ -62,6 +63,7 @@ py_library( srcs = [ "tar_writer.py", ], + imports = ["../../.."], srcs_version = "PY3", visibility = [ "//tests:__subpackages__", diff --git a/pkg/private/zip/BUILD b/pkg/private/zip/BUILD index eba47091..ea996ca3 100644 --- a/pkg/private/zip/BUILD +++ b/pkg/private/zip/BUILD @@ -48,6 +48,7 @@ exports_files( py_binary( name = "build_zip", srcs = ["build_zip.py"], + imports = ["../../.."], python_version = "PY3", srcs_version = "PY3", visibility = ["//visibility:public"], diff --git a/pkg/releasing/BUILD b/pkg/releasing/BUILD index 2a38667a..31d3f611 100644 --- a/pkg/releasing/BUILD +++ b/pkg/releasing/BUILD @@ -36,6 +36,7 @@ py_library( "__init__.py", "release_tools.py", ], + imports = ["../.."], srcs_version = "PY3", ) @@ -44,6 +45,7 @@ py_binary( srcs = [ "print_rel_notes.py", ], + imports = ["../.."], python_version = "PY3", deps = [ ":release_utils", diff --git a/tests/BUILD b/tests/BUILD index d2bd1f14..aa7237fd 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -49,6 +49,7 @@ py_test( srcs = [ "archive_test.py", ], + imports = [".."], data = [ "//tests:testdata/empty.ar", "//tests:testdata/a_ab.ar", @@ -82,6 +83,7 @@ cc_binary( py_test( name = "helpers_test", srcs = ["helpers_test.py"], + imports = [".."], python_version = "PY3", srcs_version = "PY3", deps = [ diff --git a/tests/deb/BUILD b/tests/deb/BUILD index 598f80fb..e7781d3b 100644 --- a/tests/deb/BUILD +++ b/tests/deb/BUILD @@ -95,6 +95,7 @@ py_test( srcs = [ "pkg_deb_test.py", ], + imports = ["../.."], data = [ # The target includes both the .deb and .changes files in DefaultInfo ":test_deb", @@ -118,6 +119,7 @@ py_test( srcs = [ "control_field_test.py", ], + imports = ["../.."], python_version = "PY3", deps = [ "//pkg/private/deb:make_deb_lib", diff --git a/tests/install/BUILD b/tests/install/BUILD index f083b3f7..df97dfff 100644 --- a/tests/install/BUILD +++ b/tests/install/BUILD @@ -23,6 +23,7 @@ py_test( name = "install_test", srcs = ["test.py"], args = ["-v"], + imports = ["../.."], data = [ ":test_installer", ], diff --git a/tests/mappings/BUILD b/tests/mappings/BUILD index b742ff58..423ca360 100644 --- a/tests/mappings/BUILD +++ b/tests/mappings/BUILD @@ -35,6 +35,7 @@ package(default_applicable_licenses = ["//:license"]) py_library( name = "manifest_test_lib", srcs = ["manifest_test_lib.py"], + imports = ["../.."], srcs_version = "PY3", deps = [ "@bazel_tools//tools/python/runfiles", diff --git a/tests/rpm/BUILD b/tests/rpm/BUILD index 5f91da8d..849dfc40 100644 --- a/tests/rpm/BUILD +++ b/tests/rpm/BUILD @@ -373,6 +373,7 @@ diff_test( py_library( name = "rpm_util", srcs = ["rpm_util.py"], + imports = ["../.."], visibility = [":__subpackages__"], ) diff --git a/tests/tar/BUILD b/tests/tar/BUILD index 8fc1abfe..5a8ee934 100644 --- a/tests/tar/BUILD +++ b/tests/tar/BUILD @@ -29,6 +29,7 @@ py_test( srcs = [ "tar_writer_test.py", ], + imports = ["../.."], data = [ ":compressor", ":test_tar_compression", @@ -309,6 +310,7 @@ py_test( srcs = [ "pkg_tar_test.py", ], + imports = ["../.."], data = [ ":test-tar-empty_dirs.tar", ":test-tar-empty_files.tar", diff --git a/tests/zip/BUILD b/tests/zip/BUILD index 46c52dd1..7c7eabfc 100644 --- a/tests/zip/BUILD +++ b/tests/zip/BUILD @@ -29,6 +29,7 @@ py_library( srcs = [ "zip_test_lib.py", ], + imports = ["../.."], srcs_version = "PY3", deps = [ "@bazel_tools//tools/python/runfiles",