diff --git a/python-urllib3.spec b/python-urllib3.spec index bc8656546f572a237db847f691627312a986e9a3..4f4a22037b5c5a1bdcab7d798b73084730d340f0 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -2,16 +2,14 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.24.3 -Release: 2 +Version: 1.25.8 +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 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 @@ -22,35 +20,25 @@ 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 - %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 +BuildRequires: python3-mock +BuildRequires: python3-six +BuildRequires: python3-pysocks +BuildRequires: python3-pytest +BuildRequires: python3-tornado +BuildRequires: python3-trustme +BuildRequires: python3-idna %endif Requires: ca-certificates python3-six python3-pysocks - +Requires: python3-idna %description -n python3-urllib3 Python3 %_description @@ -63,21 +51,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* @@ -91,16 +69,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) @@ -110,8 +81,8 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog -* Sat Oct 26 2019 openEuler Buildteam - 1.24.3-2 -- optimize spec file. +* Sun June 29 2020 wangjie - 1.25.8 +- enhancement * Mon Sep 16 2019 openEuler Buildteam - 1.24.3-1 - Package init diff --git a/urllib3-1.25.8.tar.gz b/urllib3-1.25.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ece5b9e0fab8d110da98c35a7686445e741fc766 Binary files /dev/null and b/urllib3-1.25.8.tar.gz differ