Imported Upstream version 60.0.2

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 0532998c3e10e1ae65e9f27d049a8bff2ab3138e..aff2d44482cd458806459643dba4b89d1618041a 100644 (file)
--- 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 b1119cff198cf6f6a024edc12358d134380c39e6..4d66fa19514989039d041ba08314275b8e6c9328 100644 (file)
--- 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 378bc8bb1ac2b7d8caf4167c9f4e7d986b4f5326..d6a59e18c8533813f6d88157dcc9d46ab79237ef 100644 (file)
--- 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 e81500572549888d04a0cf7c49ef4871d9df749c..fb34d10e096be462285050d149b7416395ed8115 100644 (file)
--- 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