Merge pull request #140 from npilon/sphinx-mermaid-pep-420

Use PEP 420 Native Namespace Packages

.github/workflows/test.yml

@@ -22,13 +22,12 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
-          cache-dependency-path: docs/requirements.txt
+          cache-dependency-path: setup.py
 
       - name: Install dependencies
         run: |
-          python -m pip install -r docs/requirements.txt
           python -m pip install -U pytest
-          python -m pip install -e .
+          python -m pip install -e .[test]
 
       - name: Test
         run: |

docs/requirements.txt

@@ -1,2 +1,2 @@
-Sphinx<7
+Sphinx
 myst-parser>=1.0.0

setup.py

@@ -1,4 +1,4 @@
-from setuptools import find_packages, setup
+from setuptools import find_namespace_packages, setup
 
 readme = open("README.rst", encoding="utf-8").read()
 changes = open("CHANGELOG.rst", encoding="utf-8").read()
@@ -58,8 +58,9 @@ def remove_block(text, token, margin=0):
         "Topic :: Utilities",
     ],
     platforms="any",
-    packages=find_packages(),
+    packages=find_namespace_packages(where='./', include=['sphinxcontrib.mermaid']),
+    package_dir={'': './'},
     include_package_data=True,
     install_requires=["sphinx", "pyyaml"],
-    namespace_packages=["sphinxcontrib"],
+    extras_require={'test': ['myst-parser', 'defusedxml', 'sphinx', 'pytest']},
 )

tests/conftest.py

@@ -1,9 +1,16 @@
+from pathlib import Path
+
 import pytest
-from sphinx.testing.path import path
+import sphinx
+from packaging.version import Version
+
 
 pytest_plugins = 'sphinx.testing.fixtures'
 
 
 @pytest.fixture(scope='session')
 def rootdir():
-    return path(__file__).parent.abspath() / 'roots'
+    if Version(sphinx.__version__) < Version('7.0.0'):
+        from sphinx.testing.path import path
+        return path(__file__).parent.abspath() / 'roots'
+    return Path(__file__).parent.absolute() / 'roots'