- change package structure to move package code into a src subfolder

zopefoundation · Mar 7, 2021 · 2b7e266 · 2b7e266
1 parent fb7e08d
commit 2b7e266
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,8 @@ Change log
 1.0.1 (unreleased)
 ------------------
 
+- change package structure to move package code into a ``src`` subfolder
+
 
 1.0.0 (2020-11-13)
 ------------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,5 +5,5 @@ include buildout.cfg
 include zope4.cfg
 include tox.ini
 
-recursive-include Products *.py
-recursive-include Products *.zpt
+recursive-include src *.py
+recursive-include src *.zpt
diff --git a/setup.py b/setup.py
@@ -13,7 +13,6 @@
     'License :: OSI Approved :: Zope Public License',
     'Operating System :: OS Independent',
     'Framework :: Zope',
-    'Framework :: Zope :: 3',
     'Framework :: Zope :: 4',
     'Framework :: Zope :: 5',
     'Programming Language :: Python',
@@ -54,7 +53,8 @@
       keywords='Zope Database adapter SQLAlchemy',
       description='A generic database adapter for Zope',
       long_description=long_description,
-      packages=find_packages(),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       include_package_data=True,
       zip_safe=False,
       python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',

diff --git a/Products/SQLAlchemyDA/__init__.py → src/Products/SQLAlchemyDA/__init__.py b/Products/SQLAlchemyDA/__init__.py → src/Products/SQLAlchemyDA/__init__.py
diff --git a/Products/SQLAlchemyDA/config.py → src/Products/SQLAlchemyDA/config.py b/Products/SQLAlchemyDA/config.py → src/Products/SQLAlchemyDA/config.py
diff --git a/Products/SQLAlchemyDA/da.py → src/Products/SQLAlchemyDA/da.py b/Products/SQLAlchemyDA/da.py → src/Products/SQLAlchemyDA/da.py
@@ -7,7 +7,6 @@
 """
 
 import logging
-import os
 import random
 import time
 import warnings

diff --git a/...ucts/SQLAlchemyDA/pt/addSAWrapperForm.zpt → ...ucts/SQLAlchemyDA/pt/addSAWrapperForm.zpt b/...ucts/SQLAlchemyDA/pt/addSAWrapperForm.zpt → ...ucts/SQLAlchemyDA/pt/addSAWrapperForm.zpt
diff --git a/Products/SQLAlchemyDA/pt/info.zpt → src/Products/SQLAlchemyDA/pt/info.zpt b/Products/SQLAlchemyDA/pt/info.zpt → src/Products/SQLAlchemyDA/pt/info.zpt
diff --git a/Products/SQLAlchemyDA/pt/query.zpt → src/Products/SQLAlchemyDA/pt/query.zpt b/Products/SQLAlchemyDA/pt/query.zpt → src/Products/SQLAlchemyDA/pt/query.zpt
diff --git a/Products/SQLAlchemyDA/tests/__init__.py → src/Products/SQLAlchemyDA/tests/__init__.py b/Products/SQLAlchemyDA/tests/__init__.py → src/Products/SQLAlchemyDA/tests/__init__.py
diff --git a/...s/SQLAlchemyDA/tests/test_SQLAlchemyDA.py → ...s/SQLAlchemyDA/tests/test_SQLAlchemyDA.py b/...s/SQLAlchemyDA/tests/test_SQLAlchemyDA.py → ...s/SQLAlchemyDA/tests/test_SQLAlchemyDA.py
diff --git a/Products/__init__.py → src/Products/__init__.py b/Products/__init__.py → src/Products/__init__.py
diff --git a/tox.ini b/tox.ini
@@ -71,5 +71,5 @@ deps =
     #flake8-quotes
 
 commands =
-    isort --check-only --diff {toxinidir}/Products setup.py
-    flake8 Products setup.py
+    isort --check-only --diff {toxinidir}/src setup.py
+    flake8 src setup.py