View | Details | Raw Unified | Return to bug 239302 | Differences between
and this patch

Collapse All | Expand All

(-)www/py-requests/Makefile (-4 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	requests
4
PORTNAME=	requests
5
PORTVERSION=	2.21.0
5
PORTVERSION=	2.22.0
6
CATEGORIES=	www python
6
CATEGORIES=	www python
7
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 21-32 Link Here
21
		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
22
		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
23
23
24
# Actually 2.6-2.7,3.4+
24
# Actually 2.7,3.5+
25
USES=		python
25
USES=		python
26
USE_PYTHON=	autoplist concurrent distutils
26
USE_PYTHON=	autoplist concurrent distutils
27
27
28
CONFLICTS_INSTALL=	py*-requests1-*
29
30
NO_ARCH=	yes
28
NO_ARCH=	yes
31
29
32
do-test:
30
do-test:
(-)www/py-requests/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1548125465
1
TIMESTAMP = 1572339862
2
SHA256 (requests-2.21.0.tar.gz) = 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e
2
SHA256 (requests-2.22.0.tar.gz) = 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4
3
SIZE (requests-2.21.0.tar.gz) = 111528
3
SIZE (requests-2.22.0.tar.gz) = 113406
(-)www/py-requests/files/patch-tests_test__utils.py (+17 lines)
Line 0 Link Here
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."""

Return to bug 239302