diff --git a/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch b/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch deleted file mode 100644 index 298bad2ddd1f68f1fcd61301cfdbab9f0f10746b..0000000000000000000000000000000000000000 --- a/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/urllib3-1.24.3/src/urllib3/connection.py b/urllib3-1.24.3/src/urllib3/connection.py -index ba269b7..5384094 100644 ---- a/src/urllib3/connection.py -+++ b/src/urllib3/connection.py -@@ -57,10 +57,9 @@ port_by_scheme = { - - # When updating RECENT_DATE, move it to within two years of the current date, - # and not less than 6 months ago. --# Example: if Today is 2018-01-01, then RECENT_DATE should be any date on or --# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months) --RECENT_DATE = datetime.date(2017, 6, 30) -- -+# When it comes time to update this value as a part of regular maintenance -+# (ie test_recent_date is failing) update it to ~6 months before the current date. -+RECENT_DATE = datetime.date(2019, 9, 1) - - class DummyConnection(object): - """Used to detect a failed ConnectionCls import.""" --- -2.19.1 diff --git a/1.25.9.tar.gz b/1.25.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0bd5199cf526e083ce4e2cc9dece06e3fede9ec3 Binary files /dev/null and b/1.25.9.tar.gz differ diff --git a/modify-pytest-tool.patch b/modify-pytest-tool.patch deleted file mode 100644 index aeb0610be92397800a7041abc14b5112b6b4fa90..0000000000000000000000000000000000000000 --- a/modify-pytest-tool.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 8d82ecab638ef1cafbbf0007d597a4d9d23656ba Mon Sep 17 00:00:00 2001 -From: Ratan Kulshreshtha -Date: Thu, 23 May 2019 23:27:37 +0530 -Subject: [PATCH] Update assertions to pytest style - ---- - setup.cfg | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index ddda086a0..dbd367b86 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -19,4 +19,4 @@ requires-dist = - PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks' - --[pytest] -+[tool:pytest] - xfail_strict = true diff --git a/python-urllib3.spec b/python-urllib3.spec index bc8656546f572a237db847f691627312a986e9a3..4687ed5f845717b448e9858d62d780275a97931c 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -2,57 +2,34 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.24.3 -Release: 2 +Version: 1.25.9 +Release: 1 Summary: Sanity-friendly HTTP client for Python License: MIT URL: https://urllib3.readthedocs.io -Source0: https://github.com/urllib3/urllib3/archive/%{version}/urllib3-%{version}.tar.gz +Source0: https://github.com/urllib3/urllib3/archive/%{version}/%{version}.tar.gz Source1: ssl_match_hostname_py3.py -#modify pytest to tool:pytest, from Ratan Kulshreshtha -Patch0: modify-pytest-tool.patch -Patch6000: 0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch BuildArch: noarch -%global _description \ -HTTP library with thread-safe connection pooling, file post support,\ -sanity friendly, and more. - -%description -Python %_description - -%package -n python2-%{srcname} -Summary: Sanity-friendly HTTP client for python2 -%{?python_provide:%python_provide python2-urllib3} - -Requires: ca-certificates python2-six python2-backports-ssl_match_hostname -Requires: python2-ipaddress python2-pysocks - -BuildRequires: python2-devel - -%if %{with tests} -BuildRequires: python2-nose python2-coverage python2-mock python2-six -BuildRequires: python2-pysocks python2-pytest python2-tornado python2-backports-ssl_match_hostname -%endif - -%description -n python2-urllib3 -Python2 %_description +%description +HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more. %package -n python3-%{srcname} Summary: Python3 HTTP library with thread-safe connection pooling and file post BuildRequires: python3-devel +BuildRequires: python3-setuptools %if %{with tests} -BuildRequires: python3-nose python3-mock python3-six -BuildRequires: python3-pysocks python3-pytest python3-tornado +BuildRequires: python3-nose python3-mock python3-six python-idna +BuildRequires: python3-pysocks python3-pytest python3-tornado python-trustme %endif -Requires: ca-certificates python3-six python3-pysocks +Requires: ca-certificates python3-idna python3-six python3-pysocks %description -n python3-urllib3 -Python3 %_description +Python3 HTTP module with connection pooling and file POST abilities. %prep %autosetup -n %{srcname}-%{version} -p1 @@ -63,22 +40,11 @@ rm -rf test/contrib/ rm -rf test/test_no_ssl.py %build -%py2_build %py3_build %install -%py2_install %py3_install -rm -rf %{buildroot}%{python2_sitelib}/urllib3/packages/six.py* -rm -rf %{buildroot}%{python2_sitelib}/urllib3/packages/ssl_match_hostname/ - -mkdir -p %{buildroot}/%{python2_sitelib}/urllib3/packages/ -ln -s %{python2_sitelib}/six.py %{buildroot}/%{python2_sitelib}/urllib3/packages/six.py -ln -s %{python2_sitelib}/six.pyc %{buildroot}/%{python2_sitelib}/urllib3/packages/six.pyc -ln -s %{python2_sitelib}/six.pyo %{buildroot}/%{python2_sitelib}/urllib3/packages/six.pyo -ln -s %{python2_sitelib}/backports/ssl_match_hostname %{buildroot}/%{python2_sitelib}/urllib3/packages/ssl_match_hostname - 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/ @@ -91,17 +57,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc % %if %{with tests} %check -PYTHONPATH=%{buildroot}%{python2_sitelib}:%{python2_sitelib} %{__python2} -m pytest -v PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pytest -v %endif -%files -n python2-urllib3 -%defattr(-,root,root) -%license LICENSE.txt -%doc CHANGES.rst README.rst CONTRIBUTORS.txt -%{python2_sitelib}/urllib3/ -%{python2_sitelib}/urllib3-*.egg-info - %files -n python3-urllib3 %defattr(-,root,root) %license LICENSE.txt @@ -110,6 +68,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog +* Tue Jul 28 2020 chengguipeng - 1.25.9-1 +- upgrade to 1.25.9 + * Sat Oct 26 2019 openEuler Buildteam - 1.24.3-2 - optimize spec file. diff --git a/urllib3-1.24.3.tar.gz b/urllib3-1.24.3.tar.gz deleted file mode 100644 index 2a9c1ac595aee024acb2f2c0a47b86ebb873bfab..0000000000000000000000000000000000000000 Binary files a/urllib3-1.24.3.tar.gz and /dev/null differ