diff --git a/.python-setuptools.metadata b/.python-setuptools.metadata index c5df5fe..27dd16f 100644 --- a/.python-setuptools.metadata +++ b/.python-setuptools.metadata @@ -1 +1 @@ -6857985d72c5b23fc37eaa9f254e8d66c2ead0ad SOURCES/setuptools-62.6.0.tar.gz +98f171b35e468885e9c55ca143da9dab4e954ba1 SOURCES/setuptools-65.5.1.tar.gz diff --git a/SOURCES/Remove-optional-or-unpackaged-test-deps.patch b/SOURCES/Remove-optional-or-unpackaged-test-deps.patch index c021f15..247a193 100644 --- a/SOURCES/Remove-optional-or-unpackaged-test-deps.patch +++ b/SOURCES/Remove-optional-or-unpackaged-test-deps.patch @@ -1,37 +1,37 @@ -From 7b0ba61bfbe7765d034f82158eba57c74b770405 Mon Sep 17 00:00:00 2001 -From: Karolina Surma -Date: Mon, 21 Feb 2022 09:22:42 +0100 -Subject: [PATCH] Update +From 87a18ba242ac7f02d41b877ffc796dde42e6a93e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Wed, 10 Aug 2022 16:08:41 +0200 +Subject: [PATCH] Remove optional or unpackaged test deps --- - setup.cfg | 13 ------------- - 1 file changed, 13 deletions(-) + setup.cfg | 14 -------------- + 1 file changed, 14 deletions(-) diff --git a/setup.cfg b/setup.cfg -index 8c71052..e6df94f 100644 +index b4ee876..094f621 100644 --- a/setup.cfg +++ b/setup.cfg -@@ -38,19 +38,8 @@ exclude = +@@ -39,19 +39,7 @@ exclude = [options.extras_require] testing = pytest >= 6 - pytest-checkdocs >= 2.4 - pytest-flake8 +- flake8 < 5 - pytest-black >= 0.3.7; \ - python_implementation != "PyPy" - pytest-cov; \ - python_implementation != "PyPy" - pytest-mypy >= 0.9.1; \ - python_implementation != "PyPy" -- pytest-enabler >= 1.0.1 +- pytest-enabler >= 1.3 - pytest-perf - mock - flake8-2020 virtualenv>=13.0.0 wheel pip>=19.1 # For proper file:// URLs support. -@@ -58,8 +47,6 @@ testing = +@@ -59,8 +47,6 @@ testing = pytest-xdist jaraco.path>=3.2.0 build[virtualenv] @@ -39,7 +39,7 @@ index 8c71052..e6df94f 100644 - pip_run>=8.8 ini2toml[lite]>=0.9 tomli-w>=1.0.0 - testing-integration = + pytest-timeout -- -2.35.3 +2.37.3 diff --git a/SPECS/python-setuptools.spec b/SPECS/python-setuptools.spec index c0934be..e047d4d 100644 --- a/SPECS/python-setuptools.spec +++ b/SPECS/python-setuptools.spec @@ -24,24 +24,24 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 62.6.0 -Release: 1%{?dist} +Version: 65.5.1 +Release: 2%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT # appdirs is MIT # more-itertools is MIT # ordered-set is MIT -# packaging is BSD or ASL 2.0 +# packaging is BSD-2-Clause OR Apache-2.0 # pyparsing is MIT -# importlib-metadata is ASL 2.0 -# importlib-resources is ASL 2.0 +# importlib-metadata is Apache-2.0 +# importlib-resources is Apache-2.0 # jaraco.text is MIT -# typing-extensions is Python +# typing-extensions is Python-2.0.1 # zipp is MIT # nspektr is MIT # tomli is MIT # the setuptools logo is MIT -License: MIT and ASL 2.0 and (BSD or ASL 2.0) and Python +License: MIT AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0) AND Python-2.0.1 URL: https://pypi.python.org/pypi/%{srcname} Source0: %{pypi_source %{srcname} %{version}} @@ -88,10 +88,9 @@ Provides: bundled(python%{python3_pkgversion}dist(jaraco-text)) = 3.7 Provides: bundled(python%{python3_pkgversion}dist(more-itertools)) = 8.8 Provides: bundled(python%{python3_pkgversion}dist(ordered-set)) = 3.1.1 Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 21.3 -Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 3.0.8 +Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 3.0.9 Provides: bundled(python%{python3_pkgversion}dist(typing-extensions)) = 4.0.1 Provides: bundled(python%{python3_pkgversion}dist(zipp)) = 3.7 -Provides: bundled(python%{python3_pkgversion}dist(nspektr)) = 0.3 Provides: bundled(python%{python3_pkgversion}dist(tomli)) = 2.0.1 } @@ -133,7 +132,9 @@ A Python wheel of setuptools to use with venv. # If we don't have setuptools installed yet, we use the pre-generated .egg-info # See https://github.com/pypa/setuptools/pull/2543 # And https://github.com/pypa/setuptools/issues/2550 -rm -r %{srcname}.egg-info +# WARNING: We cannot remove this folder since Python 3.11.1, +# see https://github.com/pypa/setuptools/issues/3761 +#rm -r %%{srcname}.egg-info %endif # Strip shbang @@ -181,9 +182,9 @@ install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_w cat pkg_resources/_vendor/vendored.txt setuptools/_vendor/vendored.txt > allvendor.txt %{_rpmconfigdir}/pythonbundles.py allvendor.txt --namespace 'python%{python3_pkgversion}dist' --compare-with '%{bundled}' -# Regression test, the wheel should not be larger than 900 KiB +# Regression test, the wheel should not be larger than 900 kB # https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3 -test $(du %{_pyproject_wheeldir}/%{python_wheel_name} | cut -f1) -lt 900 +test $(stat --format %%s %{_pyproject_wheeldir}/%{python_wheel_name}) -lt 900000 # Regression test, the tests are not supposed to be installed test ! -d %{buildroot}%{python3_sitelib}/pkg_resources/tests @@ -198,13 +199,13 @@ rm pyproject.toml # --ignore=setuptools/tests/config/test_apply_pyprojecttoml.py # -k "not test_pip_upgrade_from_source" # the tests require internet connection -# --ignore=setuptools/tests/test_develop.py +# --ignore=setuptools/tests/test_editable_install.py # the tests require pip-run which we don't have in Fedora PRE_BUILT_SETUPTOOLS_WHEEL=%{_pyproject_wheeldir}/%{python_wheel_name} \ PYTHONPATH=$(pwd) %pytest \ --ignore=setuptools/tests/test_integration.py \ --ignore=setuptools/tests/integration/ \ - --ignore=setuptools/tests/test_develop.py \ + --ignore=setuptools/tests/test_editable_install.py \ --ignore=setuptools/tests/config/test_apply_pyprojecttoml.py \ -k "not test_pip_upgrade_from_source" %endif # with tests @@ -231,6 +232,32 @@ PYTHONPATH=$(pwd) %pytest \ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 65.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 08 2022 Miro Hrončok - 65.5.1-1 +- Update to 65.5.1 +- Fixes: rhbz#2140209 + +* Fri Oct 14 2022 Miro Hrončok - 65.5.0-1 +- Update to 65.5.0 +- Fixes: rhbz#2129562 + +* Thu Oct 13 2022 Miro Hrončok - 65.4.1-1 +- Update to 65.4.1 +- Update the RPM License field to use SPDX expressions + +* Tue Sep 13 2022 Lumír Balhar - 65.3.0-1 +- Update to 65.3.0 +Resolves: rhbz#2102402 + +* Thu Jul 28 2022 Tomáš Hrnčiar - 65.0.2-1 +- Update to 65.0.2 +- Fixes: rhbz#2102402 + +* Fri Jul 22 2022 Fedora Release Engineering - 62.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 14 2022 Charalampos Stratakis - 62.6.0-1 - Update to 62.6.0 - Fixes: rhbz#2064842