Migrated to the src layout

Fixes #37.
pypa · Jan 22, 2020 · e29a5bd · e29a5bd
1 parent 590bcb7
commit e29a5bd
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/codeqa-test-tag.yml b/.github/workflows/codeqa-test-tag.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Check code style with Flake8
       uses: TrueBrain/[email protected]
       with:
-        path: wheel tests
+        path: src tests
 
   test:
     needs: [flake8]

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include wheel *.py
+recursive-include src *.py
 recursive-include tests *.py *.h *.txt *.c *.dynlib
 recursive-include docs *.py *.rst make.bat Makefile
 include tests/testdata/test-1.0-py2.py3-none-any.whl

diff --git a/docs/news.rst b/docs/news.rst
@@ -9,6 +9,7 @@ Release Notes
 - Updated project packaging and testing configuration for :pep:`517`
 - Moved the contents of setup.py to setup.cfg
 - Fixed duplicate RECORD file when using "wheel pack" on Windows
+- Switched the project to use the "src" layout
 
 **0.33.6 (2019-08-18)**
 

diff --git a/setup.cfg b/setup.cfg
@@ -29,10 +29,15 @@ keywords = wheel, packaging
 license = MIT
 
 [options]
+package_dir=
+    = src
 packages = find:
 python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [options.extras_require]
 test =
     pytest >= 3.0.0
@@ -50,7 +55,6 @@ testpaths = tests
 
 [coverage:run]
 source = wheel
-omit = .tox/*
 
 [coverage:report]
 show_missing = true

diff --git a/wheel/__init__.py → src/wheel/__init__.py b/wheel/__init__.py → src/wheel/__init__.py
diff --git a/wheel/__main__.py → src/wheel/__main__.py b/wheel/__main__.py → src/wheel/__main__.py
diff --git a/wheel/bdist_wheel.py → src/wheel/bdist_wheel.py b/wheel/bdist_wheel.py → src/wheel/bdist_wheel.py
diff --git a/wheel/cli/__init__.py → src/wheel/cli/__init__.py b/wheel/cli/__init__.py → src/wheel/cli/__init__.py
diff --git a/wheel/cli/convert.py → src/wheel/cli/convert.py b/wheel/cli/convert.py → src/wheel/cli/convert.py
diff --git a/wheel/cli/pack.py → src/wheel/cli/pack.py b/wheel/cli/pack.py → src/wheel/cli/pack.py
diff --git a/wheel/cli/unpack.py → src/wheel/cli/unpack.py b/wheel/cli/unpack.py → src/wheel/cli/unpack.py
diff --git a/wheel/macosx_libfile.py → src/wheel/macosx_libfile.py b/wheel/macosx_libfile.py → src/wheel/macosx_libfile.py
diff --git a/wheel/metadata.py → src/wheel/metadata.py b/wheel/metadata.py → src/wheel/metadata.py
diff --git a/wheel/pep425tags.py → src/wheel/pep425tags.py b/wheel/pep425tags.py → src/wheel/pep425tags.py
diff --git a/wheel/pkginfo.py → src/wheel/pkginfo.py b/wheel/pkginfo.py → src/wheel/pkginfo.py
diff --git a/wheel/util.py → src/wheel/util.py b/wheel/util.py → src/wheel/util.py
diff --git a/wheel/wheelfile.py → src/wheel/wheelfile.py b/wheel/wheelfile.py → src/wheel/wheelfile.py
diff --git a/tox.ini b/tox.ini
@@ -10,11 +10,11 @@ skip_missing_interpreters = true
 isolated_build = true
 
 [testenv]
-commands = python -m pytest {posargs}
+commands = pytest {posargs}
 extras = test
 
 [testenv:flake8]
-basepython = python2.7
+basepython = python3
 deps = flake8
-commands = flake8 wheel tests
+commands = flake8 src tests
 skip_install = true