commit 9f3e52829e331da51d2726479d427c50a1e0c396 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 11:15:38 2019 -0400 Package init diff --git a/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch b/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch new file mode 100644 index 0000000..298bad2 --- /dev/null +++ b/0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch @@ -0,0 +1,20 @@ +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/modify-pytest-tool.patch b/modify-pytest-tool.patch new file mode 100644 index 0000000..aeb0610 --- /dev/null +++ b/modify-pytest-tool.patch @@ -0,0 +1,19 @@ +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 new file mode 100644 index 0000000..bbc8407 --- /dev/null +++ b/python-urllib3.spec @@ -0,0 +1,114 @@ +%global srcname urllib3 +%bcond_without tests + +Name: python-%{srcname} +Version: 1.24.3 +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 + +%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-nose-exclude 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 + +%if %{with tests} +BuildRequires: python3-nose python3-mock python3-six +BuildRequires: python3-pysocks python3-pytest python3-tornado +%endif + +Requires: ca-certificates python3-six python3-pysocks + +%description -n python3-urllib3 +Python3 %_description + +%prep +%autosetup -n %{srcname}-%{version} -p1 +#Failure use case circumvention +rm -rf test/with_dummyserver/ +rm -rf test/appengine/ +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/ + +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__/ +ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ + +%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 +%doc CHANGES.rst README.rst CONTRIBUTORS.txt +%{python3_sitelib}/urllib3/ +%{python3_sitelib}/urllib3-*.egg-info + +%changelog +* Mon Sep 16 2019 openEuler Buildteam - 1.24.3-1 +- Package init diff --git a/ssl_match_hostname_py3.py b/ssl_match_hostname_py3.py new file mode 100644 index 0000000..99d425a --- /dev/null +++ b/ssl_match_hostname_py3.py @@ -0,0 +1 @@ +from ssl import match_hostname, CertificateError diff --git a/urllib3-1.24.3.tar.gz b/urllib3-1.24.3.tar.gz new file mode 100644 index 0000000..2a9c1ac Binary files /dev/null and b/urllib3-1.24.3.tar.gz differ