X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=python-urllib3.spec;h=2f46f3db7f3842487c007d8fbf1424b78510fb48;hb=ec94c334f694a159f320c6855c25ad747d25705a;hp=59684452167ebbe047a9531383f2973eb1db7c89;hpb=2a47d2809de856cf726719ce6932c79777ba04c4;p=packages%2Fpython-urllib3.git

diff --git a/python-urllib3.spec b/python-urllib3.spec
index 5968445..2f46f3d 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -3,45 +3,72 @@
 # Conditional build:
 %bcond_without	python2	# CPython 2.x module
 %bcond_without	python3	# CPython 3.x module
-%bcond_with	tests	# test target (uses network etc.)
+%bcond_without	doc	# Sphinx documentation
+%bcond_with	tests	# test target (uses network etc., few failures)
 
 %define		module		urllib3
-%define		pypi_name	urllib3
 Summary:	HTTP library with thread-safe connection pooling, file post, and more
 Summary(pl.UTF-8):	Biblioteka HTTP z bezpieczną wątkowo pulą połączeń, wysyłaniem plików itd.
 Name:		python-%{module}
-Version:	1.22
-Release:	3
+# note: maintain versions compatible with python-requests.spec
+Version:	1.26.12
+Release:	1
 License:	MIT
 Group:		Development/Languages/Python
-Source0:	https://files.pythonhosted.org/packages/source/u/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-# Source0-md5:	0da7bed3fe94bf7dc59ae37885cc72f7
-URL:		http://urllib3.readthedocs.org/
+#Source0Download: https://pypi.org/simple/urllib3/
+Source0:	https://files.pythonhosted.org/packages/source/u/urllib3/%{module}-%{version}.tar.gz
+# Source0-md5:	ba308b52b9092184cf4905bc59a88fc0
+Patch0:		%{name}-mock.patch
+Patch1:		%{name}-httplib.patch
+URL:		https://urllib3.readthedocs.io/
+%if %(locale -a | grep -q '^C\.utf8$'; echo $?)
+BuildRequires:	glibc-localedb-all
+%endif
 %if %{with python2}
 BuildRequires:	python-modules >= 1:2.7
 %if %{with tests}
-BuildRequires:	python-PySocks >= 1.5.6
+BuildRequires:	python-PySocks >= 1.7.1
 BuildRequires:	python-PySocks < 2.0
-BuildRequires:	python-mock
-BuildRequires:	python-nose
-BuildRequires:	python-tornado
+BuildRequires:	python-cryptography >= 2.8
+BuildRequires:	python-dateutil >= 2.8.1
+BuildRequires:	python-flaky >= 3.6.1
+# TODO
+#BuildRequires:	python-gcp_devrel-py-tools >= 0.0.15
+BuildRequires:	python-mock >= 3.0.5
+BuildRequires:	python-pytest >= 4.6.9
+BuildRequires:	python-pytest-freezegun >= 0.3.0
+BuildRequires:	python-pytest-timeout >= 1.3.4
+BuildRequires:	python-tornado >= 5.1.1
+BuildRequires:	python-trustme >= 0.5.3
 # SO_REUSEPORT option
 BuildRequires:	uname(release) >= 3.9
 %endif
 %endif
 %if %{with python3}
-BuildRequires:	python3-modules >= 1:3.2
+BuildRequires:	python3-modules >= 1:3.5
 %if %{with tests}
-BuildRequires:	python3-PySocks >= 1.5.6
+BuildRequires:	python3-PySocks >= 1.7.1
 BuildRequires:	python3-PySocks < 2.0
-BuildRequires:	python3-nose
-BuildRequires:	python3-tornado
+BuildRequires:	python3-cryptography >= 2.8
+BuildRequires:	python3-dateutil >= 2.8.1
+BuildRequires:	python3-flaky >= 3.6.1
+#BuildRequires:	python3-gcp_devrel-py-tools >= 0.0.15
+BuildRequires:	python3-pytest >= 4.6.9
+BuildRequires:	python3-pytest-freezegun >= 0.4.2
+BuildRequires:	python3-pytest-timeout >= 1.3.4
+BuildRequires:	python3-tornado >= 6.0.3
+BuildRequires:	python3-trustme >= 0.5.3
 # SO_REUSEPORT option
 BuildRequires:	uname(release) >= 3.9
 %endif
 %endif
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
+%if %{with doc}
+BuildRequires:	python3-furo
+BuildRequires:	python3-requests >= 2
+BuildRequires:	sphinx-pdg-3 >= 3.0
+%endif
 Requires:	python-modules >= 1:2.7
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,7 +97,7 @@ plików metodą POST. Możliwości:
 Summary:	HTTP library with thread-safe connection pooling, file post, and more
 Summary(pl.UTF-8):	Biblioteka HTTP z bezpieczną wątkowo pulą połączeń, wysyłaniem plików itd.
 Group:		Development/Languages/Python
-Requires:	python3-modules >= 1:3.2
+Requires:	python3-modules >= 1:3.5
 
 %description -n python3-urllib3
 Python 3 HTTP module with connection pooling and file POST abilities.
@@ -92,16 +119,56 @@ plików metodą POST. Możliwości:
 - obsługa kodowań gzip i deflate
 - bezpieczeństwo względem wątków.
 
+%package apidocs
+Summary:	API documentation for Python urllib3 module
+Summary(pl.UTF-8):	Dokumentacja API modułu Pythona urllib3
+Group:		Documentation
+
+%description apidocs
+API documentation for Python urllib3 module.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API modułu Pythona urllib3.
+
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with python2}
-%py_build %{?with_tests:test}
+%py_build
+
+%if %{with tests}
+# RECENT_DATE is too old
+# test_retry.py: many failures with py2
+# TestSSL: unknown ca, timeout errors etc.
+LC_ALL=C.UTF-8 \
+PYTHONPATH=$(pwd)/src \
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS="flaky.flaky_pytest_plugin,pytest_freezegun,pytest_timeout" \
+%{__python} -m pytest test -k 'not (test_recent_date or test_retry or test_ssl_read_timeout or test_ssl_failed_fingerprint_verification)'
+# or TestSSL)'
+%endif
 %endif
 
 %if %{with python3}
-%py3_build %{?with_tests:test}
+%py3_build
+
+%if %{with tests}
+# RECENT_DATE is too old
+# TestSSL: verification errors
+PYTHONPATH=$(pwd)/src \
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS="flaky.flaky_pytest_plugin,pytest_freezegun,pytest_timeout" \
+%{__python3} -m pytest test -k 'not (test_recent_date or test_ssl_read_timeout or test_ssl_failed_fingerprint_verification)'
+%endif
+%endif
+
+%if %{with doc}
+%{__make} -C docs html \
+	SPHINXBUILD=sphinx-build-3 \
+	SPHINXOPTS=
 %endif
 
 %install
@@ -109,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with python2}
 %py_install
+
 %py_postclean
 %endif
 
@@ -122,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.rst CONTRIBUTORS.txt LICENSE.txt README.rst
+%doc CHANGES.rst LICENSE.txt README.rst
 %{py_sitescriptdir}/%{module}
 %{py_sitescriptdir}/%{module}-%{version}-py*.egg-info
 %endif
@@ -130,7 +198,13 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-urllib3
 %defattr(644,root,root,755)
-%doc CHANGES.rst CONTRIBUTORS.txt LICENSE.txt README.rst
+%doc CHANGES.rst LICENSE.txt README.rst
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/%{module}-%{version}-py*.egg-info
 %endif
+
+%if %{with doc}
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/_build/html/{_static,reference,*.html,*.js}
+%endif