Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-setuptools for
openSUSE:Factory checked in at 2022-08-08 08:44:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python-setuptools.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-setuptools"
Mon Aug 8 08:44:50 2022 rev:70 rq:989636 version:63.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes
2022-03-28 16:59:17.484865875 +0200
+++
/work/SRC/openSUSE:Factory/.python-setuptools.new.1521/python-setuptools.changes
2022-08-08 08:44:52.058395014 +0200
@@ -1,0 +2,525 @@
+Sat Jul 16 15:54:03 UTC 2022 - Arun Persaud <[email protected]>
+
+- update to version 63.2.0:
+ * Changes
+ + #3395: Included a performance optimization:
+ setuptools.build_meta no longer tries to :func:`compile` the
+ setup script code before :func:`exec`-ing it.
+ * Misc
+ + #3435: Corrected issue in macOS framework builds on Python 3.9
+ not installed by homebrew (pypa/distutils#158).
+
+-------------------------------------------------------------------
+Thu Jul 14 15:53:33 UTC 2022 - Ben Greiner <[email protected]>
+
+- Remove dependency on packaging -- boo#1178257
+- Enable ini2toml[lite] tests
+
+-------------------------------------------------------------------
+Wed Jul 13 09:01:18 UTC 2022 - Ben Greiner <[email protected]>
+
+- Update to version 63.1.0
+ * #3430: Merge with pypa/distutils@152c13d including
+ pypa/distutils#155 (improved compatibility for editable
+ installs on homebrew Python 3.9), pypa/distutils#150 (better
+ handling of runtime_library_dirs on cygwin), and
+ pypa/distutils#151 (remove warnings for namespace packages).
+- v63.0.0
+ * #3421: Drop setuptools' support for installing an entrypoint
+ extra requirements at load time:
+ - the functionality has been broken since v60.8.0.
+ - the mechanism to do so is deprecated (fetch_build_eggs).
+ - that use case (e.g. a custom command class entrypoint) is
+ covered by making sure the necessary build requirements are
+ declared. Documentation changes
+ * #3397: Fix reference for keywords to point to the Core Metadata
+ Specification instead of PEP 314 (the live standard is kept
+ always up-to-date and consolidates several PEPs together in a
+ single document).
+- v62.6.0
+ * #3253: Enabled using file: for requirements in setup.cfg -- by
+ :user:`akx` (this feature is currently considered to be in beta
+ stage).
+ * #3255: Enabled using file: for dependencies and
+ optional-dependencies in pyproject.toml -- by :user:`akx` (this
+ feature is currently considered to be in beta stage).
+ * #3391: Updated attr: to also extract simple constants with type
+ annotations -- by :user:`karlotness`
+- v62.5.0
+ * #3347: Changed warnings and documentation notes about
+ experimental aspect of pyproject.toml configuration: now
+ [project] is a fully supported configuration interface, but the
+ [tool.setuptools] table and sub-tables are still considered to
+ be in beta stage.
+ * #3383: In _distutils_hack, suppress/undo the use of local
+ distutils when select tests are imported in CPython.
+ * #3385: Modules used to parse and evaluate configuration from
+ pyproject.toml files are intended for internal use only and
+ that not part of the public API.
+- v62.4.0
+ * #3256: Added setuptools.command.build command to match
+ distutils.command.build -- by :user:`isuruf`
+ * #3366: Merge with pypa/distutils@75ed79d including reformat
+ using black, fix for Cygwin support (pypa/distutils#139), and
+ improved support for cross compiling (pypa/distutils#144 and
+ pypa/distutils#145).
+- v62.3.4
+ * #3354: Improve clarity in warning about unlisted namespace
+ packages.
+- v62.3.3
+ * #3336: Modified test_setup_install_includes_dependencies to
+ work with custom PYTHONPATH ???- by :user:`hroncok`
+- v62.3.2
+ * #3328: Include a first line summary to some of the existing
+ multi-line warnings.
+- v62.3.1
+ * #3320: Fixed typo which causes namespace_packages to raise an
+ error instead of warning.
+- v62.3.0
+ * #3262: Formally added deprecation messages for
+ namespace_packages. The methodology that uses pkg_resources and
+ namespace_packages for creating namespaces was already
+ discouraged by the :doc:`setuptools docs
+ </userguide/package_discovery>` and the :doc:`Python Packaging
+ User Guide <PyPUG:guides/packaging-namespace-packages>`,
+ therefore this change just make the deprecation more official.
+ Users can consider migrating to native/implicit namespaces (as
+ introduced in PEP 420).
+ * #3308: Relying on include_package_data to ensure sub-packages
+ are automatically added to the build wheel distribution (as
+ "data") is now considered a deprecated practice. This behaviour
+ was controversial and caused inconsistencies (#3260). Instead,
+ projects are encouraged to properly configure packages or use
+ discovery tools. General information can be found in
+ :doc:`userguide/package_discovery`.
+ * #1806: Allowed recursive globs (**) in package_data. -- by
+ :user:`nullableVoidPtr`
+ * #3206: Fixed behaviour when both install_requires (in setup.py)
+ and dependencies (in pyproject.toml) are specified. The
+ configuration in pyproject.toml will take precedence over
+ setup.py (in accordance with PEP 621). A warning was added to
+ inform users.
+ * #3274: Updated version of vendored pyparsing to 3.0.8 to avoid
+ problems with upcoming deprecation in Python 3.11.
+ * #3292: Added warning about incompatibility with old versions of
+ importlib-metadata.
+- v62.2.0
+ * #3299: Optional metadata fields are now truly optional.
+ Includes merge with pypa/distutils@a7cfb56 per
+ pypa/distutils#138.
+ * #3282: Added CI cache for setup.cfg examples used when testing
+ setuptools.config.
+- v62.1.0
+ * #3249: Simplified package_dir obtained via auto-discovery.
+- v62.0.0
+ * #3151: Made setup.py develop --user install to the user site
+ packages directory even if it is disabled in the current
+ interpreter.
+ * #3153: When resolving requirements use both canonical and
+ normalized names -- by :user:`ldaniluk`
+ * #3167: Honor unix file mode in ZipFile when installing wheel
+ via install_as_egg -- by :user:`delijati`
+ * #3088: Fixed duplicated tag with the dist-info command.
+ * #3247: Fixed problem preventing readme specified as dynamic in
+ pyproject.toml from being dynamically specified in setup.py.
+- v61.3.1
+ * #3233: Included missing test file setupcfg_examples.txt in
+ sdist.
+ * #3233: Added script that allows developers to download
+ setupcfg_examples.txt prior to running tests. By caching these
+ files it should be possible to run the test suite offline.
+- v61.3.0
+ * #3229: Disabled automatic download of trove-classifiers to
+ facilitate reproducibility.
+ * #3229: Updated pyproject.toml validation via validate-pyproject
+ v0.7.1.
+ * #3229: New internal tool made available for updating the code
+ responsible for the validation of pyproject.toml. This tool can
+ be executed via tox -e generate-validation-code.
+- v61.2.0
+ * #3215: Ignored a subgroup of invalid pyproject.toml files that
+ use the [project] table to specify only requires-python
+ (transitional).
+ * Warning: Please note that future releases of setuptools will
+ halt the build process if a pyproject.toml file that does not
+ match the PyPA Specification
+ <PyPUG:specifications/declaring-project-metadata> is given.
+ * #3215: Updated pyproject.toml validation, as generated by
+ validate-pyproject==0.6.1.
+ * #3218: Prevented builds from erroring if the project specifies
+ metadata via pyproject.toml, but uses other files (e.g.
+ setup.py) to complement it, without setting dynamic properly.
+ * Important: This is a transitional behaviour. Future releases of
+ setuptools may simply ignore externally set metadata not backed
+ by dynamic or even halt the build with an error.
+ * #3224: Merge changes from pypa/distutils@e1d5c9b1f6
+ + #3223: Fixed missing requirements with environment markers when
+ optional-dependencies is set in pyproject.toml.
+- v61.1.1
+ * #3212: Fixed missing dependencies when running setup.py
+ install. Note that calling setup.py install directly is still
+ deprecated and will be removed in future versions of
+ setuptools. Please check the release notes for
+ :ref:`setup_install_deprecation_note`.
+- v61.1.0
+ * #3206: Changed setuptools.convert_path to an internal function
+ that is not exposed as part of setuptools API. Future releases
+ of setuptools are likely to remove this function.
+ * #3202: Changed behaviour of auto-discovery to not explicitly
+ expand package_dir for flat-layouts and to not use relative
+ paths starting with ./.
+ * #3203: Prevented pyproject.toml parsing from overwriting
+ dist.include_package_data explicitly set in setup.py with
+ default value.
+ * #3208: Added a warning for non existing files listed with the
+ file directive in setup.cfg and pyproject.toml.
+ * #3208: Added a default value for dynamic classifiers in
+ pyproject.toml when files are missing and errors being ignored.
+ * #3211: Disabled auto-discovery when distribution class has a
+ configuration attribute (e.g. when the setup.py script contains
+ setup(..., configuration=...)). This is done to ensure
+ extension-only packages created with
+ numpy.distutils.misc_util.Configuration are not broken by the
+ safe guard behaviour to avoid accidental multiple top-level
+ packages in a flat-layout.
+ * Note Users that don't set packages, py_modules, or
+ configuration are still likely to observe the auto-discovery
+ behavior, which may halt the build if the project contains
+ multiple directories and/or multiple Python files directly
+ under the project root. To disable auto-discovery please
+ explicitly set either packages or py_modules. Alternatively you
+ can also configure :ref:`custom-discovery`.
+- v61.0.0
+ * #3068: Deprecated setuptools.config.read_configuration,
+ setuptools.config.parse_configuration and other functions or
+ classes from setuptools.config.
+ * Users that still need to parse and process configuration from
+ setup.cfg can import a direct replacement from
++++ 328 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/python-setuptools/python-setuptools.changes
++++ and
/work/SRC/openSUSE:Factory/.python-setuptools.new.1521/python-setuptools.changes
Old:
----
remove-more-itertools-dependency-cycle.patch
setuptools-58.3.0.tar.gz
New:
----
setuptools-63.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.Ft6oIs/_old 2022-08-08 08:44:53.574399474 +0200
+++ /var/tmp/diff_new_pack.Ft6oIs/_new 2022-08-08 08:44:53.578399486 +0200
@@ -23,60 +23,55 @@
%define psuffix -test
%bcond_without test
%bcond_with wheel
-%else
+%endif
%if "%{flavor}" == "wheel"
%define psuffix -wheel
+%bcond_with test
%bcond_without wheel
-%else
+%endif
+%if "%{flavor}" == ""
%define psuffix %{nil}
%bcond_with test
%bcond_with wheel
%endif
-%endif
+
# in order to avoid rewriting for subpackage generator
%define mypython python
Name: python-setuptools%{psuffix}
-Version: 58.3.0
+Version: 63.2.0
Release: 0
Summary: Download, build, install, upgrade, and uninstall Python
packages
-License: MIT
+License: Apache-2.0 AND MIT AND BSD-2-Clause AND Python-2.0
URL: https://github.com/pypa/setuptools
Source:
https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
Patch0: sort-for-reproducibility.patch
# PATCH-FIX-OPENSUSE remove_mock.patch [email protected]
Patch1: remove_mock.patch
-# PATCH-FIX-OPENSUSE remove-more-itertools-dependency-cycle.patch
[email protected]
-Patch2: remove-more-itertools-dependency-cycle.patch
-BuildRequires: %{python_module appdirs >= 1.4.3}
-BuildRequires: %{python_module ordered-set >= 3.1.1}
-BuildRequires: %{python_module packaging >= 20.4}
-BuildRequires: %{python_module pyparsing >= 2.2.1}
-BuildRequires: %{python_module xml}
+BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-appdirs >= 1.4.3
-Requires: python-base >= 3.6
-Requires: python-ordered-set >= 3.1.1
-Requires: python-packaging >= 20.4
-Requires: python-pyparsing >= 2.2.1
-Requires: python-xml
Requires(post): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
+%if %{with wheel}
+Requires: %mypython(abi) = %python_version
+%endif
%if %{with test}
-BuildRequires: %{python_module Paver}
-BuildRequires: %{python_module Sphinx}
+BuildRequires: %{python_module build}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module jaraco.envs}
+BuildRequires: %{python_module filelock >= 3.4.0}
+BuildRequires: %{python_module ini2toml-lite >= 0.9}
+BuildRequires: %{python_module jaraco.envs >= 2.2}
BuildRequires: %{python_module jaraco.path >= 3.2.0}
-BuildRequires: %{python_module pip}
-BuildRequires: %{python_module pytest-fixture-config}
-BuildRequires: %{python_module pytest-virtualenv}
+BuildRequires: %{python_module pip >= 19.1}
+BuildRequires: %{python_module pip-run >= 8.8}
+BuildRequires: %{python_module pytest >= 6}
BuildRequires: %{python_module pytest-xdist}
-BuildRequires: %{python_module pytest}
-BuildRequires: %{python_module setuptools >= %{version}}
+BuildRequires: %{python_module setuptools = %{version}}
+BuildRequires: %{python_module tomli-w >= 1.0.0}
BuildRequires: %{python_module virtualenv >= 13.0.0}
BuildRequires: %{python_module wheel}
+BuildRequires: python3-setuptools-wheel = %{version}
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 24
Recommends: ca-certificates-mozilla
@@ -84,15 +79,6 @@
%if %{with wheel}
BuildRequires: %{python_module wheel}
%endif
-%if !%{with test} && !%{with wheel}
-# work around boo#1186870
-Provides: %{mypython}%{python_version}dist(setuptools) = %{version}
-Provides: %{mypython}%{python_version}dist(pkg_resources) = %{version}
-%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
-Provides: %{mypython}3dist(pkg_resources) = %{version}
-Provides: %{mypython}3dist(setuptools) = %{version}
-%endif
-%endif
%python_subpackages
%description
@@ -111,23 +97,6 @@
# replace with nothing
sed -r -i '1s@^#!/.*$@@' pkg_resources/_vendor/appdirs.py
-%if ! %{with wheel}
-# replace the bundled stuff
-find ./ -type f -name \*.py -exec sed -i \
- -e 's:from setuptools\.extern\.:from :g' \
- -e 's:from pkg_resources\.extern\.:from :g' \
- -e 's:pkg_resources\.extern\.::g' \
- -e 's:setuptools\.extern\.::g' \
- {} \;
-find ./ -type f -name \*.py -exec sed -i \
- -e 's:from setuptools\.extern ::g' \
- -e 's:from pkg_resources\.extern ::g' \
- {} \;
-find ./ -type f -name \*.py -exec sed -i \
- -e 's:from .extern ::g' \
- {} \;
-%endif
-
%build
%if ! %{with wheel}
%python_build
@@ -147,14 +116,12 @@
%check
%if %{with test}
-# the 4 skipped test rely on the bundled packages but they are
-# not available on virtualenv; this is expected behaviour
-donttest="test_clean_env_install or test_pip_upgrade_from_source or
test_test_command_install_requirements or test_no_missing_dependencies"
-# these 3 tests try to download the wheel wheel from PyPI
-donttest="$donttest or (test_distutils_adoption and (distutils_stdlib or
distutils_local))"
+export
PRE_BUILT_SETUPTOOLS_WHEEL=%{python3_sitelib}/../wheels/setuptools-%{version}-py2.py3-none-any.whl
export LANG=en_US.UTF-8
-# tests need imports local source dir
+# tests need imports from local source dir
export PYTHONPATH=$(pwd)
+# no online comparisons in obs
+donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)"
%pytest -rfE -n auto -k "not ($donttest)"
%endif
@@ -164,7 +131,7 @@
%license LICENSE
%doc CHANGES.rst README.rst
%{python_sitelib}/setuptools
-%{python_sitelib}/setuptools-%{version}-py%{python_version}.egg-info
+%{python_sitelib}/setuptools-%{version}*-info
%dir %{python_sitelib}/pkg_resources
%{python_sitelib}/pkg_resources/*
%{python_sitelib}/_distutils_hack
++++++ remove_mock.patch ++++++
--- /var/tmp/diff_new_pack.Ft6oIs/_old 2022-08-08 08:44:53.618399603 +0200
+++ /var/tmp/diff_new_pack.Ft6oIs/_new 2022-08-08 08:44:53.622399616 +0200
@@ -11,20 +11,20 @@
setuptools/tests/test_upload.py | 5 +----
10 files changed, 13 insertions(+), 18 deletions(-)
-Index: setuptools-58.3.0/pkg_resources/tests/test_markers.py
+Index: setuptools-63.1.0/pkg_resources/tests/test_markers.py
===================================================================
---- setuptools-58.3.0.orig/pkg_resources/tests/test_markers.py
-+++ setuptools-58.3.0/pkg_resources/tests/test_markers.py
+--- setuptools-63.1.0.orig/pkg_resources/tests/test_markers.py
++++ setuptools-63.1.0/pkg_resources/tests/test_markers.py
@@ -1,4 +1,4 @@
-import mock
+from . import mock
from pkg_resources import evaluate_marker
-Index: setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
+Index: setuptools-63.1.0/pkg_resources/tests/test_pkg_resources.py
===================================================================
---- setuptools-58.3.0.orig/pkg_resources/tests/test_pkg_resources.py
-+++ setuptools-58.3.0/pkg_resources/tests/test_pkg_resources.py
+--- setuptools-63.1.0.orig/pkg_resources/tests/test_pkg_resources.py
++++ setuptools-63.1.0/pkg_resources/tests/test_pkg_resources.py
@@ -9,10 +9,7 @@ import stat
import distutils.dist
import distutils.command.install_egg_info
@@ -37,10 +37,10 @@
from pkg_resources import (
DistInfoDistribution, Distribution, EggInfoDistribution,
-Index: setuptools-58.3.0/setuptools/tests/__init__.py
+Index: setuptools-63.1.0/setuptools/tests/__init__.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/__init__.py
-+++ setuptools-58.3.0/setuptools/tests/__init__.py
+--- setuptools-63.1.0.orig/setuptools/tests/__init__.py
++++ setuptools-63.1.0/setuptools/tests/__init__.py
@@ -5,6 +5,10 @@ import pytest
__all__ = ['fail_on_ascii']
@@ -52,10 +52,10 @@
is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this
locale")
-Index: setuptools-58.3.0/setuptools/tests/test_build_clib.py
+Index: setuptools-63.1.0/setuptools/tests/test_build_clib.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_build_clib.py
-+++ setuptools-58.3.0/setuptools/tests/test_build_clib.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_build_clib.py
++++ setuptools-63.1.0/setuptools/tests/test_build_clib.py
@@ -1,6 +1,6 @@
import pytest
@@ -64,10 +64,10 @@
from distutils.errors import DistutilsSetupError
from setuptools.command.build_clib import build_clib
from setuptools.dist import Distribution
-Index: setuptools-58.3.0/setuptools/tests/test_easy_install.py
+Index: setuptools-63.1.0/setuptools/tests/test_easy_install.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_easy_install.py
-+++ setuptools-58.3.0/setuptools/tests/test_easy_install.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_easy_install.py
++++ setuptools-63.1.0/setuptools/tests/test_easy_install.py
@@ -12,7 +12,7 @@ import itertools
import distutils.errors
import io
@@ -77,10 +77,10 @@
import time
import re
import subprocess
-Index: setuptools-58.3.0/setuptools/tests/test_msvc.py
+Index: setuptools-63.1.0/setuptools/tests/test_msvc.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_msvc.py
-+++ setuptools-58.3.0/setuptools/tests/test_msvc.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_msvc.py
++++ setuptools-63.1.0/setuptools/tests/test_msvc.py
@@ -5,7 +5,7 @@ Tests for msvc support module.
import os
import contextlib
@@ -90,10 +90,10 @@
import pytest
-Index: setuptools-58.3.0/setuptools/tests/test_packageindex.py
+Index: setuptools-63.1.0/setuptools/tests/test_packageindex.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_packageindex.py
-+++ setuptools-58.3.0/setuptools/tests/test_packageindex.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_packageindex.py
++++ setuptools-63.1.0/setuptools/tests/test_packageindex.py
@@ -6,7 +6,7 @@ import urllib.request
import urllib.error
import http.client
@@ -103,10 +103,10 @@
import pytest
import setuptools.package_index
-Index: setuptools-58.3.0/setuptools/tests/test_register.py
+Index: setuptools-63.1.0/setuptools/tests/test_register.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_register.py
-+++ setuptools-58.3.0/setuptools/tests/test_register.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_register.py
++++ setuptools-63.1.0/setuptools/tests/test_register.py
@@ -2,10 +2,7 @@ from setuptools.command.register import
from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError
@@ -119,10 +119,10 @@
import pytest
-Index: setuptools-58.3.0/setuptools/tests/test_upload.py
+Index: setuptools-63.1.0/setuptools/tests/test_upload.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_upload.py
-+++ setuptools-58.3.0/setuptools/tests/test_upload.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_upload.py
++++ setuptools-63.1.0/setuptools/tests/test_upload.py
@@ -2,10 +2,7 @@ from setuptools.command.upload import up
from setuptools.dist import Distribution
from setuptools.errors import RemovedCommandError
@@ -135,41 +135,19 @@
import pytest
-Index: setuptools-58.3.0/setuptools/tests/test_config.py
-===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_config.py
-+++ setuptools-58.3.0/setuptools/tests/test_config.py
-@@ -7,7 +7,7 @@ import configparser
- import pytest
-
- from distutils.errors import DistutilsOptionError, DistutilsFileError
--from mock import patch
-+from setuptools.tests import mock
- from setuptools.dist import Distribution, _Distribution
- from setuptools.config import ConfigHandler, read_configuration
- from distutils.core import Command
-@@ -906,7 +906,7 @@ class TestExternalSetters:
- )
- return None
-
-- @patch.object(_Distribution, '__init__', autospec=True)
-+ @mock.patch.object(_Distribution, '__init__', autospec=True)
- def test_external_setters(self, mock_parent_init, tmpdir):
- mock_parent_init.side_effect = self._fake_distribution_init
-
-Index: setuptools-58.3.0/pkg_resources/tests/__init__.py
+Index: setuptools-63.1.0/pkg_resources/tests/__init__.py
===================================================================
--- /dev/null
-+++ setuptools-58.3.0/pkg_resources/tests/__init__.py
++++ setuptools-63.1.0/pkg_resources/tests/__init__.py
@@ -0,0 +1,4 @@
+try:
+ import mock
+except ImportError:
+ from unittest import mock
-Index: setuptools-58.3.0/setuptools/tests/test_bdist_deprecations.py
+Index: setuptools-63.1.0/setuptools/tests/test_bdist_deprecations.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_bdist_deprecations.py
-+++ setuptools-58.3.0/setuptools/tests/test_bdist_deprecations.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_bdist_deprecations.py
++++ setuptools-63.1.0/setuptools/tests/test_bdist_deprecations.py
@@ -1,6 +1,6 @@
"""develop tests
"""
++++++ setuptools-58.3.0.tar.gz -> setuptools-63.2.0.tar.gz ++++++
++++ 101722 lines of diff (skipped)
++++++ sort-for-reproducibility.patch ++++++
--- /var/tmp/diff_new_pack.Ft6oIs/_old 2022-08-08 08:44:53.918400486 +0200
+++ /var/tmp/diff_new_pack.Ft6oIs/_new 2022-08-08 08:44:53.922400498 +0200
@@ -1,8 +1,8 @@
-Index: setuptools-58.3.0/setuptools/command/easy_install.py
+Index: setuptools-63.1.0/setuptools/command/easy_install.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/command/easy_install.py
-+++ setuptools-58.3.0/setuptools/command/easy_install.py
-@@ -413,7 +413,7 @@ class easy_install(Command):
+--- setuptools-63.1.0.orig/setuptools/command/easy_install.py
++++ setuptools-63.1.0/setuptools/command/easy_install.py
+@@ -419,7 +419,7 @@ class easy_install(Command):
for spec in self.args:
self.easy_install(spec, not self.no_deps)
if self.record:
@@ -11,11 +11,11 @@
if self.root: # strip any package prefix
root_len = len(self.root)
for counter in range(len(outputs)):
-Index: setuptools-58.3.0/setuptools/command/egg_info.py
+Index: setuptools-63.1.0/setuptools/command/egg_info.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/command/egg_info.py
-+++ setuptools-58.3.0/setuptools/command/egg_info.py
-@@ -654,7 +654,7 @@ def _write_requirements(stream, reqs):
+--- setuptools-63.1.0.orig/setuptools/command/egg_info.py
++++ setuptools-63.1.0/setuptools/command/egg_info.py
+@@ -683,7 +683,7 @@ def _write_requirements(stream, reqs):
def append_cr(line):
return line + '\n'
@@ -24,11 +24,11 @@
stream.writelines(lines)
-Index: setuptools-58.3.0/setuptools/dist.py
+Index: setuptools-63.1.0/setuptools/dist.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/dist.py
-+++ setuptools-58.3.0/setuptools/dist.py
-@@ -208,7 +208,7 @@ def write_pkg_file(self, file): # noqa:
+--- setuptools-63.1.0.orig/setuptools/dist.py
++++ setuptools-63.1.0/setuptools/dist.py
+@@ -222,7 +222,7 @@ def write_pkg_file(self, file): # noqa:
if self.long_description_content_type:
write_field('Description-Content-Type',
self.long_description_content_type)
if self.provides_extras:
@@ -37,10 +37,10 @@
write_field('Provides-Extra', extra)
self._write_list(file, 'License-File', self.license_files or [])
-Index: setuptools-58.3.0/setuptools/tests/test_egg_info.py
+Index: setuptools-63.1.0/setuptools/tests/test_egg_info.py
===================================================================
---- setuptools-58.3.0.orig/setuptools/tests/test_egg_info.py
-+++ setuptools-58.3.0/setuptools/tests/test_egg_info.py
+--- setuptools-63.1.0.orig/setuptools/tests/test_egg_info.py
++++ setuptools-63.1.0/setuptools/tests/test_egg_info.py
@@ -297,8 +297,8 @@ class TestEggInfo:
wheel>=0.5
pytest
@@ -51,4 +51,43 @@
''',
'''
+Index: setuptools-63.1.0/setuptools/tests/test_wheel.py
+===================================================================
+--- setuptools-63.1.0.orig/setuptools/tests/test_wheel.py
++++ setuptools-63.1.0/setuptools/tests/test_wheel.py
+@@ -425,30 +425,30 @@ WHEEL_INSTALL_TESTS = (
+ dict(
+ id='requires_ensure_order',
+ install_requires='''
+- foo
+ bar
+ baz
++ foo
+ qux
+ ''',
+ extras_require={
+ 'extra': '''
+- foobar>3
+ barbaz>4
+ bazqux>5
++ foobar>3
+ quxzap>6
+ ''',
+ },
+ requires_txt=DALS(
+ '''
+- foo
+ bar
+ baz
++ foo
+ qux
+
+ [extra]
+- foobar>3
+ barbaz>4
+ bazqux>5
++ foobar>3
+ quxzap>6
+ '''
+ ),
