Attachment #220983 for bug #250941




# $FreeBSD$

PORTNAME=	requests
PORTVERSION=	2.25.1
PORTREVISION=	2
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-httpbin>0:devel/py-pytest-httpbin@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}httpbin>0:www/py-httpbin@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}

# Actually 2.7,3.5+
USES=		python

NO_ARCH=	yes

do-test:
	@cd ${WRKSRC} && pytest tests

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)www/py-requests/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572339862	1	TIMESTAMP = 1609030585
2	SHA256 (requests-2.22.0.tar.gz) = 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4	2	SHA256 (requests-2.25.1.tar.gz) = 27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804
3	SIZE (requests-2.22.0.tar.gz) = 113406	3	SIZE (requests-2.25.1.tar.gz) = 102161




# pytest-cov and its dependencies are not compulsory
#
# Subject: [PATCH] Limit dependencies to major instead of minor (#5342
# From c46f55bd48dabc02f033d252f8c64e2011f37361 Mon Sep 17 00:00:00 2001
# From: Chris Withers <chris@withers.org>
# Date: Tue, 18 Feb 2020 14:58:27 +0000

--- setup.py.orig	2019-05-16 14:22:45 UTC
+++ setup.py
@@ -42,8 +42,8 @@ if sys.argv[-1] == 'publish':
 packages = ['requests']
 
 requires = [
-    'chardet>=3.0.2,<3.1.0',
-    'idna>=2.5,<2.9',
+    'chardet>=3.0.2,<4',
+    'idna>=2.5,<3',
     'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',
     'certifi>=2017.4.17'
 
@@ -101,7 +101,7 @@ setup(
     cmdclass={'test': PyTest},
     tests_require=test_requirements,
     extras_require={
-        'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+        'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4'],
         'socks': ['PySocks>=1.5.6, !=1.5.7'],
         'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'],
     },

Added Link Here

(-)www/py-requests/files/patch-tests_test__requests.py (+11 lines)
1	--- tests/test_requests.py.orig 2020-12-16 17:43:25 UTC
2	+++ tests/test_requests.py
3	@@ -838,7 +838,7 @@ class TestRequests:
4	def test_https_warnings(self, httpbin_secure, httpbin_ca_bundle):
5	"""warnings are emitted with requests.get"""
6	if HAS_MODERN_SSL or HAS_PYOPENSSL:
7	- warnings_expected = ('SubjectAltNameWarning', )
8	+ warnings_expected = ()
9	else:
10	warnings_expected = ('SNIMissingWarning',
11	'InsecurePlatformWarning',




Make tests work with devel/py-pytest >= 4

Obtained from:
https://github.com/psf/requests/commit/0fe6653eabc3e0a4b8c48e374fb7ee83a3bf829b

--- tests/test_utils.py.orig	2019-05-16 14:18:16 UTC
+++ tests/test_utils.py
@@ -33,7 +33,8 @@ class TestSuperLen:
         'stream, value', (
             (StringIO.StringIO, 'Test'),
             (BytesIO, b'Test'),
-            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
+            pytest.param(cStringIO, 'Test',
+                        marks=pytest.mark.skipif('cStringIO is None')),
         ))
     def test_io_streams(self, stream, value):
         """Ensures that we properly deal with different kinds of IO streams."""

Return to bug 250941

Lines 2-9 Link Here

(-)www/py-requests/Makefile (-6 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= requests	4	PORTNAME= requests
5	PORTVERSION= 2.22.0	5	PORTVERSION= 2.25.1
6	PORTREVISION= 2
7	CATEGORIES= www python	6	CATEGORIES= www python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 18-26 Link Here
18	${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR}
21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \	20	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR}	22	${PYTHON_PKGNAMEPREFIX}pytest-httpbin>0:devel/py-pytest-httpbin@${PY_FLAVOR} \
		23	${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
		24	${PYTHON_PKGNAMEPREFIX}httpbin>0:www/py-httpbin@${PY_FLAVOR} \
		25	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
		26	${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}
24		27
25	# Actually 2.7,3.5+	28	# Actually 2.7,3.5+
26	USES= python	29	USES= python
Lines 29-34 Link Here
29	NO_ARCH= yes	32	NO_ARCH= yes
30		33
31	do-test:	34	do-test:
32	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test	35	@cd ${WRKSRC} && pytest tests
33		36
34	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Removed Link Here

(-)www/py-requests/files/patch-setup.py (-29 lines)
1	# pytest-cov and its dependencies are not compulsory
2	#
3	# Subject: [PATCH] Limit dependencies to major instead of minor (#5342
4	# From c46f55bd48dabc02f033d252f8c64e2011f37361 Mon Sep 17 00:00:00 2001
5	# From: Chris Withers <chris@withers.org>
6	# Date: Tue, 18 Feb 2020 14:58:27 +0000
7
8	--- setup.py.orig 2019-05-16 14:22:45 UTC
9	+++ setup.py
10	@@ -42,8 +42,8 @@ if sys.argv[-1] == 'publish':
11	packages = ['requests']
12
13	requires = [
14	- 'chardet>=3.0.2,<3.1.0',
15	- 'idna>=2.5,<2.9',
16	+ 'chardet>=3.0.2,<4',
17	+ 'idna>=2.5,<3',
18	'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',
19	'certifi>=2017.4.17'
20
21	@@ -101,7 +101,7 @@ setup(
22	cmdclass={'test': PyTest},
23	tests_require=test_requirements,
24	extras_require={
25	- 'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
26	+ 'security': ['pyOpenSSL >= 0.14', 'cryptography>=1.3.4'],
27	'socks': ['PySocks>=1.5.6, !=1.5.7'],
28	'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'],
29	},

Removed Link Here

(-)www/py-requests/files/patch-tests_test__utils.py (-17 lines)
1	Make tests work with devel/py-pytest >= 4
2
3	Obtained from:
4	https://github.com/psf/requests/commit/0fe6653eabc3e0a4b8c48e374fb7ee83a3bf829b
5
6	--- tests/test_utils.py.orig 2019-05-16 14:18:16 UTC
7	+++ tests/test_utils.py
8	@@ -33,7 +33,8 @@ class TestSuperLen:
9	'stream, value', (
10	(StringIO.StringIO, 'Test'),
11	(BytesIO, b'Test'),
12	- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
13	+ pytest.param(cStringIO, 'Test',
14	+ marks=pytest.mark.skipif('cStringIO is None')),
15	))
16	def test_io_streams(self, stream, value):
17	"""Ensures that we properly deal with different kinds of IO streams."""