diff --git a/python-setuptools.spec b/python-setuptools.spec index 747d7ee..a2459b5 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -13,7 +13,7 @@ Name: python-setuptools # When updating, update the bundled libraries versions bellow! -Version: 46.2.0 +Version: 46.4.0 Release: 1%{?dist} Summary: Easily build and distribute Python packages # setuptools is MIT @@ -25,9 +25,6 @@ License: MIT and (BSD or ASL 2.0) URL: https://pypi.python.org/pypi/%{srcname} Source0: %{pypi_source %{srcname} %{version} zip} -# https://github.com/pypa/setuptools/issues/2100 -Patch1: reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch - BuildArch: noarch BuildRequires: gcc @@ -174,6 +171,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) pytest-%{python3_version} \ %changelog +* Mon May 18 2020 Tomas Hrnciar - 46.4.0-1 +- Update to 46.4.0 (#1835411) +- https://setuptools.readthedocs.io/en/latest/history.html#v46-4-0 + * Tue May 12 2020 Tomas Hrnciar - 46.2.0-1 - Update to 46.2.0 (#1833826) - https://setuptools.readthedocs.io/en/latest/history.html#v46-2-0 diff --git a/reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch b/reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch deleted file mode 100644 index 40eb1bf..0000000 --- a/reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py -index 9c77b51..6377d78 100644 ---- a/setuptools/tests/__init__.py -+++ b/setuptools/tests/__init__.py -@@ -6,7 +6,7 @@ from setuptools.extern.six import PY2, PY3 - - - __all__ = [ -- 'fail_on_ascii', 'py2_only', 'py3_only' -+ 'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3' - ] - - -@@ -16,3 +16,5 @@ fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale") - - py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only") - py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only") -+ -+ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated') -diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py -index 792975f..403d52c 100644 ---- a/setuptools/tests/test_develop.py -+++ b/setuptools/tests/test_develop.py -@@ -17,6 +17,7 @@ import pytest - - from setuptools.command.develop import develop - from setuptools.dist import Distribution -+from setuptools.tests import ack_2to3 - from . import contexts - from . import namespaces - -@@ -65,6 +66,7 @@ class TestDevelop: - @pytest.mark.skipif( - in_virtualenv or in_venv, - reason="Cannot run when invoked in a virtualenv or venv") -+ @ack_2to3 - def test_2to3_user_mode(self, test_env): - settings = dict( - name='foo', -diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py -index 0f77d8f..892fd12 100644 ---- a/setuptools/tests/test_test.py -+++ b/setuptools/tests/test_test.py -@@ -10,6 +10,7 @@ import pytest - - from setuptools.command.test import test - from setuptools.dist import Distribution -+from setuptools.tests import ack_2to3 - - from .textwrap import DALS - -@@ -73,9 +74,6 @@ def quiet_log(): - log.set_verbosity(0) - - --ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated') -- -- - @pytest.mark.usefixtures('sample_test', 'quiet_log') - @ack_2to3 - def test_test(capfd): diff --git a/sources b/sources index c105f0f..5f98d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools-46.2.0.zip) = d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e +SHA512 (setuptools-46.4.0.zip) = 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726