rpms / python-setuptools

Clone
Source Code
GIT

#36 Update to 46.2.0
Merged 4 years ago by churchyard. Opened 4 years ago by thrnciar.
rpms/ thrnciar/python-setuptools update-46-2-0  into  master

file removed
-11 
@@ -1,11 +0,0 @@ 
 

- diff --git a/pytest.ini b/pytest.ini
 

- index 825dbe6..40efb05 100644
 

- --- a/pytest.ini
 

- +++ b/pytest.ini
 

- @@ -20,3 +20,6 @@ filterwarnings =
 

-      ignore:Unicode unequal comparison failed to convert:UnicodeWarning
 

-      # https://github.com/pypa/setuptools/issues/2025
 

-      ignore:direct construction of .*Item has been deprecated:DeprecationWarning
 

- +    # https://github.com/pypa/setuptools/issues/2081
 

- +    ignore:lib2to3 package is deprecated:PendingDeprecationWarning
 

- +    ignore:lib2to3 package is deprecated:DeprecationWarning

file modified
+7 -3 
@@ -13,7 +13,7 @@ 
 

  

  Name:           python-setuptools
 

  # When updating, update the bundled libraries versions bellow!
 

- Version:        46.1.3
 

+ Version:        46.2.0
 

  Release:        1%{?dist}
 

  Summary:        Easily build and distribute Python packages
 

  # setuptools is MIT
 
@@ -25,8 +25,8 @@ 
 

  URL:            https://pypi.python.org/pypi/%{srcname}
 

  Source0:        %{pypi_source %{srcname} %{version} zip}
 

  

- # https://github.com/pypa/setuptools/issues/2081
 

- Patch1:         filter-lib2to3-deprecation-warnings.patch
 

+ # https://github.com/pypa/setuptools/issues/2100
 

+ Patch1:         reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch
 

  

  BuildArch:      noarch
 

  
@@ -174,6 +174,10 @@ 
 

  

  

  %changelog
 

+ * Tue May 12 2020 Tomas Hrnciar <thrnciar@redhat.com> - 46.2.0-1
 

+ - Update to 46.2.0 (#1833826)
 

+ - https://setuptools.readthedocs.io/en/latest/history.html#v46-2-0
 

+ 

  * Thu Mar 26 2020 Miro Hrončok <mhroncok@redhat.com> - 46.1.3-1
 

  - Upgrade to 46.1.3 (#1817189)
 

  - https://setuptools.readthedocs.io/en/latest/history.html#v46-1-3

file added
+61 
@@ -0,0 +1,61 @@ 
 

+ 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):

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (setuptools-46.1.3.zip) = 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
 

+ SHA512 (setuptools-46.2.0.zip) = d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e
 

=================================== FAILURES ===================================
_______________________ TestDevelop.test_2to3_user_mode ________________________

self = <setuptools.tests.test_develop.TestDevelop object at 0x7f9757ee4c10>
test_env = local('/tmp/pytest-of-mockbuild/pytest-0/test_2to3_user_mode0')

    @pytest.mark.skipif(
        in_virtualenv or in_venv,
        reason="Cannot run when invoked in a virtualenv or venv")
    def test_2to3_user_mode(self, test_env):
        settings = dict(
            name='foo',
            packages=['foo'],
            use_2to3=True,
            version='0.0',
        )
        dist = Distribution(settings)
        dist.script_name = 'setup.py'
        cmd = develop(dist)
        cmd.user = 1
        cmd.ensure_finalized()
        cmd.install_dir = site.USER_SITE
        cmd.user = 1
        with contexts.quiet():
>           cmd.run()

/builddir/build/BUILD/setuptools-46.2.0/setuptools/tests/test_develop.py:83: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
/builddir/build/BUILD/setuptools-46.2.0/setuptools/command/develop.py:38: in run
    self.install_for_development()
/builddir/build/BUILD/setuptools-46.2.0/setuptools/command/develop.py:116: in install_for_development
    self.run_command('build_py')
/usr/lib64/python3.8/distutils/cmd.py:313: in run_command
    self.distribution.run_command(command)
/usr/lib64/python3.8/distutils/dist.py:985: in run_command
    cmd_obj.run()
/builddir/build/BUILD/setuptools-46.2.0/setuptools/command/build_py.py:60: in run
    self.run_2to3(self.__updated_files, False)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = <setuptools.command.build_py.build_py object at 0x7f97580c4670>
files = ['build/lib/foo/__init__.py'], doctests = False

    def run_2to3(self, files, doctests=False):
        # See of the distribution option has been set, otherwise check the
        # setuptools default.
        if self.distribution.use_2to3 is not True:
            return
        if not files:
            return

>       warnings.warn(
            "2to3 support is deprecated. If the project still "
            "requires Python 2 support, please migrate to "
            "a single-codebase solution or employ an "
            "independent conversion process.",
            SetuptoolsDeprecationWarning)
E       setuptools._deprecation_warning.SetuptoolsDeprecationWarning: 2to3 support is deprecated. If the project still requires Python 2 support, please migrate to a single-codebase solution or employ an independent conversion process.

/builddir/build/BUILD/setuptools-46.2.0/setuptools/lib2to3_ex.py:39: SetuptoolsDeprecationWarning

Build failed.

rebased onto 59461bd
4 years ago

Include the bug number and changelog link as with the previous entries please

rebased onto bec6e04
4 years ago

Build failed.

rebased onto 94f93f3
4 years ago

Build succeeded.

Build succeeded.

Pull-Request has been merged by churchyard
4 years ago
Changes Summary 4
-11
file removed
filter-lib2to3-deprecation-warnings.patch
+7 -3
file changed
python-setuptools.spec
+61
file added
reuse-ack2to3-in-TestDevelop-test_2to3_user_mode.patch
+1 -1
file changed
sources
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.