X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=python-requests.spec;h=03f6c5c8db6ae5fb70c66867eee11140a3b80c4d;hb=d27cd28;hp=cae64e22deb9d2e4887ba55b7ef02c61bb972556;hpb=fa360ea6341f38a5924cd6abac16001724fd9e65;p=packages%2Fpython3-requests.git

diff --git a/python-requests.spec b/python-requests.spec
index cae64e2..03f6c5c 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with	tests	# test target [Pipfile file missing as of 2.19.1]
+%bcond_with	tests	# pytest tests (one test fails with pytest-httpbin 1.0.0)
 %bcond_without	python2	# CPython 2.x module
 %bcond_without	python3	# CPython 3.x module
 
@@ -10,15 +10,18 @@
 Summary:	HTTP library for Python 2
 Summary(pl.UTF-8):	Biblioteka HTTP dla Pythona 2
 Name:		python-%{module}
-Version:	2.26.0
-Release:	2
+# keep 2.27.x here for python2 support
+Version:	2.27.1
+Release:	1
 License:	Apache v2.0
 Group:		Development/Languages/Python
 #Source0Download: https://pypi.org/simple/requests/
 Source0:	https://files.pythonhosted.org/packages/source/r/requests/%{module}-%{version}.tar.gz
-# Source0-md5:	8c745949ad3e9ae83d9927fed213db8a
+# Source0-md5:	bcc01b73974a305cc7c5b092e7d07004
 Patch0:		system-cert.patch
-URL:		http://python-requests.org/
+Patch1:		%{name}-reqs.patch
+Patch2:		%{name}-disable-xdist.patch
+URL:		https://docs.python-requests.org/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.713
 %if %{with python2}
@@ -47,10 +50,10 @@ BuildRequires:	python3-setuptools
 %if %{with tests}
 BuildRequires:	python3-PySocks >= 1.5.8
 BuildRequires:	python3-certifi >= 2017.4.17
-BuildRequires:	python3-chardet >= 3.0.2
-BuildRequires:	python3-chardet < 5
+BuildRequires:	python3-charset_normalizer >= 2
+BuildRequires:	python3-charset_normalizer < 2.1
 BuildRequires:	python3-idna >= 2.5
-BuildRequires:	python3-idna
+BuildRequires:	python3-idna < 4
 BuildRequires:	python3-pytest >= 3
 BuildRequires:	python3-pytest-cov
 BuildRequires:	python3-pytest-httpbin >= 0.0.7
@@ -130,14 +133,28 @@ Ten pakiet zawiera moduł dla Pythona 3.x.
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %if %{with python2}
-%py_build %{?with_tests:test}
+%py_build
+
+%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS="pytest_httpbin.plugin,pytest_mock" \
+%{__python} -m pytest tests
+%endif
 %endif
 
 %if %{with python3}
-%py3_build %{?with_tests:test}
+%py3_build
+
+%if %{with tests}
+PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \
+PYTEST_PLUGINS="pytest_httpbin.plugin,pytest_mock" \
+%{__python3} -m pytest tests
+%endif
 %endif
 
 %install