Imported Upstream version 67.3.2

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 573fc768299fe03e0c2bcb10bd0ffcd89e7be4b0..e39a80ec650ee7ae9a7850b745ced71db48447f5 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 67.3.1
+current_version = 67.3.2
 commit = True
 tag = True
 

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 672acd18857b3f85cf53c4bbd8d37b6f2fa61699..1c42bf5a94e59903c3540bd271dd581093126b61 100644 (file)
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -95,8 +95,13 @@ body:
     label: How to Reproduce
     description: >-
       Describe the steps to reproduce this bug.
+      
+      Please try to create a [minimal reproducer](https://stackoverflow.com/help/minimal-reproducible-example),
+      and avoid things like "see the steps in the CI logs".
     placeholder: |
-      1. Integrate setuptools via '...'
+      1. Clone a simplified example: `git clone ...`
+      2. Create a virtual environment for isolation with `...`
+      2. Build the project with setuptools via '...'
       2. Then run '...'
       3. An error occurs.
   validations:

diff --git a/CHANGES.rst b/CHANGES.rst
index e2229e8b87ee96443782deed68a36119c48eedd1..2ea02d3caa7e4ff2fba131897b7b9282b32915e2 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+v67.3.2
+-------
+
+
+Misc
+^^^^
+* #3827: Improve deprecation warning message on ``pkg_resources.declare_namespace``
+  to display package name.
+
+
 v67.3.1
 -------
 

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index aed691ac4c7bd806f3c50cb30c51cab0275c4c5b..1eb3f9e2d8c1d76f5466c1b007ddf411396e34e7 100644 (file)
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -2289,6 +2289,7 @@ def declare_namespace(packageName):
     """Declare that package 'packageName' is a namespace package"""
 
     msg = (
+        f"Deprecated call to `pkg_resources.declare_namespace({packageName!r})`.\n"
         "Implementing implicit namespace packages (as specified in PEP 420) "
         "is preferred to `pkg_resources.declare_namespace`. "
         "See https://setuptools.pypa.io/en/latest/references/"

diff --git a/setup.cfg b/setup.cfg
index 30bb742b3fd1129e5794a0f06fab4714b9756bf8..90259f3d769e231fa36ada6e75f66172a6d8964f 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 67.3.1
+version = 67.3.2
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages