Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Oct 2021 13:45:13 GMT
From:      =?utf-8?Q?Vin=C3=ADcius Zavam?= <egypcio@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3c82ccaffa97 - main - net/py-sbws: update 1.1.0 to 1.3.0
Message-ID:  <202110311345.19VDjDYg027142@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by egypcio:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c82ccaffa97fe0c78c0ce36f6274e2329dbc995

commit 3c82ccaffa97fe0c78c0ce36f6274e2329dbc995
Author:     Vinícius Zavam <egypcio@FreeBSD.org>
AuthorDate: 2021-10-31 13:27:13 +0000
Commit:     Vinícius Zavam <egypcio@FreeBSD.org>
CommitDate: 2021-10-31 13:27:13 +0000

    net/py-sbws: update 1.1.0 to 1.3.0
    
        - python:3.5+ now became python:3.6+;
        - move away from USE_GITHUB, and use USE_GITLAB instead;
          -- Tor Project has its official GitLab instance;
          -- GL_SITE set to follow 'gitlab.torproject.org/tpo';
        - fixed RUN_DEPENDS to reflect updated version of sbws;
        - add TEST_DEPENDS dependencies to test source;
          -- do-test stage added accordingly;
        - apply 'shebangfix' to .sh scripts which need bash;
        - update LICENSE_FILE;
        - make sure we include a @sample config file now (sbws.ini).
    
      CHANGELOG
    
        * https://gitlab.torproject.org/tpo/network-health/sbws/-/blob/v1.3.0/CHANGELOG.rst
    
    Reported by:    Georg Koppen <gk % torproject.org>
    Sponsored by:   TorBSD Diversity Project (TDP)
    Sponsored by:   The Tor Project
---
 net/py-sbws/Makefile | 43 ++++++++++++++++++++++++++++++++++++-------
 net/py-sbws/distinfo |  6 +++---
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/net/py-sbws/Makefile b/net/py-sbws/Makefile
index 1490f3cd1540..35e1017305ef 100644
--- a/net/py-sbws/Makefile
+++ b/net/py-sbws/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		sbws
-PORTVERSION=		1.1.0
+PORTVERSION=		1.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=		net python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
@@ -8,25 +8,54 @@ MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Tor network bandwidth scanner
 
 LICENSE=	CC0-1.0
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 		# pysocks: indirect dependency via requests[socks]
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.8:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stem>=1.7.0:security/py-stem@${PY_FLAVOR} \
-		tor:security/tor
+		${PYTHON_PKGNAMEPREFIX}psutil>=5.5:sysutils/py-psutil@${PY_FLAVOR} \
+		tor:security/tor \
+		obfs4proxy:security/obfs4proxy-tor
 
-USES=		cpe python:3.5+ shebangfix
-USE_GITHUB=	yes
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8-docstrings>=0:devel/py-flake8-docstrings@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \
+		bash:shells/bash
+
+USES=		cpe python:3.6+ shebangfix
+USE_GITLAB=	yes
 USE_PYTHON=	autoplist distutils concurrent flavors
 
+PLIST_FILES=	"@sample ${PREFIX}/etc/sbws.ini.sample"
+
 CPE_VENDOR=	torproject
-GH_ACCOUNT=	torproject
+GL_SITE=	https://gitlab.torproject.org/tpo
+GL_ACCOUNT=	network-health
+GL_PROJECT=	sbws
+GL_COMMIT=	25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb
 
 SHEBANG_FILES=	setup.py \
 		scripts/tools/get-per-relay-budget.py \
 		scripts/tools/sbws-http-server.py \
 		scripts/tools/scale-v3bw-with-budget.py \
-		tests/integration/net/wait.py
+		tests/integration/stop_chutney.sh \
+		tests/integration/start_chutney.sh \
+		tests/integration/run.sh
+
+NO_ARCH=	yes
+
+do-test:
+	cd ${WRKSRC} && \
+	${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v
+
+post-install:
+	${INSTALL_DATA}	${WRKSRC}/docs/source/examples/sbws.example.ini \
+		${STAGEDIR}${PREFIX}/etc/sbws.ini.sample
 
 .include <bsd.port.mk>
diff --git a/net/py-sbws/distinfo b/net/py-sbws/distinfo
index ea53257a091f..bdee2f3e42ca 100644
--- a/net/py-sbws/distinfo
+++ b/net/py-sbws/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555083391
-SHA256 (torproject-sbws-v1.1.0_GH0.tar.gz) = 95ea0164e61dacec6c8758499f9c2194c0a3f907036c2a159e3234e1d5b3d1cf
-SIZE (torproject-sbws-v1.1.0_GH0.tar.gz) = 1186563
+TIMESTAMP = 1635670376
+SHA256 (network-health-sbws-25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb_GL0.tar.gz) = fdea5d6522dffe129f9f56f79d81dc7a680dc73e69ceb8a8fad3728fde1c3351
+SIZE (network-health-sbws-25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb_GL0.tar.gz) = 4640815



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110311345.19VDjDYg027142>