devel/py-fabric: Update to 2.5.0

Fabric 2 is not at 100% feature parity with 1.x! Some features have been
explicitly dropped, but others simply have not been ported over yet,
either due to time constraints or because said features need to be
re-examined in a modern context.

More information at:
https://www.fabfile.org/upgrading.html#upgrading
https://www.fabfile.org/upgrading.html#upgrade-specifics

Changelog:	https://www.fabfile.org/changelog.html

Reviewed by:	koobs (maintainer)
Approved by:	koobs (maintainer)
Differential Revision:	https://reviews.freebsd.org/D20683

UPDATING

@@ -5,6 +5,28 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190906:
+  AFFECTS: users of devel/py-fabric
+  AUTHOR: dbaio@FreeBSD.org
+
+  Fabric (devel/py-fabric) was upgraded to 2.5.0, Fabric (2+) represents
+  a near-total reimplementation and reorganization of the software.
+
+  Fabric 2 is not at 100% feature parity with 1.x! Some features have been
+  explicitly dropped, but others simply have not been ported over yet,
+  either due to time constraints or because said features need to be
+  re-examined in a modern context.
+
+  More information at:
+  https://www.fabfile.org/upgrading.html#upgrading
+  https://www.fabfile.org/upgrading.html#upgrade-specifics
+
+  If you would like to keep using 1.x, please run the following command to
+  update pkg database:
+
+    pkg set -n py27-fabric:py27-fabric1
+    pkg set -o devel/py-fabric:devel/py-fabric1
+
 20190830:
   AFFECTS: users of www/gitlab-ce
   AUTHOR: mfechner@FreeBSD.org

devel/py-fabric/Makefile

@@ -2,31 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	fabric
-PORTVERSION=	1.14.1
+PORTVERSION=	2.5.0
 PORTEPOCH=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Fabric-${DISTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Simple, Pythonic remote execution and deployment
+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}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=2.4:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}invoke>=1.1,<2.0:devel/py-invoke@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=1.1:security/py-cryptography@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.2.5:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-relaxed>0:devel/py-pytest-relaxed@${PY_FLAVOR}
 
-USES=		python:2.7
+USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}fabric1
+
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v \
-		--exclude=test_nested_execution_with_explicit_ports
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs \
+		-k 'not python_dash_m_acts_like_fab'
 
 .include <bsd.port.mk>

devel/py-fabric/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1554010618
-SHA256 (Fabric-1.14.1.tar.gz) = 66097883bb3e5beecacae92b82b2bd489d10a8fd4f06ce1cb27019de2e6d76a8
-SIZE (Fabric-1.14.1.tar.gz) = 220463
+TIMESTAMP = 1565561659
+SHA256 (fabric-2.5.0.tar.gz) = 24842d7d51556adcabd885ac3cf5e1df73fc622a1708bf3667bf5927576cdfa6
+SIZE (fabric-2.5.0.tar.gz) = 161421

devel/py-fabric/files/patch-setup.py

@@ -1,11 +0,0 @@
---- 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': [

devel/py-fabric/pkg-descr

@@ -1,10 +1,8 @@
-Fabric is a simple pythonic remote deployment tool.
+Fabric is a high level Python library designed to execute shell commands
+remotely over SSH, yielding useful Python objects in return.
 
-It is designed to upload files to, and run shell commands on, a number
-of servers in parallel or serially. These commands are grouped in tasks
-(regular python functions) and specified in a 'fabfile.'
-
-This is called remote automation, and the primary use case is deploying
-applications to multiple similar hosts.
+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