Python: Migrate to use "implicit namespace packages" (PEP 420)

crate · Nov 4, 2024 · 7034388 · 7034388
1 parent 931f782
commit 7034388
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 38 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,10 @@ Changes for crash
 
 Unreleased
 ==========
+- Python: Migrated to use "implicit namespace packages" instead of "declared
+  namespaces" for the ``crate`` namespace package, see `PEP 420`_.
+
+.. _PEP 420: https://peps.python.org/pep-0420/
 
 2024/04/24 0.31.5
 =================

diff --git a/crate/__init__.py b/crate/__init__.py
diff --git a/devtools/ci.sh b/devtools/ci.sh
@@ -2,6 +2,6 @@
 
 set -e -x
 
-isort --check --diff crate/ tests/ setup.py
-flake8 crate/crash
+isort --check --diff src/crate/ tests/ setup.py
+flake8 src/crate/crash
 coverage run -m unittest -v
diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@ def read(path):
     read('README.rst')
 )
 
-versionf_content = read(os.path.join('crate', 'crash', '__init__.py'))
+versionf_content = read(os.path.join('src', 'crate', 'crash', '__init__.py'))
 version_rex = r'^__version__ = [\'"]([^\'"]*)[\'"]$'
 m = re.search(version_rex, versionf_content, re.M)
 if m:
@@ -68,17 +68,18 @@ def read(path):
     license='Apache License 2.0',
     keywords='cratedb db data client shell',
     packages=['crate.crash'],
-    namespace_packages=['crate'],
+    package_dir={"": "src"},
     entry_points={
         'console_scripts': [
             'crash = crate.crash.command:main',
         ]
     },
     extras_require=dict(
         test=[
-            'crate[test]',
+            'crate[test]>=1.0.0.dev2',
+            'cratedb-toolkit[testing]',
+            'sqlalchemy-cratedb',
             'zc.customdoctests<2',
-            'cratedb-toolkit[test]',
         ],
         devel=[
             'coverage<8',

diff --git a/src/crate/__init__.py b/src/crate/__init__.py
diff --git a/crate/crash/__init__.py → src/crate/crash/__init__.py b/crate/crash/__init__.py → src/crate/crash/__init__.py
diff --git a/crate/crash/__main__.py → src/crate/crash/__main__.py b/crate/crash/__main__.py → src/crate/crash/__main__.py
diff --git a/crate/crash/command.py → src/crate/crash/command.py b/crate/crash/command.py → src/crate/crash/command.py
diff --git a/crate/crash/commands.py → src/crate/crash/commands.py b/crate/crash/commands.py → src/crate/crash/commands.py
diff --git a/crate/crash/config.py → src/crate/crash/config.py b/crate/crash/config.py → src/crate/crash/config.py
diff --git a/crate/crash/connect.txt → src/crate/crash/connect.txt b/crate/crash/connect.txt → src/crate/crash/connect.txt
diff --git a/crate/crash/keybinding.py → src/crate/crash/keybinding.py b/crate/crash/keybinding.py → src/crate/crash/keybinding.py
diff --git a/crate/crash/layout.py → src/crate/crash/layout.py b/crate/crash/layout.py → src/crate/crash/layout.py
diff --git a/crate/crash/output.txt → src/crate/crash/output.txt b/crate/crash/output.txt → src/crate/crash/output.txt
diff --git a/crate/crash/outputs.py → src/crate/crash/outputs.py b/crate/crash/outputs.py → src/crate/crash/outputs.py
diff --git a/crate/crash/printer.py → src/crate/crash/printer.py b/crate/crash/printer.py → src/crate/crash/printer.py
diff --git a/crate/crash/repl.py → src/crate/crash/repl.py b/crate/crash/repl.py → src/crate/crash/repl.py
diff --git a/crate/crash/sysinfo.py → src/crate/crash/sysinfo.py b/crate/crash/sysinfo.py → src/crate/crash/sysinfo.py
diff --git a/crate/crash/tabulate.py → src/crate/crash/tabulate.py b/crate/crash/tabulate.py → src/crate/crash/tabulate.py
diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -113,10 +113,10 @@ def __call__(self, *args, **kwargs):
 class DocumentationTest(TestCase):
 
     def test_output(self):
-        testfile('../crate/crash/output.txt')
+        testfile('../src/crate/crash/output.txt')
 
     def test_connect(self):
-        testfile('../crate/crash/connect.txt')
+        testfile('../src/crate/crash/connect.txt')
 
 
 class CommandTest(TestCase):