aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_find_packages.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2019-01-27 10:02:52 -0500
committerGitHub <noreply@github.com>2019-01-27 10:02:52 -0500
commit0551421f082eea3f633bc6be23c16a04483aca98 (patch)
tree76c5b37e3a56a232b4b5b66ab7e933edbe64cd25 /setuptools/tests/test_find_packages.py
parent28872fc9e7d15a1acf3bc557795c76c5e64dbad3 (diff)
parent78fd73026ad7284819936b651f7cfbe8a1ec98c8 (diff)
downloadexternal_python_setuptools-0551421f082eea3f633bc6be23c16a04483aca98.tar.gz
external_python_setuptools-0551421f082eea3f633bc6be23c16a04483aca98.tar.bz2
external_python_setuptools-0551421f082eea3f633bc6be23c16a04483aca98.zip
Merge branch 'master' into license-fix-357
Diffstat (limited to 'setuptools/tests/test_find_packages.py')
-rw-r--r--setuptools/tests/test_find_packages.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index b08f91c7..ab26b4f1 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -12,10 +12,10 @@ from . import py3_only
from setuptools.extern.six import PY3
from setuptools import find_packages
if PY3:
- from setuptools import find_namespace_packages
+ from setuptools import find_namespace_packages
-# modeled after CPython's test.support.can_symlink
+# modeled after CPython's test.support.can_symlink
def can_symlink():
TESTFN = tempfile.mktemp()
symlink_path = TESTFN + "can_symlink"
@@ -164,12 +164,14 @@ class TestFindPackages:
def test_pep420_ns_package_no_includes(self):
packages = find_namespace_packages(
self.dist_dir, exclude=['pkg.subpkg.assets'])
- self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
+ self._assert_packages(
+ packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg'])
@py3_only
def test_pep420_ns_package_no_includes_or_excludes(self):
packages = find_namespace_packages(self.dist_dir)
- expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
+ expected = [
+ 'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets']
self._assert_packages(packages, expected)
@py3_only
@@ -185,4 +187,3 @@ class TestFindPackages:
shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets'))
packages = find_namespace_packages(self.dist_dir)
self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg'])
-