zopefoundation · icemac · Feb 2, 2022 · Feb 1, 2022 · Feb 2, 2022
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,7 @@
 4.7.1 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Switch package to src-layout.
 
 
 4.7.0 (2021-04-13)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,7 +6,7 @@ include *.sh
 include *.yml
 
 recursive-include docs *
-recursive-include persistent *
+recursive-include src *
 recursive-include .github *.yml
 
 global-exclude *.dll
@@ -16,7 +16,7 @@ global-exclude *.so
 global-exclude coverage.xml
 
 prune docs/_build
-prune persistent/__pycache__
+prune src/persistent/__pycache__
 
 
 include .coveragerc

diff --git a/setup.py b/setup.py
@@ -42,33 +42,33 @@ def _read_file(filename):
     Extension(
         name='persistent.cPersistence',
         sources=[
-            'persistent/cPersistence.c',
-            'persistent/ring.c',
+            'src/persistent/cPersistence.c',
+            'src/persistent/ring.c',
         ],
         depends=[
-            'persistent/cPersistence.h',
-            'persistent/ring.h',
-            'persistent/ring.c',
+            'src/persistent/cPersistence.h',
+            'src/persistent/ring.h',
+            'src/persistent/ring.c',
         ],
         define_macros=list(define_macros),
     ),
     Extension(
         name='persistent.cPickleCache',
         sources=[
-            'persistent/cPickleCache.c',
-            'persistent/ring.c',
+            'src/persistent/cPickleCache.c',
+            'src/persistent/ring.c',
         ],
         depends=[
-            'persistent/cPersistence.h',
-            'persistent/ring.h',
-            'persistent/ring.c',
+            'src/persistent/cPersistence.h',
+            'src/persistent/ring.h',
+            'src/persistent/ring.c',
         ],
         define_macros=list(define_macros),
     ),
     Extension(
         name='persistent._timestamp',
         sources=[
-            'persistent/_timestamp.c',
+            'src/persistent/_timestamp.c',
         ],
         define_macros=list(define_macros),
     ),
@@ -81,8 +81,8 @@ def _read_file(filename):
     headers = []
 else:
     headers = [
-        'persistent/cPersistence.h',
-        'persistent/ring.h',
+        'src/persistent/cPersistence.h',
+        'src/persistent/ring.h',
     ]
 
 setup(name='persistent',
@@ -109,18 +109,16 @@ def _read_file(filename):
           "Operating System :: Microsoft :: Windows",
           "Operating System :: Unix",
       ],
-      author="Zope Corporation",
+      author="Zope Foundation and Contributors",
       author_email="zodb-dev@zope.org",
       url="https://github.com/zopefoundation/persistent/",
       license="ZPL 2.1",
-      platforms=["any"],
-      # Make sure we don't get 'terryfy' included in wheels
-      # created on macOS CI
-      packages=find_packages(include=("persistent",)),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       include_package_data=True,
       zip_safe=False,
       ext_modules=ext_modules,
-      cffi_modules=['persistent/_ring_build.py:ffi'],
+      cffi_modules=['src/persistent/_ring_build.py:ffi'],
       headers=headers,
       extras_require={
           'test': [
@@ -129,9 +127,7 @@ def _read_file(filename):
           ],
           'testing': (),
           'docs': [
-              # Until repoze.sphinx.autointerface supports Sphinx 4.x we cannot use it:
-              # https://github.com/repoze/repoze.sphinx.autointerface/issues/16
-              'Sphinx < 4',
+              'Sphinx',
               'repoze.sphinx.autointerface',
           ],
       },

