CVS commit: pkgsrc/net/py-sbws

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/py-sbws
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 17 Feb 2026 14:45:55 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 17 14:45:55 UTC 2026

Modified Files:
        pkgsrc/net/py-sbws: Makefile PLIST distinfo

Log Message:
py-sbws: update to 2.2.0.

7 years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-sbws/Makefile \
    pkgsrc/net/py-sbws/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-sbws/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-sbws/Makefile
diff -u pkgsrc/net/py-sbws/Makefile:1.3 pkgsrc/net/py-sbws/Makefile:1.4
--- pkgsrc/net/py-sbws/Makefile:1.3     Mon Jan 10 08:01:01 2022
+++ pkgsrc/net/py-sbws/Makefile Tue Feb 17 14:45:55 2026
@@ -1,51 +1,46 @@
-# $NetBSD: Makefile,v 1.3 2022/01/10 08:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2026/02/17 14:45:55 wiz Exp $
 
-DISTNAME=      sbws-0.8.0
+DISTNAME=      sbws-2.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=torproject/}
-GITHUB_PROJECT=        sbws
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+MASTER_SITES=  https://gitlab.torproject.org/tpo/network-health/sbws/-/archive/v${PKGVERSION_NOREV}/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://sbws.readthedocs.io/
+HOMEPAGE=      https://tpo.pages.torproject.net/network-health/sbws/
 COMMENT=       Tor simple bandwidth scanner
 LICENSE=       cc0-1.0-universal
 
-USE_LANGUAGES= # none
-
-# Python 3 only.
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
-DEPENDS+=      ${PYPKGPREFIX}-stem>=1.7.0:../../devel/py-stem
-
-TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
-TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
+DEPENDS+=      ${PYPKGPREFIX}-stem>=1.8.0:../../devel/py-stem
+DEPENDS+=      ${PYPKGPREFIX}-psutil>=7.0:../../sysutils/py-psutil
+DEPENDS+=      ${PYPKGPREFIX}-versioneer>=0:../../devel/py-versioneer
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
-TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
-TEST_DEPENDS+= bash>=4.0:../../shells/bash
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
+TEST_DEPENDS+= ${PYPKGPREFIX}-time-machine-[0-9]*:../../time/py-time-machine
+
+WRKSRC=                ${WRKDIR}/sbws-v2.2.0-df4c6e9138ca5cbca054e5684e6b580ad1b95dc5
+
+USE_LANGUAGES= # none
+USE_TOOLS+=    bash:test
 
 REPLACE_BASH+= scripts/maint/update-authors
 REPLACE_BASH+= scripts/maint/update-website
 REPLACE_BASH+= scripts/tools/osx-extra-loopback.sh
-REPLACE_BASH+= tests/testnets/run-network.sh
-REPLACE_BASH+= tests/testnets/simple.common/01-gen-configs.sh
-REPLACE_BASH+= tests/testnets/simple.common/02-start-network.sh
-REPLACE_BASH+= tests/testnets/simple.common/04-stop-network.sh
 
 REPLACE_PYTHON+=       scripts/tools/get-per-relay-budget.py
-REPLACE_PYTHON+=       scripts/tools/sbws-http-server.py
 REPLACE_PYTHON+=       scripts/tools/scale-v3bw-with-budget.py
-REPLACE_PYTHON+=       setup.py
-REPLACE_PYTHON+=       tests/testnets/simple.common/03-network-in-ready-state.py
 
 # XXX Should run the integration tests too, but it's a bit more
 # involved.
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} -s tests/unit -vv
 
