Refactor testing and migrate examples to src-layout

pypa · Nov 20, 2023 · 376982a · 376982a
1 parent b0a98d0
commit 376982a
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/nox.yml b/.github/workflows/nox.yml
@@ -1,5 +1,10 @@
 name: nox
 on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   nox:
     strategy:
@@ -15,8 +20,7 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - run: python3 --version && python --version
-      - run: pip install --upgrade pip setuptools
-      - run: pip install nox pytest virtualenv
+      - run: pip install -r requirements.txt pytest
       - run: pytest . || true  # See pytest's warnings
       - run: nox --python ${{ matrix.python }}
       # - run: nox --python ${{ matrix.python }} --report report.json && python report_to_table.py
diff --git a/native/pkg_a/example_pkg/a/__init__.py → native/pkg_a/src/example_pkg/a/__init__.py b/native/pkg_a/example_pkg/a/__init__.py → native/pkg_a/src/example_pkg/a/__init__.py
diff --git a/native/pkg_b/example_pkg/b/__init__.py → native/pkg_b/src/example_pkg/b/__init__.py b/native/pkg_b/example_pkg/b/__init__.py → native/pkg_b/src/example_pkg/b/__init__.py
diff --git a/noxfile.py b/noxfile.py
@@ -17,8 +17,8 @@
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
-# -- REQUIRES: nox >= 2018.10.17
-# SEE: https://nox.readthedocs.io/en/stable/index.html
+# -- REQUIRES: nox >= 2023.04.22
+# SEE: https://nox.thea.codes/en/stable/index.html
 USE_PYTHON_VERSIONS_DEFAULT = ["3.8", "3.10", "3.12"]
 USE_PYTHON_VERSIONS = os.environ.get("NOXFILE_PYTHON_VERSIONS", "").split()
 if not USE_PYTHON_VERSIONS:
@@ -27,9 +27,8 @@
 
 install_commands = (
     ('pip', 'install', '.'),
-    ('pip', 'install', '-e', '.'),
-    ('python', 'setup.py', 'install'),
-    ('python', 'setup.py', 'develop'))
+    ('pip', 'install', '-e', '.')
+)
 
 
 def install_packages(session, package_a, package_b, command_a, command_b):

diff --git a/pkg_resources/pkg_a/setup.py b/pkg_resources/pkg_a/setup.py
@@ -28,7 +28,7 @@
 
     license='Apache Software License',
 
-    packages=find_packages(),
-    namespace_packages=['example_pkg'],
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
     zip_safe=False,
 )
diff --git a/pkg_resources/pkg_a/example_pkg/__init__.py → ...sources/pkg_a/src/example_pkg/__init__.py b/pkg_resources/pkg_a/example_pkg/__init__.py → ...sources/pkg_a/src/example_pkg/__init__.py
diff --git a/...resources/pkg_a/example_pkg/a/__init__.py → ...urces/pkg_a/src/example_pkg/a/__init__.py b/...resources/pkg_a/example_pkg/a/__init__.py → ...urces/pkg_a/src/example_pkg/a/__init__.py
diff --git a/pkg_resources/pkg_b/setup.py b/pkg_resources/pkg_b/setup.py
@@ -28,7 +28,7 @@
 
     license='Apache Software License',
 
-    packages=find_packages(),
-    namespace_packages=['example_pkg'],
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
     zip_safe=False,
 )
diff --git a/pkg_resources/pkg_b/example_pkg/__init__.py → ...sources/pkg_b/src/example_pkg/__init__.py b/pkg_resources/pkg_b/example_pkg/__init__.py → ...sources/pkg_b/src/example_pkg/__init__.py
diff --git a/...resources/pkg_b/example_pkg/b/__init__.py → ...urces/pkg_b/src/example_pkg/b/__init__.py b/...resources/pkg_b/example_pkg/b/__init__.py → ...urces/pkg_b/src/example_pkg/b/__init__.py
diff --git a/pkgutil/pkg_a/setup.py b/pkgutil/pkg_a/setup.py
@@ -28,6 +28,7 @@
 
     license='Apache Software License',
 
-    packages=find_packages(),
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
     zip_safe=False,
 )
diff --git a/pkgutil/pkg_a/example_pkg/__init__.py → pkgutil/pkg_a/src/example_pkg/__init__.py b/pkgutil/pkg_a/example_pkg/__init__.py → pkgutil/pkg_a/src/example_pkg/__init__.py
diff --git a/pkgutil/pkg_a/example_pkg/a/__init__.py → pkgutil/pkg_a/src/example_pkg/a/__init__.py b/pkgutil/pkg_a/example_pkg/a/__init__.py → pkgutil/pkg_a/src/example_pkg/a/__init__.py
diff --git a/pkgutil/pkg_b/setup.py b/pkgutil/pkg_b/setup.py
@@ -28,6 +28,7 @@
 
     license='Apache Software License',
 
-    packages=find_packages(),
+    packages=find_packages(where='src'),
+    package_dir={'': 'src'},
     zip_safe=False,
 )
diff --git a/pkgutil/pkg_b/example_pkg/__init__.py → pkgutil/pkg_b/src/example_pkg/__init__.py b/pkgutil/pkg_b/example_pkg/__init__.py → pkgutil/pkg_b/src/example_pkg/__init__.py
diff --git a/pkgutil/pkg_b/example_pkg/b/__init__.py → pkgutil/pkg_b/src/example_pkg/b/__init__.py b/pkgutil/pkg_b/example_pkg/b/__init__.py → pkgutil/pkg_b/src/example_pkg/b/__init__.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,5 @@
 # -- PYTHON PACKAGE REQUIREMENTS:
 # USE: pip install -r <THIS_FILE>
 
-setuptools 
-virtualenv
-nox >= 2018.10.17
+setuptools >= 68.2.2
+nox >= 2023.04.22
diff --git a/test/verify_packages.py b/test/verify_packages.py
@@ -0,0 +1,7 @@
+from example_pkg import a
+from example_pkg import b
+
+print(a.name)
+print(a.__path__)
+print(b.name)
+print(b.__path__)