#15 Update to 1.26.5, fixes FTBFS w/ Python 3.10 + add test configuration for testing pipenv
Merged 2 years ago by churchyard. Opened 2 years ago by ksurma.
rpms/ ksurma/python-urllib3 pipenv-tests  into  rawhide

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

+ 1

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

  /urllib3-1.25.8.tar.gz

  /urllib3-1.25.10.tar.gz

  /urllib3-1.26.4.tar.gz

+ /urllib3-1.26.5.tar.gz

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

+ summary: Run pipenv tests

+ discover:

+     how: fmf

+     url: https://src.fedoraproject.org/rpms/pipenv/

+ execute:

+     how: tmt

+ 

file modified
+10 -4
@@ -4,13 +4,15 @@ 

  %bcond_without tests

  

  Name:           python-%{srcname}

- Version:        1.26.4

- Release:        3%{?dist}

+ Version:        1.26.5

+ Release:        1%{?dist}

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

  

  License:        MIT

  URL:            https://github.com/urllib3/urllib3

  Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+ # Unbundle ssl_match_hostname since we depend on it

+ Source1:        ssl_match_hostname_py3.py

  BuildArch:      noarch

  

  %description
@@ -90,10 +92,10 @@ 

  # Unbundle the Python 3 build

  rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py

  rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.*

- rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/_implementation.py

- rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/__pycache__/_implementation.*

+ rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/

  

  mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/

+ cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py

  ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py

  ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \

        %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
@@ -115,6 +117,10 @@ 

  

  

  %changelog

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

+ - Update to 1.26.5

+ - Fixes rhbz#1965056

+ 

  * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.26.4-3

  - Rebuilt for Python 3.10

  

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

- SHA512 (urllib3-1.26.4.tar.gz) = c770ae93e024af2bd79145d90426ad56f89184a4a02a55551bf54680a1ba369e683080e1899f00d57efcb085145e29a189f502ae6b41e572de111909297fb4e6

+ SHA512 (urllib3-1.26.5.tar.gz) = d4a97aa05f9138cbd2fceadd6268f55f1389a57abccc44f6dfd7755778d417a6648f081ceefd376b27c17e384ccc81caf49f0ea23b4d9ac8e347a06d85cb4639

@@ -0,0 +1,1 @@ 

+ from ssl import match_hostname, CertificateError

This package is one of the dependencies of pipenv and we'd like to make sure that when it is updated, pipenv will still work correctly.
This PR adds configuration that executes tests placed in pipenv repository. No actual test scripts are being added here.
The tests run automatically on Fedora CI when a new Pull request to this repository is open.

Build succeeded.

rebased onto 3cb40d6

2 years ago

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

2 new commits added

  • Restore bundled ssl_match_hostname
  • Update to 1.26.5
2 years ago

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

Update to 1.26.5 fixes FTBFS with Python 3.10.
Rebundling ssl_match_hostname reverts changes introduced with the last update which broke pipenv with Python2. Now the pipenv tests will succeed.

Looking good code-wise and the pipenv tests run without tracebacks.

One nitpick: We are not bundling ssl_match_hostname. It is a wrapper to use the system version. I propose to rename the Restore bundled ssl_match_hostname commit to Restore ssl_match_hostname unbundle wrapper

Build succeeded.

3 new commits added

  • Restore ssl_match_hostname unbundle wrapper
  • Update to 1.26.5
  • Run pipenv tests on package update
2 years ago

Done, thanks for proposed rephrasal.

Looking good. I'd like to merge soon, if there is no pushback.

Build succeeded.

Pull-Request has been merged by churchyard

2 years ago