Imported Upstream version 58.4.0

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 57793568c128d437f6977fc54c3d2ac03f514521..095e606fcea57a946bea8c4cc2be1328014826a1 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 58.3.0
+current_version = 58.4.0
 commit = True
 tag = True
 

diff --git a/.editorconfig b/.editorconfig
index 6385b5734383ace48449d3910bdd3a12f59d2846..b8aeea177b3869aaf7cfcdc1b8b272fee9c202e6 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,7 @@ end_of_line = lf
 
 [*.py]
 indent_style = space
+max_line_length = 88
 
 [*.{yml,yaml}]
 indent_style = space

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b348056b7d536c601f6da8e87eb1ea4e45d43894..a82b6fd29962f0e4631dd0f33c4501c0954c73f9 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,11 @@ jobs:
         - pypy3
         - 3.6
         - 3.9
-        - 3.10.0-alpha - 3.10.99
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        - "3.10"
+        platform:
+        - ubuntu-latest
+        - macos-latest
+        - windows-latest
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +45,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: |
           python -m pip install tox

diff --git a/CHANGES.rst b/CHANGES.rst
index c8ecd1e5a8f90144a60be0dce65e05dd8f4cdf55..89e525c454181dc10f3521c31f1e9cd4c356031e 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+v58.4.0
+-------
+
+
+Changes
+^^^^^^^
+* #2497: Officially deprecated PEP 440 non-compliant versions.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2932: Removed the deprecated ``data_files`` option from the example in the
+  declarative configuration docs -- by :user:`abravalheri`
+* #2932: Change type of ``data_files`` option from ``dict`` to ``section`` in
+  declarative configuration docs (to match previous example) -- by
+  :user:`abravalheri`
+
+
 v58.3.0
 -------
 
@@ -7,7 +24,7 @@ Changes
 * #917: ``setup.py install`` and ``easy_install`` commands are now officially deprecated. Use other standards-based installers (like pip) and builders (like build). Workloads reliant on this behavior should pin to this major version of Setuptools.
 * #1988: Deprecated the ``bdist_rpm`` command. Binary packages should be built as wheels instead.
   -- by :user:`hugovk`
-* #2785: Replace confirparser's readfp with read_file, deprecated since Python 3.2.
+* #2785: Replace ``configparser``'s ``readfp`` with ``read_file``, deprecated since Python 3.2.
   -- by :user:`hugovk`
 * #2823: Officially deprecated support for ``setup_requires``. Users are encouraged instead to migrate to PEP 518 ``build-system.requires`` in ``pyproject.toml``. Users reliant on ``setup_requires`` should consider pinning to this major version to avoid disruption.
 

