diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2018-07-11 09:16:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 09:16:49 -0400 |
| commit | 89155abb4222cf5a9dc81120e5c71e26b5af68f9 (patch) | |
| tree | 8f0559e943fafedd6720d596ac8ebdecdcf8bcc6 /setuptools/tests | |
| parent | e50d77efb25d9db04a87ceea483d6b74fc58cd91 (diff) | |
| parent | a5797d2c468c1d7005ea36b77ce00941e7c8b251 (diff) | |
| download | python-setuptools-git-89155abb4222cf5a9dc81120e5c71e26b5af68f9.tar.gz | |
Merge pull request #1312 from coldrye-collaboration/gh-97
fix #97 PEP420: find_packages()
Diffstat (limited to 'setuptools/tests')
| -rw-r--r-- | setuptools/tests/test_find_packages.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py index a6023de9..02ae5a94 100644 --- a/setuptools/tests/test_find_packages.py +++ b/setuptools/tests/test_find_packages.py @@ -7,14 +7,15 @@ import platform import pytest -import setuptools +from setuptools.extern.six import PY3 from setuptools import find_packages -find_420_packages = setuptools.PEP420PackageFinder.find +py3_only = pytest.mark.xfail(not PY3, reason="Test runs on Python 3 only") +if PY3: + from setuptools import find_packages_ns # modeled after CPython's test.support.can_symlink - def can_symlink(): TESTFN = tempfile.mktemp() symlink_path = TESTFN + "can_symlink" @@ -153,30 +154,35 @@ class TestFindPackages: def _assert_packages(self, actual, expected): assert set(actual) == set(expected) + @py3_only def test_pep420_ns_package(self): - packages = find_420_packages( + packages = find_packages_ns( self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets']) self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + @py3_only def test_pep420_ns_package_no_includes(self): - packages = find_420_packages( + packages = find_packages_ns( self.dist_dir, exclude=['pkg.subpkg.assets']) self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg']) + @py3_only def test_pep420_ns_package_no_includes_or_excludes(self): - packages = find_420_packages(self.dist_dir) - expected = [ - 'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets'] + packages = find_packages_ns(self.dist_dir) + expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets'] self._assert_packages(packages, expected) + @py3_only def test_regular_package_with_nested_pep420_ns_packages(self): self._touch('__init__.py', self.pkg_dir) - packages = find_420_packages( + packages = find_packages_ns( self.dist_dir, exclude=['docs', 'pkg.subpkg.assets']) self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + @py3_only def test_pep420_ns_package_no_non_package_dirs(self): shutil.rmtree(self.docs_dir) shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets')) - packages = find_420_packages(self.dist_dir) + packages = find_packages_ns(self.dist_dir) self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + |