From c2e2500f78ae24d895e9557eb82e006122c23361 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sat, 5 Jul 2025 08:36:19 -0700 Subject: [PATCH 1/4] fix(pypi): only generate namespace package shims if implicit namespaces are disabled --- python/private/pypi/whl_library_targets.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/private/pypi/whl_library_targets.bzl b/python/private/pypi/whl_library_targets.bzl index 518d17163f..474f39a34d 100644 --- a/python/private/pypi/whl_library_targets.bzl +++ b/python/private/pypi/whl_library_targets.bzl @@ -331,7 +331,7 @@ def whl_library_targets( allow_empty = True, ) - if enable_implicit_namespace_pkgs: + if not enable_implicit_namespace_pkgs: srcs = srcs + getattr(native, "select", select)({ Label("//python/config_settings:is_venvs_site_packages"): [], "//conditions:default": create_inits( From 795f8daf889f7cd1aff47a80a483f12101ad8eff Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Sat, 5 Jul 2025 09:14:11 -0700 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b2dfc3908..9ae3bdb28a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,18 @@ END_UNRELEASED_TEMPLATE ### Removed * Nothing removed. +{#1-5-1} +## [1.5.1] - 2025-06-XX + +[1.5.1]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.1 + +{#v1-5-1-fixed} +### Fixed + +* (pypi) Namespace packages work by default (pkgutil shims are generated + by default again) + ([#3038](https://github.com/bazel-contrib/rules_python/issues/3038)). + {#1-5-0} ## [1.5.0] - 2025-06-11 From a0628ae783048d9022e8df7604eb8f8ec8a03deb Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius <240938+aignas@users.noreply.github.com> Date: Sun, 6 Jul 2025 11:06:56 +0900 Subject: [PATCH 3/4] test: skip testing creation of init files in unit tests --- .../whl_library_targets/whl_library_targets_tests.bzl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl b/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl index f0e5f57ac0..22fe3ab7ca 100644 --- a/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl +++ b/tests/pypi/whl_library_targets/whl_library_targets_tests.bzl @@ -16,10 +16,18 @@ load("@rules_testing//lib:test_suite.bzl", "test_suite") load("//python/private:glob_excludes.bzl", "glob_excludes") # buildifier: disable=bzl-visibility -load("//python/private/pypi:whl_library_targets.bzl", "whl_library_targets", "whl_library_targets_from_requires") # buildifier: disable=bzl-visibility +load("//python/private/pypi:whl_library_targets.bzl", _whl_library_targets = "whl_library_targets", _whl_library_targets_from_requires = "whl_library_targets_from_requires") # buildifier: disable=bzl-visibility _tests = [] +def whl_library_targets(**kwargs): + # Let's skip testing this for now + _whl_library_targets(enable_implicit_namespace_pkgs = True, **kwargs) + +def whl_library_targets_from_requires(**kwargs): + # Let's skip testing this for now + _whl_library_targets_from_requires(enable_implicit_namespace_pkgs = True, **kwargs) + def _test_filegroups(env): calls = [] From f73c00f80d5d35da438f321659b34fecce6698d8 Mon Sep 17 00:00:00 2001 From: Ignas Anikevicius <240938+aignas@users.noreply.github.com> Date: Sun, 6 Jul 2025 11:12:40 +0900 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ae3bdb28a..a48b7f297d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,7 +87,7 @@ END_UNRELEASED_TEMPLATE * Nothing removed. {#1-5-1} -## [1.5.1] - 2025-06-XX +## [1.5.1] - 2025-07-06 [1.5.1]: https://github.com/bazel-contrib/rules_python/releases/tag/1.5.1