Index: head/www/py-requests/Makefile
===================================================================
--- head/www/py-requests/Makefile	(revision 463387)
+++ head/www/py-requests/Makefile	(revision 463388)
@@ -1,37 +1,38 @@
 # Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	requests
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.18.4
 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@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR}
 
 # Actually 2.6-2.7,3.3+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 CONFLICTS_INSTALL=	py*-requests1-*
 
 NO_ARCH=	yes
+
+# Automated tests failinng due to httpbin issue
+# https://github.com/kennethreitz/httpbin/issues/403
 
 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 463387)
+++ head/www/py-requests/distinfo	(revision 463388)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500092996
-SHA256 (requests-2.18.1.tar.gz) = c6f3bdf4a4323ac7b45d01e04a6f6c20e32a052cd04de81e05103abc049ad9b9
-SIZE (requests-2.18.1.tar.gz) = 124229
+TIMESTAMP = 1519435351
+SHA256 (requests-2.18.4.tar.gz) = 9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e
+SIZE (requests-2.18.4.tar.gz) = 126224
Index: head/www/py-requests/files/patch-setup.py
===================================================================
--- head/www/py-requests/files/patch-setup.py	(revision 463387)
+++ head/www/py-requests/files/patch-setup.py	(revision 463388)
@@ -1,27 +1,13 @@
-From 8d1228cd1943bfe89ffaae32e15b2feb3f8479f5 Mon Sep 17 00:00:00 2001
-From: Cory Benfield <lukasaoz@gmail.com>
-Date: Thu, 20 Jul 2017 10:08:50 +0100
-Subject: [PATCH] Allow urllib3 1.22
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 # pytest-cov and its dependencies are not compulsory
 
---- setup.py.orig	2017-06-14 17:44:15 UTC
+--- setup.py.orig	2018-02-24 01:49:05 UTC
 +++ setup.py
-@@ -44,11 +44,11 @@ packages = ['requests']
- requires = [
-     'chardet>=3.0.2,<3.1.0',
-     'idna>=2.5,<2.6',
--    'urllib3>=1.21.1,<1.22',
-+    'urllib3>=1.21.1,<1.23',
+@@ -48,7 +48,7 @@ requires = [
      'certifi>=2017.4.17'
  
  ]
 -test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
 +test_requirements = ['pytest-httpbin==0.0.7', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0']
  
  about = {}
  with open(os.path.join(here, 'requests', '__version__.py'), 'r', 'utf-8') as f: