Use find_namespace: instead of find:

See <pypa/setuptools#3340>
jwodder · Jun 4, 2022 · de88e8f · de88e8f
1 parent 3d07802
commit de88e8f
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ In Development
       to `.readthedocs.yaml`
     - Update `.pre-commit-config.yaml`
     - Update `Sphinx` version to `~=5.0`
+    - `setup.cfg`: Use `find_namespace:` instead of `find:` (See
+      <https://github.com/pypa/setuptools/issues/3340>)
 - Internal API:
     - Store project details in a `ProjectDetails` class
     - Add `Templater` and `TemplateWriter` classes

diff --git a/setup.cfg b/setup.cfg
@@ -41,7 +41,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/pyrepo/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/src/pyrepo/project.py b/src/pyrepo/project.py
@@ -134,7 +134,7 @@ def unflatten(self) -> None:
         log.info("Updating setup.cfg ...")
         setup_cfg = ConfigUpdater()
         setup_cfg.read(str(self.directory / "setup.cfg"), encoding="utf-8")
-        setup_cfg["options"]["py_modules"].value = "find:"
+        setup_cfg["options"]["py_modules"].value = "find_namespace:"
         setup_cfg["options"]["py_modules"].key = "packages"
         setup_cfg["options"].add_after.section("options.packages.find")
         opf = setup_cfg["options.packages.find"]
@@ -229,7 +229,7 @@ def add_pyversion(self, v: str) -> None:
             add_line_to_file(
                 self.directory / ".github" / "workflows" / "test.yml",
                 f"{' ' * 10}- '{pyv}'\n",
-                inserter=AfterLast(fr"^{' ' * 10}- ['\x22]?\d+\.\d+['\x22]?$"),
+                inserter=AfterLast(rf"^{' ' * 10}- ['\x22]?\d+\.\d+['\x22]?$"),
                 encoding="utf-8",
             )
         insort(self.details.python_versions, pyv)

diff --git a/src/pyrepo/templates/setup.cfg.j2 b/src/pyrepo/templates/setup.cfg.j2
@@ -49,7 +49,7 @@ project_urls =
 {% if is_flat_module %}
 py_modules = {{import_name}}
 {% else %}
-packages = find:
+packages = find_namespace:
 {% endif %}
 package_dir =
     =src

diff --git a/test/data/add_typing/flat/after/setup.cfg b/test/data/add_typing/flat/after/setup.cfg
@@ -34,7 +34,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/command-noflat-req/after/setup.cfg b/test/data/pyrepo_init/command-noflat-req/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/command-noflat/after/setup.cfg b/test/data/pyrepo_init/command-noflat/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/flat-typing/after/setup.cfg b/test/data/pyrepo_init/flat-typing/after/setup.cfg
@@ -34,7 +34,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-ci/after/setup.cfg b/test/data/pyrepo_init/nonflat-ci/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-noreq/after/setup.cfg b/test/data/pyrepo_init/nonflat-noreq/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-req/after/setup.cfg b/test/data/pyrepo_init/nonflat-req/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-tests-typing-ci/after/setup.cfg b/test/data/pyrepo_init/nonflat-tests-typing-ci/after/setup.cfg
@@ -34,7 +34,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-tests-typing/after/setup.cfg b/test/data/pyrepo_init/nonflat-tests-typing/after/setup.cfg
@@ -34,7 +34,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-tests/after/setup.cfg b/test/data/pyrepo_init/nonflat-tests/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/nonflat-typing/after/setup.cfg b/test/data/pyrepo_init/nonflat-typing/after/setup.cfg
@@ -34,7 +34,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/python_requires-noflat/after/setup.cfg b/test/data/pyrepo_init/python_requires-noflat/after/setup.cfg
@@ -32,7 +32,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/requires-noflat/after/setup.cfg b/test/data/pyrepo_init/requires-noflat/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/pyrepo_init/src-nonflat-tests/after/setup.cfg b/test/data/pyrepo_init/src-nonflat-tests/after/setup.cfg
@@ -33,7 +33,7 @@ project_urls =
     Bug Tracker = https://github.com/jwodder/foobar/issues
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 include_package_data = True

diff --git a/test/data/unflatten/command-flat/after/setup.cfg b/test/data/unflatten/command-flat/after/setup.cfg
@@ -37,7 +37,7 @@ project_urls =
     Say Thanks! = https://saythanks.io/to/jwodder
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 python_requires = ~=3.4

diff --git a/test/data/unflatten/flat/after/setup.cfg b/test/data/unflatten/flat/after/setup.cfg
@@ -37,7 +37,7 @@ project_urls =
     Say Thanks! = https://saythanks.io/to/jwodder
 
 [options]
-packages = find:
+packages = find_namespace:
 package_dir =
     =src
 python_requires = ~=3.4