Merge branch 'master' into bugfix/2228-spawn-missing

.bumpversion.cfg

 [bumpversion]
-current_version = 49.0.1
+current_version = 49.1.0
 commit = True
 tag = True
 

CHANGES.rst

@@ -4,6 +4,12 @@ v49.0.1
 * #2228: Applied fix for pypa/distutils#3, restoring expectation that spawn will raise a DistutilsExecError when attempting to execute a missing file.
 
 
+v49.1.0
+-------
+
+* #2228: Disabled distutils adoption for now while emergent issues are addressed.
+
+
 v49.0.0
 -------
 
@@ -16,7 +22,8 @@ v49.0.0
 v48.0.0
 -------
 
-* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils.
+* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects.
+  To avoid getting any legacy behavior from the standard library, projects are advised to always "import setuptools" prior to importing anything from distutils. This behavior happens by default when using ``pip install`` or ``pep517.build``. Workflows that rely on ``setup.py (anything)`` will need to first ensure setuptools is imported. One way to achieve this behavior without modifying code is to invoke Python thus: ``python -c "import setuptools; exec(open('setup.py').read())" (anything)``.
 
 
 v47.3.2

README.rst

+.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
+
+
 .. image:: https://img.shields.io/pypi/v/setuptools.svg
    :target: `PyPI link`_
 
@@ -24,6 +27,7 @@
 .. image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat
    :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme
 
+
 See the `Installation Instructions
 <https://packaging.python.org/installing/>`_ in the Python Packaging
 User's Guide for instructions on installing, upgrading, and uninstalling

conftest.py

@@ -15,6 +15,7 @@ collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
+    'setuptools/distutils_patch.py',
 ]
 
 

docs/index.txt

-Welcome to Setuptools' documentation!
-=====================================
+.. image:: https://raw.githubusercontent.com/pypa/setuptools/master/docs/logo/banner%201%20line%20color.svg
 
-Setuptools is a fully-featured, actively-maintained, and stable library
-designed to facilitate packaging Python projects, where packaging includes:
 
- - Python package and module definitions
- - Distribution package metadata
- - Test hooks
- - Project installation
- - Platform-specific details
- - Python 3 support
+Documentation
+=============
+
+Setuptools is a fully-featured, actively-maintained, and stable library
+designed to facilitate packaging Python projects.
 
 Documentation content:
 

docs/logo/README.md

+![](setup_tools_logo_colour.svg)
+### Design:
+
+Setuptools logo designed in 2020 by [C.Rogers](crogersmedia.com) for the Setuptools project using the Free Open Source graphics editor [Inkscape](inkscape.org).
+
+### Copyright:
+Logo is (c) the Setuptools developers.
+
+### Font:
+The font used is the Open Font "Josefin Sans", which is available for free under the Open Font License (OFL).

docs/logo/josefinsans/.uuid

+922c129c-9f4c-4831-b632-c7f43be6feb0
\ No newline at end of file

docs/logo/josefinsans/DESCRIPTION.en_us.html

+<p>
+The idea of this typeface is to be geometric, elegant, with a vintage feeling, for use at larger sizes.
+It is inspired by geometric sans serif designs from the 1920s.
+The x-height is half way from baseline to cap height, an unusual proportion.
+</p>
+<p>
+There is a sister family, <a href="https://fonts.google.com/specimen/Josefin+Slab">Josefin Slab</a>
+</p>
+

docs/logo/josefinsans/METADATA.pb

+name: "Josefin Sans"
+designer: "Santiago Orozco"
+license: "OFL"
+category: "SANS_SERIF"
+date_added: "2010-11-17"
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 100
+  filename: "JosefinSans-Thin.ttf"
+  post_script_name: "JosefinSans-Thin"
+  full_name: "Josefin Sans Thin"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 100
+  filename: "JosefinSans-ThinItalic.ttf"
+  post_script_name: "JosefinSans-ThinItalic"
+  full_name: "Josefin Sans Thin Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 300
+  filename: "JosefinSans-Light.ttf"
+  post_script_name: "JosefinSans-Light"
+  full_name: "Josefin Sans Light"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 300
+  filename: "JosefinSans-LightItalic.ttf"
+  post_script_name: "JosefinSans-LightItalic"
+  full_name: "Josefin Sans Light Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 400
+  filename: "JosefinSans-Regular.ttf"
+  post_script_name: "JosefinSans-Regular"
+  full_name: "Josefin Sans Regular"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 400
+  filename: "JosefinSans-Italic.ttf"
+  post_script_name: "JosefinSans-Italic"
+  full_name: "Josefin Sans Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 600
+  filename: "JosefinSans-SemiBold.ttf"
+  post_script_name: "JosefinSans-SemiBold"
+  full_name: "Josefin Sans SemiBold"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 600
+  filename: "JosefinSans-SemiBoldItalic.ttf"
+  post_script_name: "JosefinSans-SemiBoldItalic"
+  full_name: "Josefin Sans SemiBold Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "normal"
+  weight: 700
+  filename: "JosefinSans-Bold.ttf"
+  post_script_name: "JosefinSans-Bold"
+  full_name: "Josefin Sans Bold"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+fonts {
+  name: "Josefin Sans"
+  style: "italic"
+  weight: 700
+  filename: "JosefinSans-BoldItalic.ttf"
+  post_script_name: "JosefinSans-BoldItalic"
+  full_name: "Josefin Sans Bold Italic"
+  copyright: "Copyright 2010 The Josefin Sans Project Authors (https://github.com/ThomasJockin/JosefinSansFont-master), with Reserved Font Name \"Josefin Sans\"."
+}
+subsets: "latin"
+subsets: "latin-ext"
+subsets: "menu"
+subsets: "vietnamese"

docs/logo/josefinsans/OFL.txt

+Copyright (c) 2010, Santiago Orozco (hi@typemade.mx)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

setup.cfg

@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 49.0.1
+version = 49.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

setuptools/__init__.py

@@ -3,7 +3,8 @@
 import os
 import functools
 
-import setuptools.distutils_patch  # noqa: F401
+# Disabled for now due to: #2228, #2230
+# import setuptools.distutils_patch  # noqa: F401
 
 import distutils.core
 import distutils.filelist