diff --git a/devel/Makefile b/devel/Makefile index 40815a1ef922..63fcc6a9042f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4396,6 +4396,7 @@ SUBDIR += py-extremes SUBDIR += py-ezpyinline SUBDIR += py-fabric + SUBDIR += py-fabric1 SUBDIR += py-fabric3 SUBDIR += py-fam SUBDIR += py-fastcache diff --git a/devel/py-cuisine/Makefile b/devel/py-cuisine/Makefile index 162e0b93f40c..5c6b1195f514 100644 --- a/devel/py-cuisine/Makefile +++ b/devel/py-cuisine/Makefile @@ -2,6 +2,7 @@ PORTNAME= cuisine PORTVERSION= 0.7.13 +PORTREVISION= 1 #PORTEPOCH= 0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP @@ -12,7 +13,7 @@ COMMENT= Chef-like functionality for Fabric LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric1>=1.7,1:devel/py-fabric1@${PY_FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist diff --git a/devel/py-fabric1/Makefile b/devel/py-fabric1/Makefile new file mode 100644 index 000000000000..2fef03c0db83 --- /dev/null +++ b/devel/py-fabric1/Makefile @@ -0,0 +1,35 @@ +# Created by: Yi-Jheng Lin +# $FreeBSD$ + +PORTNAME= fabric +PORTVERSION= 1.14.1 +PORTEPOCH= 1 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 1 +DISTNAME= Fabric-${DISTVERSION} + +MAINTAINER= koobs@FreeBSD.org +COMMENT= High level SSH command execution + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${PY_FLAVOR} # <3.0 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} + +USES= python:2.7 +USE_PYTHON= distutils concurrent autoplist + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fabric + +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \ + --exclude=test_nested_execution_with_explicit_ports + +.include diff --git a/devel/py-fabric1/distinfo b/devel/py-fabric1/distinfo new file mode 100644 index 000000000000..da201a341357 --- /dev/null +++ b/devel/py-fabric1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1554010618 +SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8 +SIZE (Fabric-1.14.1.tar.gz) = 220463 diff --git a/devel/py-fabric1/files/patch-setup.py b/devel/py-fabric1/files/patch-setup.py new file mode 100644 index 000000000000..faaa912c16e5 --- /dev/null +++ b/devel/py-fabric1/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2016-05-08 21:11:49 UTC ++++ setup.py +@@ -45,7 +45,7 @@ setup( + url='http://fabfile.org', + packages=find_packages(), + test_suite='nose.collector', +- tests_require=['nose<2.0', 'fudge<1.0', 'jinja2<3.0'], ++ tests_require=['nose', 'fudge', 'jinja2'], + install_requires=install_requires, + entry_points={ + 'console_scripts': [ diff --git a/devel/py-fabric1/pkg-descr b/devel/py-fabric1/pkg-descr new file mode 100644 index 000000000000..c61d1414070f --- /dev/null +++ b/devel/py-fabric1/pkg-descr @@ -0,0 +1,8 @@ +Fabric is a high level Python library designed to execute shell commands +remotely over SSH, yielding useful Python objects in return. + +It builds on top of Invoke (subprocess command execution and command-line +features) and Paramiko (SSH protocol implementation), extending their APIs +to complement one another and provide additional functionality. + +WWW: https://www.fabfile.org diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile index 8823ed47d85f..25a4f999ce71 100644 --- a/sysutils/py-ezjailremote/Makefile +++ b/sysutils/py-ezjailremote/Makefile @@ -3,7 +3,7 @@ PORTNAME= ezjailremote PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,13 +13,15 @@ COMMENT= Remote control and convenience wrapper for ezjail LICENSE= BSD2CLAUSE RUN_DEPENDS= ezjail-admin:sysutils/ezjail \ - ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}fabric1>0:devel/py-fabric1@${PY_FLAVOR} + +USES= python:2.7 +USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= tomster GH_PROJECT= ezjail-remote -USES= python:2.7 -USE_PYTHON= distutils autoplist +NO_ARCH= yes .include diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile index da8846515f7e..bf36305fc447 100644 --- a/sysutils/py-ploy_fabric/Makefile +++ b/sysutils/py-ploy_fabric/Makefile @@ -3,6 +3,7 @@ PORTNAME= ploy_fabric DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,9 +15,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}fabric1>=1.4.0,1:devel/py-fabric1@${PY_FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils +NO_ARCH= yes + .include