From dea2e76f1c9176b45aa1db7a9e8a7841a6a9a6f6 Mon Sep 17 00:00:00 2001
From: Nick Pilon <npilon@lexmachina.com>
Date: Fri, 7 Jun 2024 15:49:15 -0300
Subject: [PATCH] Adjust sphinxcontrib.mermaid for PEP 420

---
 setup.py                                          |  6 +++---
 sphinxcontrib/__init__.py                         | 12 ------------
 sphinxcontrib/{mermaid.py => mermaid/__init__.py} |  0
 sphinxcontrib/{ => mermaid}/autoclassdiag.py      |  0
 sphinxcontrib/{ => mermaid}/exceptions.py         |  0
 5 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 sphinxcontrib/__init__.py
 rename sphinxcontrib/{mermaid.py => mermaid/__init__.py} (100%)
 rename sphinxcontrib/{ => mermaid}/autoclassdiag.py (100%)
 rename sphinxcontrib/{ => mermaid}/exceptions.py (100%)

diff --git a/setup.py b/setup.py
index ce60012..dedcc3e 100644
--- a/setup.py
+++ b/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,8 @@ 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"],
 )
diff --git a/sphinxcontrib/__init__.py b/sphinxcontrib/__init__.py
deleted file mode 100644
index ae0f862..0000000
--- a/sphinxcontrib/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-    sphinxcontrib
-    ~~~~~~~~~~~~~
-
-    This package is a namespace package that contains all extensions
-    distributed in the ``sphinx-contrib`` distribution.
-
-    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/sphinxcontrib/mermaid.py b/sphinxcontrib/mermaid/__init__.py
similarity index 100%
rename from sphinxcontrib/mermaid.py
rename to sphinxcontrib/mermaid/__init__.py
diff --git a/sphinxcontrib/autoclassdiag.py b/sphinxcontrib/mermaid/autoclassdiag.py
similarity index 100%
rename from sphinxcontrib/autoclassdiag.py
rename to sphinxcontrib/mermaid/autoclassdiag.py
diff --git a/sphinxcontrib/exceptions.py b/sphinxcontrib/mermaid/exceptions.py
similarity index 100%
rename from sphinxcontrib/exceptions.py
rename to sphinxcontrib/mermaid/exceptions.py