diff --git a/docs/conf.py b/docs/conf.py
index 8f1e1f4c6d1ecbdbd24ff7fc5ff8a22ca993c966..ba541423f1e89165bc80eff3b8f977ec44a4a0de 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,17 +76,24 @@ link_files = {
 # Be strict about any broken references:
 nitpicky = True
 
+# Include Python intersphinx mapping to prevent failures
+# jaraco/skeleton#51
+extensions += ['sphinx.ext.intersphinx']
 intersphinx_mapping = {
-    'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None)
+    'python': ('https://docs.python.org/3', None),
 }
 
+intersphinx_mapping.update({
+    'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None)
+})
+
 # Add support for linking usernames
 github_url = 'https://github.com'
 github_sponsors_url = f'{github_url}/sponsors'
 extlinks = {
     'user': (f'{github_sponsors_url}/%s', '@'),  # noqa: WPS323
 }
-extensions += ['sphinx.ext.extlinks', 'sphinx.ext.intersphinx']
+extensions += ['sphinx.ext.extlinks']
 
 # Ref: https://github.com/python-attrs/attrs/pull/571/files\
 #      #diff-85987f48f1258d9ee486e3191495582dR82

diff --git a/docs/development/developer-guide.rst b/docs/development/developer-guide.rst
index d6ed2c1f3ce5fc1c48241e1c5527b3e99a73d035..052ca76230b78e4f7af2d81ad5ac2b11dd06b124 100644 (file)
--- a/docs/development/developer-guide.rst
+++ b/docs/development/developer-guide.rst
@@ -123,5 +123,14 @@ setuptools from source. Eventually, this limitation may be lifted as
 PEP 517/518 reach ubiquitous adoption, but for now, Setuptools
 cannot declare dependencies other than through
 ``setuptools/_vendor/vendored.txt`` and
-``pkg_resources/_vendor/vendored.txt`` and refreshed by way of
-``paver update_vendored`` (pavement.py).
+``pkg_resources/_vendor/vendored.txt``.
+
+All the dependencies specified in these files are "vendorized" using Paver_, a
+simple Python-based project scripting and task running tool.
+
+To refresh the dependencies, you can run the following command (defined in
+``pavement.py``)::
+
+    $ paver update_vendored
+
+.. _Paver: https://pythonhosted.org/Paver/

diff --git a/docs/userguide/declarative_config.rst b/docs/userguide/declarative_config.rst
index abafe376843bea23c58ef55d442dc370a373ed12..d1c25df1973b0455bafab0b0beffc2999a42bc9a 100644 (file)
--- a/docs/userguide/declarative_config.rst
+++ b/docs/userguide/declarative_config.rst
@@ -63,13 +63,6 @@ boilerplate code in some cases.
         src.subpackage1
         src.subpackage2
 
-    [options.data_files]
-    /etc/my_package =
-        site.d/00_default.conf
-        host.d/00_default.conf
-    data = data/img/logo.png, data/svg/icon.svg
-    fonts = data/fonts/*.ttf, data/fonts/*.otf
-
 Metadata and options are set in the config sections of the same name.
 
 * Keys are the same as the keyword arguments one provides to the ``setup()``
@@ -222,7 +215,7 @@ package_data             section                                              [#
 exclude_package_data     section
 namespace_packages       list-comma
 py_modules               list-comma                            34.4.0
-data_files               dict                                 40.6.0
+data_files               section                              40.6.0          [#opt-4]_
 =======================  ===================================  =============== =========
 
 **Notes**:
@@ -250,6 +243,9 @@ data_files               dict                                 40.6.0
 
    The ``find_namespace:`` directive is supported since Python >=3.3.
 
+.. [#opt-4] ``data_files`` is deprecated and should be avoided.
+   Please check :doc:`/userguide/datafiles` for more information.
+
 
 Compatibility with other tools
 ==============================

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index c84f1dd9e89407c3ba7dee18d045bc008fa8b905..3aafe6525c34cc6e2e83a9804d92935e54cd1e49 100644 (file)
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -113,6 +113,11 @@ def parse_version(v):
     try:
         return packaging.version.Version(v)
     except packaging.version.InvalidVersion:
+        warnings.warn(
+            f"{v} is an invalid version and will not be supported in "
+            "a future release",
+            PkgResourcesDeprecationWarning,
+        )
         return packaging.version.LegacyVersion(v)
 
 

diff --git a/pyproject.toml b/pyproject.toml
index 70e3473d44d52693beb0e8bccdd2001be9fbfd91..03c40125c96aff60f84371f15b8e5ac9442b8ec9 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,5 @@
 [build-system]
-requires = [
-    "wheel",
-]
+requires = []
 build-backend = "setuptools.build_meta"
 backend-path = ["."]
 

diff --git a/pytest.ini b/pytest.ini
index c7b62cc6577bece5acfb58197bb6794fd11ba6ab..2678afd84668444b5b33b553da7eceef814f7f38 100644 (file)
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,8 +5,6 @@ addopts=
        --doctest-glob=pkg_resources/api_tests.txt
        -r sxX
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
 filterwarnings=
        # Fail on warnings
        error
@@ -33,3 +31,6 @@ filterwarnings=
        # https://github.com/pypa/setuptools/issues/917
        ignore:setup.py install is deprecated.
        ignore:easy_install command is deprecated.
+
+       # https://github.com/pypa/setuptools/issues/2497
+       ignore:.* is an invalid version and will not be supported::pkg_resources

diff --git a/setup.cfg b/setup.cfg
index 65c9479c131657a86745caed199884ee7208afce..50622ccf69a57eca7962b60900d82fe45733a3cf 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 58.3.0
+version = 58.4.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages
@@ -39,7 +39,7 @@ exclude =
 [options.extras_require]
 testing =
        # upstream
-       pytest >= 4.6
+       pytest >= 6
        pytest-checkdocs >= 2.4
        pytest-flake8
        pytest-black >= 0.3.7; \

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 462e20c78fcb77ec9b8affa29c78208022c6e182..2abedfc79dc15585b75085b74c712a1642dd1168 100644 (file)
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -75,15 +75,7 @@ def _get_pip_versions():
     def skip_network(param):
         return param if network else mark(param, pytest.mark.skip(reason="no network"))
 
-    issue2599 = pytest.mark.skipif(
-        sys.version_info > (3, 10),
-        reason="pypa/setuptools#2599",
-    )
-
     network_versions = [
-        mark('pip==9.0.3', issue2599),
-        mark('pip==10.0.1', issue2599),
-        mark('pip==18.1', issue2599),
         mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
         'pip==20.0.2',
         'https://github.com/pypa/pip/archive/main.zip',