summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Bravalheri <andersonbravalheri@gmail.com>2022-08-04 17:42:53 +0100
committerAnderson Bravalheri <andersonbravalheri@gmail.com>2022-08-04 17:42:53 +0100
commitda4249d7958ed58996e9d8a2856afc4bdebeea72 (patch)
treeeff576e6e636527a8450c1ead82ed1af554ec71d
parent0d3cf53483fb6be3a4f85d592098f75b134b5f7a (diff)
parent3181239daa400715896f2cac42e9f6ee2a500163 (diff)
downloadpython-setuptools-git-da4249d7958ed58996e9d8a2856afc4bdebeea72.tar.gz
Merge branch 'main' into feature/pep660
-rw-r--r--CHANGES.rst2
-rw-r--r--docs/userguide/package_discovery.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index eca0fc05..08ebd86c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -67,7 +67,7 @@ Breaking Changes
^^^^^^^^^^^^^^^^
* #3421: Drop setuptools' support for installing an entrypoint extra requirements at load time:
- the functionality has been broken since v60.8.0.
- - the mechanism to do so is deprecated (`fetch_build_eggs`).
+ - the mechanism to do so is deprecated (``fetch_build_eggs``).
- that use case (e.g. a custom command class entrypoint) is covered by making sure the necessary build requirements are declared.
Documentation changes
diff --git a/docs/userguide/package_discovery.rst b/docs/userguide/package_discovery.rst
index 2efc62b9..7dda84a8 100644
--- a/docs/userguide/package_discovery.rst
+++ b/docs/userguide/package_discovery.rst
@@ -279,7 +279,7 @@ the provided tools for package discovery:
[tool.setuptools.packages]
find = {} # Scanning implicit namespaces is active by default
# OR
- find = {namespace = false} # Disable implicit namespaces
+ find = {namespaces = false} # Disable implicit namespaces
Finding simple packages