From owner-svn-ports-head@freebsd.org Tue Jan 8 08:16:52 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C467149441E; Tue, 8 Jan 2019 08:16:52 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C99CC7505A; Tue, 8 Jan 2019 08:16:51 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9304D24DBB; Tue, 8 Jan 2019 08:16:48 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x088GmW9014698; Tue, 8 Jan 2019 08:16:48 GMT (envelope-from jhixson@FreeBSD.org) Received: (from jhixson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x088Gm8e014696; Tue, 8 Jan 2019 08:16:48 GMT (envelope-from jhixson@FreeBSD.org) Message-Id: <201901080816.x088Gm8e014696@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhixson set sender to jhixson@FreeBSD.org using -f From: John Hixson Date: Tue, 8 Jan 2019 08:16:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489652 - in head/sysutils/py-consul: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhixson X-SVN-Commit-Paths: in head/sysutils/py-consul: . files X-SVN-Commit-Revision: 489652 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C99CC7505A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 08:16:52 -0000 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) + +