From ee452ad92d1b87c46ebc975396e01436173280a5 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.2 --- .bumpversion.cfg | 2 +- CHANGES.rst | 9 +++++++++ setup.cfg | 2 +- setuptools/command/easy_install.py | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 0532998..aff2d44 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 60.0.1 +current_version = 60.0.2 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index b1119cf..4d66fa1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,12 @@ +v60.0.2 +------- + + +Misc +^^^^ +* #2938: Select 'posix_user' for the scheme unless falling back to stdlib, then use 'unix_user'. + + v60.0.1 ------- diff --git a/setup.cfg b/setup.cfg index 378bc8b..d6a59e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = setuptools -version = 60.0.1 +version = 60.0.2 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/easy_install.py b/setuptools/command/easy_install.py index e815005..fb34d10 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -378,7 +378,7 @@ class easy_install(Command): msg = "User base directory is not specified" raise DistutilsPlatformError(msg) self.install_base = self.install_platbase = self.install_userbase - scheme_name = os.name.replace('posix', 'unix') + '_user' + scheme_name = f'{os.name}_user' self.select_scheme(scheme_name) def _expand_attrs(self, attrs): @@ -722,7 +722,7 @@ class easy_install(Command): install._select_scheme(self, name) except AttributeError: # stdlib distutils - install.install.select_scheme(self, name) + install.install.select_scheme(self, name.replace('posix', 'unix')) # FIXME: 'easy_install.process_distribution' is too complex (12) def process_distribution( # noqa: C901 -- 2.34.1