From a957ae14ec27cbda38c94d9163c079be5ca01516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Wed, 15 Sep 2021 08:16:59 +0200 Subject: [PATCH] Update to 58.2.0 --- ...ove-optional-or-unpackaged-test-deps.patch | 38 +++++++++++++++++++ python-setuptools.spec | 19 +++++----- sources | 2 +- 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 0001-Remove-optional-or-unpackaged-test-deps.patch diff --git a/0001-Remove-optional-or-unpackaged-test-deps.patch b/0001-Remove-optional-or-unpackaged-test-deps.patch new file mode 100644 index 0000000..2801dbb --- /dev/null +++ b/0001-Remove-optional-or-unpackaged-test-deps.patch @@ -0,0 +1,38 @@ +From d327cba9f022992689edd30beb157e0aa0a16c11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Mon, 13 Sep 2021 17:56:27 +0200 +Subject: [PATCH] Remove optional or unpackaged test deps + +--- + setup.cfg | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index 9eee792..fbe95f5 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -37,21 +37,11 @@ exclude = + [options.extras_require] + testing = + pytest >= 4.6 +- pytest-checkdocs >= 2.4 +- pytest-flake8 +- pytest-black >= 0.3.7; \ +- python_implementation != "PyPy" +- pytest-cov +- pytest-mypy; \ +- python_implementation != "PyPy" +- pytest-enabler >= 1.0.1 + + mock +- flake8-2020 + virtualenv>=13.0.0 + pytest-virtualenv>=1.2.7 + wheel +- paver + pip>=19.1 # For proper file:// URLs support. + jaraco.envs + pytest-xdist +-- +2.31.1 + diff --git a/python-setuptools.spec b/python-setuptools.spec index 42b0272..b5b2154 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -25,7 +25,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 57.4.0 +Version: 58.2.0 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -41,6 +41,10 @@ License: MIT and (BSD or ASL 2.0) URL: https://pypi.python.org/pypi/%{srcname} Source0: %{pypi_source %{srcname} %{version}} +# Some test deps are optional and either not desired or not available in Fedora, thus this patch removes them. +# For future reference, these packages were removed: pytest-(checkdocs|black|cov|mypy|enabler), flake8-2020, paver +Patch1: 0001-Remove-optional-or-unpackaged-test-deps.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -128,15 +132,6 @@ rm -f setuptools/*.exe # Don't ship these rm -r docs/conf.py -# The following test deps are optional and either not desired or not available in Fedora: -# (note that we intentionally also remove e.g. flake8-something or something-flake8 here) -sed -Ei setup.cfg -e '/\bpytest-(checkdocs|black|cov|mypy|enabler)\b/d' \ - -e '/\bflake8\b/d' \ - -e '/\bpaver\b/d' -# Strip pytest options that require the packages removed by the previous sed -sed -i pytest.ini -e 's/ --flake8//' \ - -e 's/ --cov//' - %if %{without bootstrap} %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x testing} @@ -216,6 +211,10 @@ PYTHONPATH=$(pwd) %pytest --ignore=setuptools/tests/test_integration.py --ignore %changelog +* Tue Oct 19 2021 Tomáš Hrnčiar - 58.2.0-1 +- Update to 58.2.0 +- Fixes rhbz#2001228 + * Tue Aug 03 2021 Miro Hrončok - 57.4.0-1 - Update to 57.4.0 - https://setuptools.readthedocs.io/en/latest/history.html#v57-4-0 diff --git a/sources b/sources index f3c8d45..159d15b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-57.4.0.tar.gz) = 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2 +SHA512 (setuptools-58.2.0.tar.gz) = 028c9d9533f5493ff89c80c705ea002661a70e0e43afecb0c7546029990ae599e16fad7248ffc29573c18c6aeb33f1bba1fde09f25fe04b74717ad9308ce9cfc