Skip to content

Commit dbe2c38

Browse files
finswimmersdispater
authored andcommitted
fix: don't exclude files that are explicit included in wheel (#1336) (#1750)
1 parent 6c3d357 commit dbe2c38

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

poetry/masonry/builders/wheel.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ def _copy_module(self, wheel):
153153
else:
154154
rel_file = file.relative_to(self._path)
155155

156-
if self.is_excluded(rel_file.as_posix()):
156+
if self.is_excluded(rel_file.as_posix()) and isinstance(
157+
include, PackageInclude
158+
):
157159
continue
158160

159161
if file.suffix == ".pyc":

tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/data2.txt

Whitespace-only changes.

tests/masonry/builders/fixtures/exclude_nested_data_toml/pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ license = "MIT"
1010
readme = "README.rst"
1111

1212
exclude = ["**/data/", "**/*/item*"]
13+
include = ["my_package/data/data2.txt"]
1314

1415
homepage = "https://python-poetry.org/"
1516
repository = "https://github.com/python-poetry/poetry"

tests/masonry/builders/test_sdist.py

+1
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ def test_src_excluded_nested_data():
436436
assert "my-package-1.2.3/my_package/data/sub_data/data2.txt" not in names
437437
assert "my-package-1.2.3/my_package/data/sub_data/data3.txt" not in names
438438
assert "my-package-1.2.3/my_package/data/data1.txt" not in names
439+
assert "my-package-1.2.3/my_package/data/data2.txt" in names
439440
assert "my-package-1.2.3/my_package/puplic/publicdata.txt" in names
440441
assert "my-package-1.2.3/my_package/public/item1/itemdata1.txt" not in names
441442
assert (

tests/masonry/builders/test_wheel.py

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def test_wheel_excluded_nested_data():
9393
assert "my_package/data/sub_data/data2.txt" not in z.namelist()
9494
assert "my_package/data/sub_data/data3.txt" not in z.namelist()
9595
assert "my_package/data/data1.txt" not in z.namelist()
96+
assert "my_package/data/data2.txt" in z.namelist()
9697
assert "my_package/puplic/publicdata.txt" in z.namelist()
9798
assert "my_package/public/item1/itemdata1.txt" not in z.namelist()
9899
assert "my_package/public/item1/subitem/subitemdata.txt" not in z.namelist()

0 commit comments

Comments
 (0)