Commit 18d0d29
fix(pypi): only generate namespace package shims if implicit namespaces are disabled (#3059)
The refactoring to move the pkgutil shim generation to build phase
inverted
the logic for when it should be activated. When
`enable_implicit_namespace_pkgs=True`, it means to not generate the
pkgutil shims
("respect the Python definition of the namespace package").
To fix, just invert the logic that activates it.
A test will be added in a subsequent PR because the necessary helper
isn't
in the 1.5 branch.
Fixes #3038
---------
Co-authored-by: Ignas Anikevicius <[email protected]>
(cherry picked from commit 47c681b)1 parent 63841ec commit 18d0d29
File tree
3 files changed
+23
-3
lines changed- python/private/pypi
- tests/pypi/whl_library_targets
3 files changed
+23
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
50 | 62 | | |
51 | 63 | | |
52 | 64 | | |
| |||
70 | 82 | | |
71 | 83 | | |
72 | 84 | | |
73 | | - | |
| 85 | + | |
74 | 86 | | |
75 | 87 | | |
76 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
331 | 331 | | |
332 | 332 | | |
333 | 333 | | |
334 | | - | |
| 334 | + | |
335 | 335 | | |
336 | 336 | | |
337 | 337 | | |
| |||
Lines changed: 9 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
23 | 31 | | |
24 | 32 | | |
25 | 33 | | |
| |||
0 commit comments