Attachment #193663 for bug #228467

View | Details | Raw Unified | Return to bug 228467
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	py-consul
PORTVERSION=	1.0.0
DISTVERSIONPREFIX=	v
CATEGORIES=	sysutils
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}

USES=	python:2.7-3.6+

USE_GITHUB=	yes
GH_ACCOUNT=	cablehead
GH_PROJECT=	python-consul

USE_PYTHON=	distutils autoplist flavors

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)freebsd-ports-new/sysutils/py-consul/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1507911738	1	TIMESTAMP = 1527173687
2	SHA256 (cablehead-python-consul-v0.7.2_GH0.tar.gz) = 5eea5ccb1983036a9a360786b95530c2955a88d35228d83f6af8965309a59c8f	2	SHA256 (cablehead-python-consul-v1.0.0_GH0.tar.gz) = b4f3f7e6d28f532e47d69e2cd28c90a66e743d4f1689f72f7dfea2c1557e4550
3	SIZE (cablehead-python-consul-v0.7.2_GH0.tar.gz) = 12960212	3	SIZE (cablehead-python-consul-v1.0.0_GH0.tar.gz) = 20830753




--- setup.py.orig	2018-05-17 20:20:19 UTC
+++ setup.py
@@ -20,16 +20,16 @@ requirements = [
 description = "Python client for Consul (http://www.consul.io/)"
 
 
+# Issue #123: skip installation of consul.aio if python version < 3.4.2
+# as this version or later is required by aiohttp
 py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')]
+if sys.version_info < (3, 4, 2):
+    if 'consul/aio' in py_modules:
+        py_modules.remove('consul/aio')
 
 
 class Install(install):
     def run(self):
-        # Issue #123: skip installation of consul.aio if python version < 3.4.2
-        # as this version or later is required by aiohttp
-        if sys.version_info < (3, 4, 2):
-            if 'consul/aio' in self.distribution.py_modules:
-                self.distribution.py_modules.remove('consul/aio')
         install.run(self)
 
 

Return to bug 228467

Lines 1-7 Link Here

(-)freebsd-ports-new/sysutils/py-consul/Makefile (-3 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= py-consul	3	PORTNAME= py-consul
4	PORTVERSION= 0.7.2	4	PORTVERSION= 1.0.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-27 Link Here
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}	17	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
18		18
19	USES= python:3.3+	19	USES= python:2.7-3.6+
20		20
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= cablehead	22	GH_ACCOUNT= cablehead
23	GH_PROJECT= python-consul	23	GH_PROJECT= python-consul
24		24
25	USE_PYTHON= distutils autoplist	25	USE_PYTHON= distutils autoplist flavors
26		26
27	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Line 0 Link Here

(-)freebsd-ports-new/sysutils/py-consul/files/patch-setup.py (+24 lines)
	1	--- setup.py.orig 2018-05-17 20:20:19 UTC
	2	+++ setup.py
	3	@@ -20,16 +20,16 @@ requirements = [
	4	description = "Python client for Consul (http://www.consul.io/)"
	5
	6
	7	+# Issue #123: skip installation of consul.aio if python version < 3.4.2
	8	+# as this version or later is required by aiohttp
	9	py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')]
	10	+if sys.version_info < (3, 4, 2):
	11	+ if 'consul/aio' in py_modules:
	12	+ py_modules.remove('consul/aio')
	13
	14
	15	class Install(install):
	16	def run(self):
	17	- # Issue #123: skip installation of consul.aio if python version < 3.4.2
	18	- # as this version or later is required by aiohttp
	19	- if sys.version_info < (3, 4, 2):
	20	- if 'consul/aio' in self.distribution.py_modules:
	21	- self.distribution.py_modules.remove('consul/aio')
	22	install.run(self)
	23
	24