#10 Update minimal requirement of six to >= 1.16.0
Merged 2 years ago by lbalhar. Opened 3 years ago by ykarel.
rpms/ ykarel/python-urllib3 master  into  rawhide

file modified
+5 -2
@@ -5,7 +5,7 @@ 

  

  Name:           python-%{srcname}

  Version:        1.26.5

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        Python HTTP library with thread-safe connection pooling and file post

  

  License:        MIT
@@ -37,7 +37,7 @@ 

  

  Requires:       ca-certificates

  Requires:       python3-idna

- Requires:       python3-six

+ Requires:       python3-six >= 1.16.0

  Requires:       python3-pysocks

  

  %description -n python3-%{srcname}
@@ -117,6 +117,9 @@ 

  

  

  %changelog

+ * Wed Jun 30 2021 Yatin Karel <ykarel@redhat.com> - 1.26.5-2

+ - Update minimal requirement of six to >= 1.16.0

+ 

  * Wed Jun 16 2021 Karolina Surma <ksurma@redhat.com> - 1.26.5-1

  - Update to 1.26.5

  - Fixes rhbz#1965056

urllib3-1.26.5 to work properly needs six to be
atleast >= 1.16.0. So to ensure when urllib3 is installed
already installed python3-six is upgraded let's set minimum
requirement of six to >= 1.16.0[1] which contains required methods like
six.ensure_text method needed by urllib3-1.26.5, also urllib3
bundles six-1.16.0[2].

[1] https://github.com/urllib3/urllib3/commit/5b047b
[2] https://github.com/urllib3/urllib3/commit/2698537

I totally did not see this PR. ;(

It now conflicts. Does it still matter? Can you rebase or close?

rebased onto a1d6618

2 years ago

@kevin rebased and udpated as per current built version.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

huh, it looks ok to me, but why did Zuul fails rpm-install-test? the logs give a 404?

NODE_FAILURE means infrastructure failure, not test failure

Build succeeded.

All looks good here, thanks for your patience. I'm gonna merge and ship it.

Pull-Request has been merged by lbalhar

2 years ago
Metadata