Index: head/security/py-acme/Makefile
===================================================================
--- head/security/py-acme/Makefile	(revision 455778)
+++ head/security/py-acme/Makefile	(revision 455779)
@@ -1,35 +1,35 @@
 # Created by: Carlos J Puga Medina <cpm@fbsd.es>
 # $FreeBSD$
 
 PORTNAME=	acme
-PORTVERSION=	0.19.0
+PORTVERSION=	0.20.0
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	ACME protocol implementation in Python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/security/py-acme/distinfo
===================================================================
--- head/security/py-acme/distinfo	(revision 455778)
+++ head/security/py-acme/distinfo	(revision 455779)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508061056
-SHA256 (acme-0.19.0.tar.gz) = 1fa23d64d494aaf001e6fe857c461fcfff10f75a1c2c35ec831447f641e1e822
-SIZE (acme-0.19.0.tar.gz) = 94717
+TIMESTAMP = 1512666731
+SHA256 (acme-0.20.0.tar.gz) = 45121aed6c8cc2f31896ac1083068dfdeb613f3edeff9576dc0d10632ea5a3d5
+SIZE (acme-0.20.0.tar.gz) = 95847
Index: head/security/py-acme/files/patch-setup.py
===================================================================
--- head/security/py-acme/files/patch-setup.py	(revision 455778)
+++ head/security/py-acme/files/patch-setup.py	(revision 455779)
@@ -1,18 +1,18 @@
---- setup.py.orig	2017-06-26 10:16:14 UTC
+--- setup.py.orig	2017-12-07 17:15:47 UTC
 +++ setup.py
 @@ -12,7 +12,6 @@ install_requires = [
      # rsa_recover_prime_factors (>=0.8)
      'cryptography>=0.8',
      # Connection.set_tlsext_host_name (>=0.13)
 -    'mock',
      'PyOpenSSL>=0.13',
      'pyrfc3339',
      'pytz',
-@@ -35,6 +34,7 @@ if sys.version_info < (2, 7):
+@@ -31,6 +30,7 @@ if sys.version_info < (2, 7):
      ])
  
  dev_extras = [
 +    'mock',
-     'nose',
+     'pytest',
+     'pytest-xdist',
      'tox',
- ]
Index: head/security/py-certbot/Makefile
===================================================================
--- head/security/py-certbot/Makefile	(revision 455778)
+++ head/security/py-certbot/Makefile	(revision 455779)
@@ -1,45 +1,45 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	certbot
-PORTVERSION=	0.19.0
+PORTVERSION=	0.20.0
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Let's Encrypt client
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR}
 
 # Actually 2.7,3.3+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/etc/|${LOCALBASE}/etc/|' \
 		-e 's|/var/lib|/var/db|' \
 		${WRKSRC}/${PORTNAME}/constants.py
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/security/py-certbot/distinfo
===================================================================
--- head/security/py-certbot/distinfo	(revision 455778)
+++ head/security/py-certbot/distinfo	(revision 455779)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508061152
-SHA256 (certbot-0.19.0.tar.gz) = a7230791dff5d085738119fc22d88ad9d8a35d0b6a3d67806fe33990c7c79d53
-SIZE (certbot-0.19.0.tar.gz) = 285884
+TIMESTAMP = 1512666745
+SHA256 (certbot-0.20.0.tar.gz) = cabf505b64fb400c4239dcdbaeb882079477eb6a8442268596a8791b9e34de88
+SIZE (certbot-0.20.0.tar.gz) = 286291
Index: head/security/py-certbot/files/patch-setup.py
===================================================================
--- head/security/py-certbot/files/patch-setup.py	(revision 455778)
+++ head/security/py-certbot/files/patch-setup.py	(revision 455779)
@@ -1,18 +1,18 @@
---- setup.py.orig	2017-06-26 10:13:14 UTC
+--- setup.py.orig	2017-12-07 17:14:54 UTC
 +++ setup.py
 @@ -42,7 +42,6 @@ install_requires = [
      'ConfigArgParse>=0.9.3',
      'configobj',
      'cryptography>=1.2',  # load_pem_x509_certificate
 -    'mock',
      'parsedatetime>=1.3',  # Calendar.parseDT
      'PyOpenSSL',
      'pyrfc3339',
 @@ -67,6 +66,7 @@ dev_extras = [
      'astroid==1.3.5',
      'coverage',
      'ipdb',
 +    'mock',
-     'nose',
-     'pylint==1.4.2',  # upstream #248
-     'tox',
+     'pytest',
+     'pytest-cov',
+     'pytest-xdist',