Skip to content

Commit

Permalink
fix: exclude subpackage from setup.py if __init__.py is excluded (#…
Browse files Browse the repository at this point in the history
…1009) (#1626)

* fix: exclude subpackage from `setup.py` if `__init__.py` is excluded

Fixes: #1009

* fix: added missing test data

* fix: lint test data

* change (sdist.git): exclude folders with no python file

* fix (sdist.git): make black happy
  • Loading branch information
finswimmer authored Feb 28, 2020
1 parent 607e70f commit 90af3a4
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 1 deletion.
10 changes: 9 additions & 1 deletion poetry/masonry/builders/sdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,15 @@ def find_nearest_pkg(rel_path):
if from_top_level == ".":
continue

is_subpkg = any([filename.endswith(".py") for filename in filenames])
is_subpkg = any(
[filename.endswith(".py") for filename in filenames]
) and not all(
[
self.is_excluded(Path(path, filename).relative_to(self._path))
for filename in filenames
if filename.endswith(".py")
]
)
if is_subpkg:
subpkg_paths.add(from_top_level)
parts = from_top_level.split(os.sep)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
My Package
==========
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.1.0"
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from .. import __version__


def test_version():
assert __version__ == "0.1.0"
18 changes: 18 additions & 0 deletions tests/masonry/builders/fixtures/excluded_subpackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[tool.poetry]
name = "example"
version = "0.1.0"
description = ""
authors = ["Sébastien Eustace <sebastien@eustace.io>"]
exclude = [
"**/test/**/*",
]

[tool.poetry.dependencies]
python = "^3.6"

[tool.poetry.dev-dependencies]
pytest = "^3.0"

[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
15 changes: 15 additions & 0 deletions tests/masonry/builders/test_sdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,18 @@ def test_proper_python_requires_if_three_digits_precision_version_specified():
parsed = p.parsestr(to_str(pkg_info))

assert parsed["Requires-Python"] == "==2.7.15"


def test_excluded_subpackage():
poetry = Factory().create_poetry(project("excluded_subpackage"))

builder = SdistBuilder(poetry, NullEnv(), NullIO())
setup = builder.build_setup()

setup_ast = ast.parse(setup)

setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
ns = {}
exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)

assert ns["packages"] == ["example"]

0 comments on commit 90af3a4

Please sign in to comment.