+# https://gitlab.torproject.org/tpo/network-health/sbws/-/issues/40247
+post-install:
+       ${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/tests
+
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-sbws/distinfo
diff -u pkgsrc/net/py-sbws/distinfo:1.3 pkgsrc/net/py-sbws/distinfo:1.4
--- pkgsrc/net/py-sbws/distinfo:1.3     Tue Oct 26 11:06:43 2021
+++ pkgsrc/net/py-sbws/distinfo Tue Feb 17 14:45:55 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:06:43 nia Exp $
+$NetBSD: distinfo,v 1.4 2026/02/17 14:45:55 wiz Exp $
 
-BLAKE2s (sbws-0.8.0.tar.gz) = 61c20b146fa1bb22624b1dd00eb59798ddc9dfe9da76648c6d28ede42ced548c
-SHA512 (sbws-0.8.0.tar.gz) = 6af24a4aa3a756b5d9a7b3aba99339a1739f04f6ae8f4af9ad15cf16bcba9d5d416a6c3a37e85cb11f5f36bbc40753fcfbdf2af5858a9ae295e3d0a0eb368d5d
-Size (sbws-0.8.0.tar.gz) = 156048 bytes
+BLAKE2s (sbws-2.2.0.tar.bz2) = 144d8eb2bb33515fbf6560e08b9b1c9d86fc052058e16a0f5d90062d298bf3a8
+SHA512 (sbws-2.2.0.tar.bz2) = 8b0c81a540c8c6f5e96d782921d78cec240696e8d385b1d28124674cb911c1d86471fcaddb4af94fec057487a28c87e4e8f42a6c48678a1656b4a7ae697d6059
+Size (sbws-2.2.0.tar.bz2) = 4137765 bytes

Index: pkgsrc/net/py-sbws/PLIST
diff -u pkgsrc/net/py-sbws/PLIST:1.2 pkgsrc/net/py-sbws/PLIST:1.3
--- pkgsrc/net/py-sbws/PLIST:1.2        Mon Jan 10 08:01:01 2022
+++ pkgsrc/net/py-sbws/PLIST    Tue Feb 17 14:45:55 2026
@@ -1,23 +1,31 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/10 08:01:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/02/17 14:45:55 wiz Exp $
 bin/sbws
-examples/config.example.ini
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE.rst
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/sbws/__init__.py
 ${PYSITELIB}/sbws/__init__.pyc
 ${PYSITELIB}/sbws/__init__.pyo
+${PYSITELIB}/sbws/_version.py
+${PYSITELIB}/sbws/_version.pyc
+${PYSITELIB}/sbws/_version.pyo
 ${PYSITELIB}/sbws/config.default.ini
 ${PYSITELIB}/sbws/config.log.default.ini
 ${PYSITELIB}/sbws/core/__init__.py
 ${PYSITELIB}/sbws/core/__init__.pyc
 ${PYSITELIB}/sbws/core/__init__.pyo
+${PYSITELIB}/sbws/core/bwfile_health.py
+${PYSITELIB}/sbws/core/bwfile_health.pyc
+${PYSITELIB}/sbws/core/bwfile_health.pyo
 ${PYSITELIB}/sbws/core/cleanup.py
 ${PYSITELIB}/sbws/core/cleanup.pyc
 ${PYSITELIB}/sbws/core/cleanup.pyo
+${PYSITELIB}/sbws/core/flowctrl2.py
+${PYSITELIB}/sbws/core/flowctrl2.pyc
+${PYSITELIB}/sbws/core/flowctrl2.pyo
 ${PYSITELIB}/sbws/core/generate.py
 ${PYSITELIB}/sbws/core/generate.pyc
 ${PYSITELIB}/sbws/core/generate.pyo
@@ -33,12 +41,18 @@ ${PYSITELIB}/sbws/globals.pyo
 ${PYSITELIB}/sbws/lib/__init__.py
 ${PYSITELIB}/sbws/lib/__init__.pyc
 ${PYSITELIB}/sbws/lib/__init__.pyo
+${PYSITELIB}/sbws/lib/bwfile_health.py
+${PYSITELIB}/sbws/lib/bwfile_health.pyc
+${PYSITELIB}/sbws/lib/bwfile_health.pyo
 ${PYSITELIB}/sbws/lib/circuitbuilder.py
 ${PYSITELIB}/sbws/lib/circuitbuilder.pyc
 ${PYSITELIB}/sbws/lib/circuitbuilder.pyo
 ${PYSITELIB}/sbws/lib/destination.py
 ${PYSITELIB}/sbws/lib/destination.pyc
 ${PYSITELIB}/sbws/lib/destination.pyo
+${PYSITELIB}/sbws/lib/heartbeat.py
+${PYSITELIB}/sbws/lib/heartbeat.pyc
+${PYSITELIB}/sbws/lib/heartbeat.pyo
 ${PYSITELIB}/sbws/lib/relaylist.py
 ${PYSITELIB}/sbws/lib/relaylist.pyc
 ${PYSITELIB}/sbws/lib/relaylist.pyo
@@ -48,6 +62,9 @@ ${PYSITELIB}/sbws/lib/relayprioritizer.p
 ${PYSITELIB}/sbws/lib/resultdump.py
 ${PYSITELIB}/sbws/lib/resultdump.pyc
 ${PYSITELIB}/sbws/lib/resultdump.pyo
+${PYSITELIB}/sbws/lib/scaling.py
+${PYSITELIB}/sbws/lib/scaling.pyc
+${PYSITELIB}/sbws/lib/scaling.pyo
 ${PYSITELIB}/sbws/lib/v3bwfile.py
 ${PYSITELIB}/sbws/lib/v3bwfile.pyc
 ${PYSITELIB}/sbws/lib/v3bwfile.pyo
@@ -66,6 +83,15 @@ ${PYSITELIB}/sbws/util/filelock.pyo
 ${PYSITELIB}/sbws/util/fs.py
 ${PYSITELIB}/sbws/util/fs.pyc
 ${PYSITELIB}/sbws/util/fs.pyo
+${PYSITELIB}/sbws/util/iso3166.py
+${PYSITELIB}/sbws/util/iso3166.pyc
+${PYSITELIB}/sbws/util/iso3166.pyo
+${PYSITELIB}/sbws/util/json.py
+${PYSITELIB}/sbws/util/json.pyc
+${PYSITELIB}/sbws/util/json.pyo
+${PYSITELIB}/sbws/util/loghandler.py
+${PYSITELIB}/sbws/util/loghandler.pyc
+${PYSITELIB}/sbws/util/loghandler.pyo
 ${PYSITELIB}/sbws/util/parser.py
 ${PYSITELIB}/sbws/util/parser.pyc
 ${PYSITELIB}/sbws/util/parser.pyo
@@ -81,93 +107,12 @@ ${PYSITELIB}/sbws/util/stem.pyo
 ${PYSITELIB}/sbws/util/timestamp.py
 ${PYSITELIB}/sbws/util/timestamp.pyc
 ${PYSITELIB}/sbws/util/timestamp.pyo
-${PYSITELIB}/sbws/util/userquery.py
-${PYSITELIB}/sbws/util/userquery.pyc
-${PYSITELIB}/sbws/util/userquery.pyo
-${PYSITELIB}/tests/__init__.py
-${PYSITELIB}/tests/__init__.pyc
-${PYSITELIB}/tests/__init__.pyo
-${PYSITELIB}/tests/conftest.py
-${PYSITELIB}/tests/conftest.pyc
-${PYSITELIB}/tests/conftest.pyo
-${PYSITELIB}/tests/integration/__init__.py
-${PYSITELIB}/tests/integration/__init__.pyc
-${PYSITELIB}/tests/integration/__init__.pyo
-${PYSITELIB}/tests/integration/conftest.py
-${PYSITELIB}/tests/integration/conftest.pyc
-${PYSITELIB}/tests/integration/conftest.pyo
-${PYSITELIB}/tests/integration/core/test_scanner.py
-${PYSITELIB}/tests/integration/core/test_scanner.pyc
-${PYSITELIB}/tests/integration/core/test_scanner.pyo
-${PYSITELIB}/tests/integration/lib/test_relaylist.py
-${PYSITELIB}/tests/integration/lib/test_relaylist.pyc
-${PYSITELIB}/tests/integration/lib/test_relaylist.pyo
-${PYSITELIB}/tests/integration/lib/test_relayprioritizer.py
-${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyc
-${PYSITELIB}/tests/integration/lib/test_relayprioritizer.pyo
-${PYSITELIB}/tests/integration/net.tar
-${PYSITELIB}/tests/integration/util/__init__.py
-${PYSITELIB}/tests/integration/util/__init__.pyc
-${PYSITELIB}/tests/integration/util/__init__.pyo
-${PYSITELIB}/tests/integration/util/test_stem.py
-${PYSITELIB}/tests/integration/util/test_stem.pyc
-${PYSITELIB}/tests/integration/util/test_stem.pyo
-${PYSITELIB}/tests/testnets/.gitignore
-${PYSITELIB}/tests/testnets/run-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/.net
-${PYSITELIB}/tests/testnets/simple-ipv4/00-common.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/01-gen-configs.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/02-start-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.pyc
-${PYSITELIB}/tests/testnets/simple-ipv4/03-network-in-ready-state.pyo
-${PYSITELIB}/tests/testnets/simple-ipv4/04-stop-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv4/html/alphabet.txt
-${PYSITELIB}/tests/testnets/simple-ipv6/.net
-${PYSITELIB}/tests/testnets/simple-ipv6/00-common.sh
-${PYSITELIB}/tests/testnets/simple-ipv6/01-gen-configs.sh
-${PYSITELIB}/tests/testnets/simple-ipv6/02-start-network.sh
-${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.pyc
-${PYSITELIB}/tests/testnets/simple-ipv6/03-network-in-ready-state.pyo
-${PYSITELIB}/tests/testnets/simple-ipv6/04-stop-network.sh
-${PYSITELIB}/tests/testnets/simple.common/01-gen-configs.sh
-${PYSITELIB}/tests/testnets/simple.common/02-start-network.sh
-${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.py
-${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.pyc
-${PYSITELIB}/tests/testnets/simple.common/03-network-in-ready-state.pyo
-${PYSITELIB}/tests/testnets/simple.common/04-stop-network.sh
-${PYSITELIB}/tests/unit/__init__.py
-${PYSITELIB}/tests/unit/__init__.pyc
-${PYSITELIB}/tests/unit/__init__.pyo
-${PYSITELIB}/tests/unit/conftest.py
-${PYSITELIB}/tests/unit/conftest.pyc
-${PYSITELIB}/tests/unit/conftest.pyo
-${PYSITELIB}/tests/unit/core/test_stats.py
-${PYSITELIB}/tests/unit/core/test_stats.pyc
-${PYSITELIB}/tests/unit/core/test_stats.pyo
-${PYSITELIB}/tests/unit/globals.py
-${PYSITELIB}/tests/unit/globals.pyc
-${PYSITELIB}/tests/unit/globals.pyo
-${PYSITELIB}/tests/unit/lib/data/results.txt
-${PYSITELIB}/tests/unit/lib/test_resultdump.py
-${PYSITELIB}/tests/unit/lib/test_resultdump.pyc
-${PYSITELIB}/tests/unit/lib/test_resultdump.pyo
-${PYSITELIB}/tests/unit/lib/test_results.py
-${PYSITELIB}/tests/unit/lib/test_results.pyc
-${PYSITELIB}/tests/unit/lib/test_results.pyo
-${PYSITELIB}/tests/unit/lib/test_v3bwfile.py
-${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyc
-${PYSITELIB}/tests/unit/lib/test_v3bwfile.pyo
-${PYSITELIB}/tests/unit/util/test_config.py
-${PYSITELIB}/tests/unit/util/test_config.pyc
-${PYSITELIB}/tests/unit/util/test_config.pyo
-${PYSITELIB}/tests/unit/util/test_state.py
-${PYSITELIB}/tests/unit/util/test_state.pyc
-${PYSITELIB}/tests/unit/util/test_state.pyo
-${PYSITELIB}/tests/unit/util/test_timestamp.py
-${PYSITELIB}/tests/unit/util/test_timestamp.pyc
-${PYSITELIB}/tests/unit/util/test_timestamp.pyo
-${PYSITELIB}/tests/unit/util/test_userquery.py
-${PYSITELIB}/tests/unit/util/test_userquery.pyc
-${PYSITELIB}/tests/unit/util/test_userquery.pyo
+${PYSITELIB}/sbws/util/timestamps.py
+${PYSITELIB}/sbws/util/timestamps.pyc
+${PYSITELIB}/sbws/util/timestamps.pyo
+${PYSITELIB}/webclient/__init__.py
+${PYSITELIB}/webclient/__init__.pyc
+${PYSITELIB}/webclient/__init__.pyo
+${PYSITELIB}/webclient/bytesgen.py
+${PYSITELIB}/webclient/bytesgen.pyc
+${PYSITELIB}/webclient/bytesgen.pyo

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index