From 8a4a6c7ce44ffcd844fe80342f9dee44dca204be Mon Sep 17 00:00:00 2001 From: JinWang An Date: Mon, 27 Mar 2023 17:02:41 +0900 Subject: [PATCH] Imported Upstream version 60.0.4 --- .bumpversion.cfg | 2 +- CHANGES.rst | 9 +++++++++ setup.cfg | 2 +- setuptools/_distutils/command/install.py | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bb1c47a..ce25a8c 100644 --- 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 4fab510..9145ac9 100644 --- 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 77095b6..08eefc4 100644 --- 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 40be5ba..4f94472 100644 --- 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: -- 2.34.1