diff --git a/persistent/__init__.py → src/persistent/__init__.py b/persistent/__init__.py → src/persistent/__init__.py
diff --git a/persistent/_compat.h → src/persistent/_compat.h b/persistent/_compat.h → src/persistent/_compat.h
diff --git a/persistent/_compat.py → src/persistent/_compat.py b/persistent/_compat.py → src/persistent/_compat.py
diff --git a/persistent/_ring_build.py → src/persistent/_ring_build.py b/persistent/_ring_build.py → src/persistent/_ring_build.py
diff --git a/persistent/_timestamp.c → src/persistent/_timestamp.c b/persistent/_timestamp.c → src/persistent/_timestamp.c
diff --git a/persistent/cPersistence.c → src/persistent/cPersistence.c b/persistent/cPersistence.c → src/persistent/cPersistence.c
diff --git a/persistent/cPersistence.h → src/persistent/cPersistence.h b/persistent/cPersistence.h → src/persistent/cPersistence.h
diff --git a/persistent/cPickleCache.c → src/persistent/cPickleCache.c b/persistent/cPickleCache.c → src/persistent/cPickleCache.c
diff --git a/persistent/dict.py → src/persistent/dict.py b/persistent/dict.py → src/persistent/dict.py
diff --git a/persistent/interfaces.py → src/persistent/interfaces.py b/persistent/interfaces.py → src/persistent/interfaces.py
diff --git a/persistent/list.py → src/persistent/list.py b/persistent/list.py → src/persistent/list.py
diff --git a/persistent/mapping.py → src/persistent/mapping.py b/persistent/mapping.py → src/persistent/mapping.py
diff --git a/persistent/persistence.py → src/persistent/persistence.py b/persistent/persistence.py → src/persistent/persistence.py
diff --git a/persistent/picklecache.py → src/persistent/picklecache.py b/persistent/picklecache.py → src/persistent/picklecache.py
diff --git a/persistent/ring.c → src/persistent/ring.c b/persistent/ring.c → src/persistent/ring.c
diff --git a/persistent/ring.h → src/persistent/ring.h b/persistent/ring.h → src/persistent/ring.h
diff --git a/persistent/ring.py → src/persistent/ring.py b/persistent/ring.py → src/persistent/ring.py
diff --git a/persistent/tests/__init__.py → src/persistent/tests/__init__.py b/persistent/tests/__init__.py → src/persistent/tests/__init__.py
diff --git a/persistent/tests/attrhooks.py → src/persistent/tests/attrhooks.py b/persistent/tests/attrhooks.py → src/persistent/tests/attrhooks.py
diff --git a/persistent/tests/cucumbers.py → src/persistent/tests/cucumbers.py b/persistent/tests/cucumbers.py → src/persistent/tests/cucumbers.py
diff --git a/persistent/tests/test__compat.py → src/persistent/tests/test__compat.py b/persistent/tests/test__compat.py → src/persistent/tests/test__compat.py
diff --git a/persistent/tests/test_docs.py → src/persistent/tests/test_docs.py b/persistent/tests/test_docs.py → src/persistent/tests/test_docs.py
diff --git a/persistent/tests/test_list.py → src/persistent/tests/test_list.py b/persistent/tests/test_list.py → src/persistent/tests/test_list.py
diff --git a/persistent/tests/test_mapping.py → src/persistent/tests/test_mapping.py b/persistent/tests/test_mapping.py → src/persistent/tests/test_mapping.py
diff --git a/persistent/tests/test_persistence.py → src/persistent/tests/test_persistence.py b/persistent/tests/test_persistence.py → src/persistent/tests/test_persistence.py
diff --git a/persistent/tests/test_picklecache.py → src/persistent/tests/test_picklecache.py b/persistent/tests/test_picklecache.py → src/persistent/tests/test_picklecache.py
diff --git a/persistent/tests/test_ring.py → src/persistent/tests/test_ring.py b/persistent/tests/test_ring.py → src/persistent/tests/test_ring.py
diff --git a/persistent/tests/test_timestamp.py → src/persistent/tests/test_timestamp.py b/persistent/tests/test_timestamp.py → src/persistent/tests/test_timestamp.py
diff --git a/persistent/tests/test_wref.py → src/persistent/tests/test_wref.py b/persistent/tests/test_wref.py → src/persistent/tests/test_wref.py
diff --git a/persistent/tests/utils.py → src/persistent/tests/utils.py b/persistent/tests/utils.py → src/persistent/tests/utils.py
diff --git a/persistent/timestamp.py → src/persistent/timestamp.py b/persistent/timestamp.py → src/persistent/timestamp.py
diff --git a/persistent/wref.py → src/persistent/wref.py b/persistent/wref.py → src/persistent/wref.py
diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@ envlist =
 extras =
     test
 commands =
-    zope-testrunner --test-path=. []
+    zope-testrunner --test-path=src []
 
 [testenv:py27-pure]
 basepython =
@@ -25,9 +25,9 @@ usedevelop = true
 basepython =
     python3.6
 commands =
-    coverage run -m zope.testrunner --test-path=.
-    python -c 'import os, subprocess; subprocess.check_call("coverage run -a -m zope.testrunner --test-path=.", env=dict(os.environ, PURE_PYTHON="1"), shell=True)'
-    python -c 'import os, subprocess; subprocess.check_call("coverage run -a -m zope.testrunner --test-path=.", env=dict(os.environ, PURE_PYTHON="0"), shell=True)'
+    coverage run -m zope.testrunner --test-path=src
+    python -c 'import os, subprocess; subprocess.check_call("coverage run -a -m zope.testrunner --test-path=src", env=dict(os.environ, PURE_PYTHON="1"), shell=True)'
+    python -c 'import os, subprocess; subprocess.check_call("coverage run -a -m zope.testrunner --test-path=src", env=dict(os.environ, PURE_PYTHON="0"), shell=True)'
     coverage report --fail-under=100
 deps =
     coverage