Imported Upstream version 60.0.4

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index bb1c47a5ce35dbfe4f9ad74f4ec82f3b77909494..ce25a8c90ecd4564789a2d665d55c3453d5a17d5 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 60.0.3
+current_version = 60.0.4
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index 4fab510f734b39b61c2cf19697a8e30561681685..9145ac94b27e3cca57eb2cbe1c593f620a305776 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.0.4
+-------
+
+
+Misc
+^^^^
+* #2954: Merge with pypa/distutils@eba2bcd310. Adds platsubdir to config vars available for substitution.
+
+
 v60.0.3
 -------
 

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

diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py
index 40be5ba67bd6096740c014ed982e11492a07f143..4f9447257f78481bd7b2eb6b1791f56d1b3dde94 100644 (file)
--- a/setuptools/_distutils/command/install.py
+++ b/setuptools/_distutils/command/install.py
@@ -395,6 +395,7 @@ class install(Command):
                             'platlibdir': getattr(sys, 'platlibdir', 'lib'),
                             'implementation_lower': _get_implementation().lower(),
                             'implementation': _get_implementation(),
+                            'platsubdir': sysconfig.get_config_var('platsubdir'),
                            }
 
         if HAS_USER_SITE: