#28 Upgrade to 41.6.0 (#1758945)
Merged 4 years ago by torsava. Opened 4 years ago by torsava.
rpms/ torsava/python-setuptools master  into  master

file modified
+1
@@ -99,3 +99,4 @@ 

  /setuptools-40.8.0.zip

  /setuptools-41.0.1.zip

  /setuptools-41.2.0.zip

+ /setuptools-41.6.0.zip

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

  

  Name:           python-setuptools

  # When updating, update the bundled libraries versions bellow!

- Version:        41.2.0

+ Version:        41.6.0

  Release:        1%{?dist}

  Summary:        Easily build and distribute Python packages

  # setuptools is MIT
@@ -149,8 +149,12 @@ 

  %if %{with tests}

  %check

  # --ignore=pavement.py: No python3-paver in Fedora

- # pavement.py is only used by upstream to do releases and vendoring, we don't ship it

- PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) pytest-%{python3_version} --ignore=pavement.py

+ #   pavement.py is only used by upstream to do releases and vendoring, we don't ship it

+ # --deselect=setuptools/tests/test_setuptools.py::TestDepends::testRequire

+ #   Test failure reported upstream: https://github.com/pypa/setuptools/issues/1896

+ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) pytest-%{python3_version} \

+     --ignore=pavement.py \

+     --deselect=setuptools/tests/test_setuptools.py::TestDepends::testRequire

  %endif # with tests

  

  
@@ -174,6 +178,11 @@ 

  

  

  %changelog

+ * Mon Nov 04 2019 Tomas Orsava <torsava@redhat.com> - 41.6.0-1

+ - Upgrade to 41.6.0 (#1758945).

+ - https://setuptools.readthedocs.io/en/latest/history.html#v41-6-0

+ - Disabled a failing upstream test: https://github.com/pypa/setuptools/issues/1896

+ 

  * Tue Sep 03 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 41.2.0-1

  - Upgrade to 41.2.0 (#1742718).

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

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

- SHA512 (setuptools-41.2.0.zip) = 6ac0da9f2e452b2b2334c03eb1667d88ebffeb68da18a69fe14f9f0763ac391986dcc663f123015b63eb0c3f905e5a8be7408499ddb1ac20367109275cb66ac9

+ SHA512 (setuptools-41.6.0.zip) = 1bed75e7173ea0399f078c96cf5c1818dada7a4b86a93e61ff72da6a25694e321b9047e024617aa775b71a25fe8cb0848323902e1fb9c8c8a1f39434f0de6434

no initial comment

we tend to add changelog link to the changelog, could you please do that?

change looks good (dead simple, actually), so let's also wait for the CI

Ah, I could have looked better and added it right away. Amended.

rebased onto efd7ba63a2e21590acd8cf03a2e10a4803e34d9b

4 years ago

This fails to build with:

=================================== FAILURES ===================================
___________________________ TestDepends.testRequire ____________________________
self = <setuptools.tests.test_setuptools.TestDepends object at 0x7fff9e651d90>
    @needs_bytecode
    def testRequire(self):
        req = Require('Json', '1.0.3', 'json')

        assert req.name == 'Json'
        assert req.module == 'json'
        assert req.requested_version == '1.0.3'
        assert req.attribute == '__version__'
        assert req.full_name() == 'Json-1.0.3'

        from json import __version__
        assert req.get_version() == __version__
        assert req.version_ok('1.0.9')
        assert not req.version_ok('0.9.1')
        assert not req.version_ok('unknown')

        assert req.is_present()
        assert req.is_current()

        req = Require('Json 3000', '03000', 'json', format=LooseVersion)
        assert req.is_present()
        assert not req.is_current()
        assert not req.version_ok('unknown')

        req = Require('Do-what-I-mean', '1.0', 'd-w-i-m')
        assert not req.is_present()
        assert not req.is_current()

        req = Require('Tests', None, 'tests', homepage="http://example.com")
        assert req.format is None
        assert req.attribute is None
        assert req.requested_version is None
        assert req.full_name() == 'Tests'
        assert req.homepage == 'http://example.com'

        from setuptools.tests import __path__
        paths = [os.path.dirname(p) for p in __path__]
>       assert req.is_present(paths)
E       AssertionError: assert False
E        +  where False = <bound method Require.is_present of <setuptools.depends.Require object at 0x7fff9e6c9610>>(['/builddir/build/BUILD/setuptools-41.6.0/setuptools'])
E        +    where <bound method Require.is_present of <setuptools.depends.Require object at 0x7fff9e6c9610>> = <setuptools.depends.Require object at 0x7fff9e6c9610>.is_present
setuptools/tests/test_setuptools.py:120: AssertionError

I've verified that the tests fail even when no Fedora downstream patches are applied: https://koji.fedoraproject.org/koji/taskinfo?taskID=38805059

And the issue has already been reported upstream: https://github.com/pypa/setuptools/issues/1896

I've looked at the test itself and tried to debug it. I wasn't successful, but I believe I've at least confirmed that it's not a problem with the paths, and thus likely not something Fedora-related. More in my comment upstream.

Now I'm contemplating whether to wait or to update to the previous version 41.5.1, which works.

I'd skip it with a link to the issue.

To clarify: by "it" I mean the failing test, not this setuptools version.

rebased onto f1bf6f2

4 years ago

Thanks, @bgoncalv

I'll merge this tomorrow unless there's some new reviews.

Pull-Request has been merged by torsava

4 years ago