Imported Upstream version 58.5.1

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1f0b2d3d7d4a72cbc61e0aeadf2b8d8d6b959e77..492bc2d3d9592aa8c1fe510ccf99f47495dccb2e 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 58.5.0
+current_version = 58.5.1
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index 26b8d67594d0d8d89653c8ac8acef5a1d8c7f1e7..a0583676cd6aba1fb7dcc04301f6638f5539e91c 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v58.5.1
+-------
+
+
+Misc
+^^^^
+* #2486: Move PkgResourcesDeprecationWarning above implicitly-called function so that it's in the namespace when version warnings are generated in an environment that contains them.
+
+
 v58.5.0
 -------
 

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 3aafe6525c34cc6e2e83a9804d92935e54cd1e49..4aece3c44fdecda1cdcc32b0e744cb318459dfb2 100644 (file)
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -3244,6 +3244,15 @@ def _initialize(g=globals()):
     )
 
 
+class PkgResourcesDeprecationWarning(Warning):
+    """
+    Base class for warning about deprecations in ``pkg_resources``
+
+    This class is not derived from ``DeprecationWarning``, and as such is
+    visible by default.
+    """
+
+
 @_call_aside
 def _initialize_master_working_set():
     """
@@ -3282,12 +3291,3 @@ def _initialize_master_working_set():
     # match order
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
-
-
-class PkgResourcesDeprecationWarning(Warning):
-    """
-    Base class for warning about deprecations in ``pkg_resources``
-
-    This class is not derived from ``DeprecationWarning``, and as such is
-    visible by default.
-    """

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