Index: head/www/py-requests/Makefile
===================================================================
--- head/www/py-requests/Makefile	(revision 517077)
+++ head/www/py-requests/Makefile	(revision 517078)
@@ -1,35 +1,33 @@
 # Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	requests
-PORTVERSION=	2.21.0
+PORTVERSION=	2.22.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	HTTP library written in Python for human beings
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${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} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
 
-# Actually 2.6-2.7,3.4+
+# Actually 2.7,3.5+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
-
-CONFLICTS_INSTALL=	py*-requests1-*
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/www/py-requests/distinfo
===================================================================
--- head/www/py-requests/distinfo	(revision 517077)
+++ head/www/py-requests/distinfo	(revision 517078)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548125465
-SHA256 (requests-2.21.0.tar.gz) = 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e
-SIZE (requests-2.21.0.tar.gz) = 111528
+TIMESTAMP = 1572339862
+SHA256 (requests-2.22.0.tar.gz) = 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4
+SIZE (requests-2.22.0.tar.gz) = 113406
Index: head/www/py-requests/files/patch-tests_test__utils.py
===================================================================
--- head/www/py-requests/files/patch-tests_test__utils.py	(nonexistent)
+++ head/www/py-requests/files/patch-tests_test__utils.py	(revision 517078)
@@ -0,0 +1,17 @@
+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."""

Property changes on: head/www/py-requests/files/patch-tests_test__utils.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property