svn commit: r489652 - in head/sysutils/py-consul: . files

[John Hixson]

Author: jhixson
Date: Tue Jan  8 08:16:47 2019
New Revision: 489652
URL: https://svnweb.freebsd.org/changeset/ports/489652

Log:
  sysutils/py-consul: allow python 2.7 to be used
  
  PR:		228284
  Approved by:	araujo (mentor)
  Differential Revision:	https://reviews.freebsd.org/D18781

Added:
  head/sysutils/py-consul/files/
  head/sysutils/py-consul/files/patch-setup.py   (contents, props changed)
Modified:
  head/sysutils/py-consul/Makefile

Modified: head/sysutils/py-consul/Makefile
==============================================================================
--- head/sysutils/py-consul/Makefile	Tue Jan  8 08:16:40 2019	(r489651)
+++ head/sysutils/py-consul/Makefile	Tue Jan  8 08:16:47 2019	(r489652)
@@ -3,6 +3,7 @@
 PORTNAME=	consul
 PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/consul:sysutils/consul \
 				${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
 
-USES=	python:3.6+
+USES=	python:2.7-3.6+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cablehead

Added: head/sysutils/py-consul/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-consul/files/patch-setup.py	Tue Jan  8 08:16:47 2019	(r489652)
@@ -0,0 +1,23 @@
+--- setup.py.orig	2018-07-09 03:59:48 UTC
++++ setup.py
+@@ -22,14 +22,15 @@ description = "Python client for Consul (http://www.co
+ 
+ py_modules = [os.path.splitext(x)[0] for x in glob.glob('consul/*.py')]
+ 
++# 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 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)
+ 
+