From 9c5fe52129c865e206cc5ac607d1b5226b34a1e7 Mon Sep 17 00:00:00 2001 From: cpm Date: Wed, 28 Jun 2017 16:56:17 +0000 Subject: MFH: r444364 security/py-{acme,certbot}: fix missing dependency on py-mock Common: - Move py-mock requirement to dev_extras in setup.py - Bump PORTREVISION PR: 220274 Submitted by: cpm Reported by: Randy Westlund Approved by: koobs (maintainer, py-certbot) Approved by: ports-secteam (miwi) --- security/py-acme/Makefile | 1 + security/py-acme/files/patch-setup.py | 18 ++++++++++++++++++ security/py-certbot/Makefile | 1 + security/py-certbot/files/patch-setup.py | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 security/py-acme/files/patch-setup.py create mode 100644 security/py-certbot/files/patch-setup.py diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile index e21c4fe..afa5f5d 100644 --- a/security/py-acme/Makefile +++ b/security/py-acme/Makefile @@ -3,6 +3,7 @@ PORTNAME= acme PORTVERSION= 0.12.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP diff --git a/security/py-acme/files/patch-setup.py b/security/py-acme/files/patch-setup.py new file mode 100644 index 0000000..cac716f --- /dev/null +++ b/security/py-acme/files/patch-setup.py @@ -0,0 +1,18 @@ +--- setup.py.orig 2017-06-26 10:16:14 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): + ]) + + dev_extras = [ ++ 'mock', + 'nose', + 'tox', + ] diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index fc2208e..1dea909 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -3,6 +3,7 @@ PORTNAME= certbot PORTVERSION= 0.12.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP diff --git a/security/py-certbot/files/patch-setup.py b/security/py-certbot/files/patch-setup.py new file mode 100644 index 0000000..a13fd00 --- /dev/null +++ b/security/py-certbot/files/patch-setup.py @@ -0,0 +1,18 @@ +--- setup.py.orig 2017-06-26 10:13:14 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', -- cgit v1.1