Accepting request 970661 from devel:languages:python

- Remove unneeded BuildRequires of mock. 

- Remove unbundling off ssl.match_hostname.
  * It was only done for the primary python3 flavor
  * It is bundled for a reason gh#urllib3/urllib3#2439,
    gh#urllib3/urllib3#2448
  * The tests (and probably urllib3 users) use wildcard patterns
    not supported by the stdlib
- Fix undbundling of six for all flavors
- Replace brotlipy recommendation and test with python-Brotli
  (see release notes below)

- update to 1.26.9:
  * Changed ``urllib3[brotli]`` extra to favor installing Brotli libraries that are still
    receiving updates like ``brotli`` and ``brotlicffi`` instead of ``brotlipy``.
    This change does not impact behavior of urllib3, only which dependencies are installed.
  * Fixed a socket leaking when ``HTTPSConnection.connect()`` raises an exception.
  * Fixed ``server_hostname`` being forwarded from ``PoolManager`` to ``HTTPConnectionPool``
    when requesting an HTTP URL. Should only be forwarded when requesting an HTTPS URL.

- update to 1.26.8:
  * Added extra message to``urllib3.exceptions.ProxyError`` when urllib3 detects that
    a proxy is configured to use HTTPS but the proxy itself appears to only use HTTP.
  * Added a mention of the size of the connection pool when discarding a
    connection due to the pool being full.
  * Added explicit support for Python 3.11.
  * Deprecated the ``Retry.MAX_BACKOFF`` class property in favor of
    ``Retry.DEFAULT_MAX_BACKOFF`` to better match the rest of the default parameter names.
    ``Retry.MAX_BACKOFF`` is removed in v2.0.
  * Changed location of the vendored ``ssl.match_hostname`` function from

