chore: use src layout (#332)

pypa · Sep 18, 2021 · 82d8651 · 82d8651
1 parent 16b2e80
commit 82d8651
Show file tree

Hide file tree

Showing 43 changed files with 21 additions and 10 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -4,8 +4,8 @@ omit=
 
 [paths]
 source =
-    auditwheel/
-    /auditwheel_src/auditwheel
+    src/auditwheel/
+    /auditwheel_src/src/auditwheel
 
 [report]
 exclude_lines =

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 default_language_version:
   python: python3.6
 
-exclude: ^auditwheel/_vendor/
+exclude: ^src/auditwheel/_vendor/
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/noxfile.py b/noxfile.py
@@ -22,7 +22,7 @@ def coverage(session: nox.Session) -> None:
     """
     Run coverage using unit tests.
     """
-    session.install("-r", "test-requirements.txt", "pytest-cov")
+    session.install("-r", "test-requirements.txt", "pytest-cov", ".")
     session.run(
         "python",
         "-m",
@@ -39,8 +39,10 @@ def _docker_images(session: nox.Session) -> List[str]:
     images_file = tmp_dir / "images.lst"
     script.write_text(
         fr"""
+import sys
 from pathlib import Path
-from tests.integration.test_manylinux import MANYLINUX_IMAGES
+sys.path.append("./tests/integration")
+from test_manylinux import MANYLINUX_IMAGES
 images = "\n".join(MANYLINUX_IMAGES.values())
 Path(r"{images_file}").write_text(images)
 """

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "pbr"]
+requires = ["setuptools>=42", "wheel", "pbr"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

diff --git a/setup.cfg b/setup.cfg
@@ -28,10 +28,19 @@ classifier =
 skip_changelog = 1
 skip_authors = 1
 
-[files]
-packages = auditwheel
+[options]
+include_package_data = True
+packages = find:
+package_dir =
+    =src
 
-[entry_points]
+[options.package_data]
+auditwheel = *.json
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
 console_scripts =
     auditwheel = auditwheel.main:main
 

diff --git a/auditwheel/__init__.py → src/auditwheel/__init__.py b/auditwheel/__init__.py → src/auditwheel/__init__.py
diff --git a/auditwheel/__main__.py → src/auditwheel/__main__.py b/auditwheel/__main__.py → src/auditwheel/__main__.py
diff --git a/auditwheel/_vendor/__init__.py → src/auditwheel/_vendor/__init__.py b/auditwheel/_vendor/__init__.py → src/auditwheel/_vendor/__init__.py
diff --git a/auditwheel/_vendor/wheel/LICENSE.txt → src/auditwheel/_vendor/wheel/LICENSE.txt b/auditwheel/_vendor/wheel/LICENSE.txt → src/auditwheel/_vendor/wheel/LICENSE.txt
diff --git a/auditwheel/_vendor/wheel/__init__.py → src/auditwheel/_vendor/wheel/__init__.py b/auditwheel/_vendor/wheel/__init__.py → src/auditwheel/_vendor/wheel/__init__.py
diff --git a/auditwheel/_vendor/wheel/cli/__init__.py → src/auditwheel/_vendor/wheel/cli/__init__.py b/auditwheel/_vendor/wheel/cli/__init__.py → src/auditwheel/_vendor/wheel/cli/__init__.py
diff --git a/auditwheel/_vendor/wheel/cli/convert.py → src/auditwheel/_vendor/wheel/cli/convert.py b/auditwheel/_vendor/wheel/cli/convert.py → src/auditwheel/_vendor/wheel/cli/convert.py
diff --git a/auditwheel/_vendor/wheel/cli/pack.py → src/auditwheel/_vendor/wheel/cli/pack.py b/auditwheel/_vendor/wheel/cli/pack.py → src/auditwheel/_vendor/wheel/cli/pack.py
diff --git a/auditwheel/_vendor/wheel/cli/unpack.py → src/auditwheel/_vendor/wheel/cli/unpack.py b/auditwheel/_vendor/wheel/cli/unpack.py → src/auditwheel/_vendor/wheel/cli/unpack.py
diff --git a/auditwheel/_vendor/wheel/pkginfo.py → src/auditwheel/_vendor/wheel/pkginfo.py b/auditwheel/_vendor/wheel/pkginfo.py → src/auditwheel/_vendor/wheel/pkginfo.py
diff --git a/auditwheel/_vendor/wheel/util.py → src/auditwheel/_vendor/wheel/util.py b/auditwheel/_vendor/wheel/util.py → src/auditwheel/_vendor/wheel/util.py
diff --git a/auditwheel/_vendor/wheel/wheelfile.py → src/auditwheel/_vendor/wheel/wheelfile.py b/auditwheel/_vendor/wheel/wheelfile.py → src/auditwheel/_vendor/wheel/wheelfile.py
diff --git a/auditwheel/condatools.py → src/auditwheel/condatools.py b/auditwheel/condatools.py → src/auditwheel/condatools.py
diff --git a/auditwheel/elfutils.py → src/auditwheel/elfutils.py b/auditwheel/elfutils.py → src/auditwheel/elfutils.py
diff --git a/auditwheel/error.py → src/auditwheel/error.py b/auditwheel/error.py → src/auditwheel/error.py
diff --git a/auditwheel/genericpkgctx.py → src/auditwheel/genericpkgctx.py b/auditwheel/genericpkgctx.py → src/auditwheel/genericpkgctx.py
diff --git a/auditwheel/hashfile.py → src/auditwheel/hashfile.py b/auditwheel/hashfile.py → src/auditwheel/hashfile.py
diff --git a/auditwheel/lddtree.py → src/auditwheel/lddtree.py b/auditwheel/lddtree.py → src/auditwheel/lddtree.py
diff --git a/auditwheel/libc.py → src/auditwheel/libc.py b/auditwheel/libc.py → src/auditwheel/libc.py
diff --git a/auditwheel/main.py → src/auditwheel/main.py b/auditwheel/main.py → src/auditwheel/main.py
diff --git a/auditwheel/main_addtag.py → src/auditwheel/main_addtag.py b/auditwheel/main_addtag.py → src/auditwheel/main_addtag.py
diff --git a/auditwheel/main_lddtree.py → src/auditwheel/main_lddtree.py b/auditwheel/main_lddtree.py → src/auditwheel/main_lddtree.py
diff --git a/auditwheel/main_repair.py → src/auditwheel/main_repair.py b/auditwheel/main_repair.py → src/auditwheel/main_repair.py
diff --git a/auditwheel/main_show.py → src/auditwheel/main_show.py b/auditwheel/main_show.py → src/auditwheel/main_show.py
diff --git a/auditwheel/musllinux.py → src/auditwheel/musllinux.py b/auditwheel/musllinux.py → src/auditwheel/musllinux.py
diff --git a/auditwheel/patcher.py → src/auditwheel/patcher.py b/auditwheel/patcher.py → src/auditwheel/patcher.py
diff --git a/auditwheel/policy/__init__.py → src/auditwheel/policy/__init__.py b/auditwheel/policy/__init__.py → src/auditwheel/policy/__init__.py
diff --git a/auditwheel/policy/external_references.py → src/auditwheel/policy/external_references.py b/auditwheel/policy/external_references.py → src/auditwheel/policy/external_references.py
diff --git a/auditwheel/policy/manylinux-policy.json → src/auditwheel/policy/manylinux-policy.json b/auditwheel/policy/manylinux-policy.json → src/auditwheel/policy/manylinux-policy.json
diff --git a/auditwheel/policy/musllinux-policy.json → src/auditwheel/policy/musllinux-policy.json b/auditwheel/policy/musllinux-policy.json → src/auditwheel/policy/musllinux-policy.json
diff --git a/auditwheel/policy/policy-schema.json → src/auditwheel/policy/policy-schema.json b/auditwheel/policy/policy-schema.json → src/auditwheel/policy/policy-schema.json
diff --git a/auditwheel/policy/versioned_symbols.py → src/auditwheel/policy/versioned_symbols.py b/auditwheel/policy/versioned_symbols.py → src/auditwheel/policy/versioned_symbols.py
diff --git a/auditwheel/repair.py → src/auditwheel/repair.py b/auditwheel/repair.py → src/auditwheel/repair.py
diff --git a/auditwheel/tmpdirs.py → src/auditwheel/tmpdirs.py b/auditwheel/tmpdirs.py → src/auditwheel/tmpdirs.py
diff --git a/auditwheel/tools.py → src/auditwheel/tools.py b/auditwheel/tools.py → src/auditwheel/tools.py
diff --git a/auditwheel/wheel_abi.py → src/auditwheel/wheel_abi.py b/auditwheel/wheel_abi.py → src/auditwheel/wheel_abi.py
diff --git a/auditwheel/wheeltools.py → src/auditwheel/wheeltools.py b/auditwheel/wheeltools.py → src/auditwheel/wheeltools.py
diff --git a/tests/integration/test_manylinux.py b/tests/integration/test_manylinux.py
@@ -77,7 +77,7 @@
 def find_src_folder():
     candidate = op.abspath(op.join(op.dirname(__file__), "../.."))
     contents = os.listdir(candidate)
-    if "setup.py" in contents and "auditwheel" in contents:
+    if "setup.py" in contents and "src" in contents:
         return candidate