diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-05-25 13:34:05 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-05-25 14:18:09 +0200 |
commit | 3cae20670d1f167c0d467bfded7836a8381277f8 (patch) | |
tree | 26709a73c49e9d8909a2a1cf7ffee7f2b9e1a86d /dev-python/setuptools/files | |
parent | dev-python/certifi: Remove old (diff) | |
download | gentoo-3cae20670d1f167c0d467bfded7836a8381277f8.tar.gz gentoo-3cae20670d1f167c0d467bfded7836a8381277f8.tar.bz2 gentoo-3cae20670d1f167c0d467bfded7836a8381277f8.zip |
dev-python/setuptools: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/setuptools/files')
-rw-r--r-- | dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch deleted file mode 100644 index e27db9a41da9..000000000000 --- a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> -Date: Tue, 12 May 2020 13:33:04 +0200 -Subject: [PATCH] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode - -Fixes https://github.com/pypa/setuptools/issues/2100 ---- - changelog.d/2105.misc.rst | 1 + - setuptools/tests/__init__.py | 4 +++- - setuptools/tests/test_develop.py | 2 ++ - setuptools/tests/test_test.py | 4 +--- - 4 files changed, 7 insertions(+), 4 deletions(-) - create mode 100644 changelog.d/2105.misc.rst - -diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst -new file mode 100644 -index 000000000..75eaf2cb3 ---- /dev/null -+++ b/changelog.d/2105.misc.rst -@@ -0,0 +1 @@ -+Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``. -diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py -index 9c77b51f8..6377d7857 100644 ---- a/setuptools/tests/__init__.py -+++ b/setuptools/tests/__init__.py -@@ -6,7 +6,7 @@ - - - __all__ = [ -- 'fail_on_ascii', 'py2_only', 'py3_only' -+ 'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3' - ] - - -@@ -16,3 +16,5 @@ - - 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 792975fd1..bb89a865b 100644 ---- a/setuptools/tests/test_develop.py -+++ b/setuptools/tests/test_develop.py -@@ -17,6 +17,7 @@ - - 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 0f77d8ff3..892fd120d 100644 ---- a/setuptools/tests/test_test.py -+++ b/setuptools/tests/test_test.py -@@ -10,6 +10,7 @@ - - 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): |