Imported Upstream version 67.3.1

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 8c289f07a2451b22abae3c85cad23fb4459ccd1d..e2229e8b87ee96443782deed68a36119c48eedd1 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v67.3.1
+-------
+
+
+Misc
+^^^^
+* #3823: Fixes ``egg_info`` code path triggered during integration with ``pip``.
+
+
 v67.3.0
 -------
 

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

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index afcde5a2a13b2f41c7750cd69ac20dfbf5befa48..e40df9bba7b7c581ab70bf07e0ed7f42d4209466 100644 (file)
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -250,7 +250,8 @@ class egg_info(InfoCommon, Command):
         # to the version info
         #
         pd = self.distribution._patched_dist
-        if pd is not None and pd.key == self.egg_name.lower():
+        key = getattr(pd, "key", None) or getattr(pd, "name", None)
+        if pd is not None and key == self.egg_name.lower():
             pd._version = self.egg_version
             pd._parsed_version = packaging.version.Version(self.egg_version)
             self.distribution._patched_dist = None