OBS-URL: https://build.opensuse.org/request/show/970661
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-urllib3?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2022-04-23 17:45:20 +00:00 committed by Git OBS Bridge
commit c87c2bf46d
5 changed files with 66 additions and 31 deletions

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Tue Apr 19 05:34:17 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
- Remove unneeded BuildRequires of mock.
-------------------------------------------------------------------
Tue Apr 5 19:54:39 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Remove unbundling off ssl.match_hostname.
* It was only done for the primary python3 flavor
* It is bundled for a reason gh#urllib3/urllib3#2439,
gh#urllib3/urllib3#2448
* The tests (and probably urllib3 users) use wildcard patterns
not supported by the stdlib
- Fix undbundling of six for all flavors
- Replace brotlipy recommendation and test with python-Brotli
(see release notes below)
-------------------------------------------------------------------
Tue Mar 29 11:48:27 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1.26.9:
* Changed ``urllib3[brotli]`` extra to favor installing Brotli libraries that are still
receiving updates like ``brotli`` and ``brotlicffi`` instead of ``brotlipy``.
This change does not impact behavior of urllib3, only which dependencies are installed.
* Fixed a socket leaking when ``HTTPSConnection.connect()`` raises an exception.
* Fixed ``server_hostname`` being forwarded from ``PoolManager`` to ``HTTPConnectionPool``
when requesting an HTTP URL. Should only be forwarded when requesting an HTTPS URL.
-------------------------------------------------------------------
Mon Jan 10 22:41:38 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 1.26.8:
* Added extra message to``urllib3.exceptions.ProxyError`` when urllib3 detects that
a proxy is configured to use HTTPS but the proxy itself appears to only use HTTP.
* Added a mention of the size of the connection pool when discarding a
connection due to the pool being full.
* Added explicit support for Python 3.11.
* Deprecated the ``Retry.MAX_BACKOFF`` class property in favor of
``Retry.DEFAULT_MAX_BACKOFF`` to better match the rest of the default parameter names.
``Retry.MAX_BACKOFF`` is removed in v2.0.
* Changed location of the vendored ``ssl.match_hostname`` function from
``urllib3.packages.ssl_match_hostname`` to
``urllib3.util.ssl_match_hostname`` to ensure Python 3.10+ compatibility after
being repackaged by downstream distributors.
* Fixed absolute imports, all imports are now relative.
-------------------------------------------------------------------
Tue Oct 26 21:02:38 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
@ -27,18 +27,17 @@
%bcond_with test
%endif
Name: python-urllib3%{psuffix}
Version: 1.26.7
Version: 1.26.9
Release: 0
Summary: HTTP library with thread-safe connection pooling, file post, and more
License: MIT
Group: Development/Languages/Python
URL: https://urllib3.readthedocs.org/
Source: https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz
# Wrapper for ssl to unbundle ssl_match_hostname
Source1: ssl_match_hostname_py3.py
# PATCH-FIX-UPSTREAM remove_mock.patch gh#urllib3/urllib3#2108 mcepl@suse.com
# remove dependency on the external module mock
Patch0: remove_mock.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: fdupes
@ -50,18 +49,17 @@ Requires: python-cryptography >= 1.3.4
Requires: python-idna >= 2.0.0
Requires: python-pyOpenSSL >= 0.14
Requires: python-six >= 1.12.0
Recommends: python-Brotli >= 1.0.9
Recommends: python-PySocks >= 1.5.6
Recommends: python-brotlipy >= 0.6.0
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module Brotli >= 1.0.9}
BuildRequires: %{python_module PySocks >= 1.5.6}
BuildRequires: %{python_module brotlipy >= 0.6.0}
BuildRequires: %{python_module certifi}
BuildRequires: %{python_module cryptography >= 1.3.4}
BuildRequires: %{python_module dateutil}
BuildRequires: %{python_module flaky}
BuildRequires: %{python_module idna >= 2.0.0}
BuildRequires: %{python_module mock >= 1.3.0}
BuildRequires: %{python_module psutil}
BuildRequires: %{python_module pytest-freezegun}
BuildRequires: %{python_module pytest-timeout}
@ -108,35 +106,26 @@ rm -r test/appengine/
%if !%{with test}
%python_install
# Unbundle the Python 3 build
rm %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
rm -r %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/
%{python_expand # Unbundle six
rm %{buildroot}/%{$python_sitelib}/urllib3/packages/six.py
rm %{buildroot}/%{$python_sitelib}/urllib3/packages/__pycache__/six*.pyc
# Copy ssl_match_hostname.py before compilation, so we can have a pyc too
cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py
ln -s %{$python_sitelib}/six.py %{buildroot}/%{$python_sitelib}/urllib3/packages/six.py
ln -sf %{$python_sitelib}/__pycache__/six.cpython-%{$python_version_nodots}.opt-1.pyc \
%{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
ln -sf %{$python_sitelib}/__pycache__/six.cpython-%{$python_version_nodots}.pyc \
%{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
%{python_expand \
$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/urllib3/
$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/urllib3/
%fdupes %{buildroot}%{$python_sitelib}
}
ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py
ln -sf %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \
%{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
ln -sf %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
%{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
%if %{with test}
%check
# gh#urllib3/urllib3#2109
export CI="true"
# still broken with new ssl
skiplist='test_import_urllib3'
# skip some randomly failing tests (mostly on i586, but sometimes they fail on other architectures)
skiplist+=" or test_ssl_read_timeout or test_ssl_failed_fingerprint_verification or test_ssl_custom_validation_failure_terminates"
skiplist="test_ssl_read_timeout or test_ssl_failed_fingerprint_verification or test_ssl_custom_validation_failure_terminates"
# gh#urllib3/urllib3#1752 and others: upstream's way of checking that the build
# system has a correct system time breaks (re-)building the package after too
# many months have passed since the last release.

View File

@ -1 +0,0 @@
from ssl import match_hostname, CertificateError

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece
size 291350

3
urllib3-1.26.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
size 295258