Index | Thread | Search

From:
Klemens Nanni <kn@openbsd.org>
Subject:
Re: [update] security/wapiti: update to 3.2.0, new deps
To:
OpenBSD ports <ports@openbsd.org>, Remi Pointel <rpointel@openbsd.org>
Date:
Sat, 19 Oct 2024 18:56:25 +0000

Download raw body.

Thread
05.10.2024 00:51, Kirill A. Korinsky пишет:
> 
> ping
> 
> On Thu, 05 Sep 2024 01:25:36 +0200,
> Kirill A. Korinsky <kirill@korins.ky> wrote:
>>
>> ports@, Remi,

Still no maintainer response, I suggest we remove Remi as maintainer.

>>
>> Here an update of security/wapiti to the last version 3.2.0 from 3.0.1 which
>> was released in May of 2018.
>>
>> To this email I've attached new ports:
>>
>>     - databases/py-aiosqlite
>>     - devel/py-aiocache
>>     - devel/py-loguru
>>     - devel/py-prance
>>     - devel/py-structlog
>>     - misc/py-aiomcache
>>     - security/py-krb5
>>     - security/py-spnego
>>     - www/py-arsenic
>>     - www/py-browser-cookie3
>>     - www/py-httpx-ntlm

I "imported" those to openbsd-wip and committed my feedback there, in case that's
easier for other porter to review.

They look fine already;  Kirill, no need to resend them with the diff below, imho.

Anyone willing to OK those?

(Haven't looked at the wapiti diff itself yet.)


commit 7ca23481383b8e5ddef27e5a7f491db99d777a33
Author: Klemens Nanni <kn@openbsd.org>
Date:   Sat Oct 19 21:47:56 2024 +0300

    feedback from me
    
    - drop NO_TEST, use TEST_IS_INTERACTIVE where appropiate
    - use heimdal module
    - COMMENT nits
    - use TLS in HOMEPAGE
    - PKGNAME simplifications
    - sort deps

diff --git a/databases/py-aiosqlite/Makefile b/databases/py-aiosqlite/Makefile
index d22b8b73b..e5dc19953 100644
--- a/databases/py-aiosqlite/Makefile
+++ b/databases/py-aiosqlite/Makefile
@@ -20,7 +20,4 @@ FLAVOR =		python3
 MODPY_PI =		Yes
 MODPY_PYBUILD =		flit_core
 
-# tests not shipped as part of pypi's artifacts
-NO_TEST =		Yes
-
 .include <bsd.port.mk>
diff --git a/devel/py-aiocache/Makefile b/devel/py-aiocache/Makefile
index 4467b44d3..f54618c46 100644
--- a/devel/py-aiocache/Makefile
+++ b/devel/py-aiocache/Makefile
@@ -7,7 +7,7 @@ PKGNAME =		py-${DISTNAME}
 
 CATEGORIES =		devel
 
-HOMEPAGE =		http://aiocache.readthedocs.io/
+HOMEPAGE =		https://aiocache.readthedocs.io/
 
 # BSD
 PERMIT_PACKAGE =	Yes
@@ -30,6 +30,4 @@ TEST_DEPENDS =		devel/py-test-asyncio${MODPY_FLAVOR} \
 			devel/py-test-cov${MODPY_FLAVOR} \
 			devel/py-test-mock${MODPY_FLAVOR}
 
-#NO_TEST =		Yes
-
 .include <bsd.port.mk>
diff --git a/devel/py-loguru/Makefile b/devel/py-loguru/Makefile
index b1b905979..56d9002b0 100644
--- a/devel/py-loguru/Makefile
+++ b/devel/py-loguru/Makefile
@@ -23,8 +23,8 @@ MODPY_PYBUILD =		flit_core
 # test_await_complete_inheritance fails,
 # https://github.com/Delgan/loguru/issues/1196
 TEST_DEPENDS =		devel/py-colorama${MODPY_FLAVOR} \
-			devel/py-test-cov${MODPY_FLAVOR} \
 			devel/py-freezegun${MODPY_FLAVOR} \
-			devel/py-mypy${MODPY_FLAVOR}
+			devel/py-mypy${MODPY_FLAVOR} \
+			devel/py-test-cov${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-prance/Makefile b/devel/py-prance/Makefile
index afff9ab3b..d73b37259 100644
--- a/devel/py-prance/Makefile
+++ b/devel/py-prance/Makefile
@@ -1,4 +1,4 @@
-COMMENT =		resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser
+COMMENT =		resolving Swagger/OpenAPI 2.0 and 3.0 parser
 
 MODPY_EGG_VERSION =	23.6.21.0
 
@@ -20,15 +20,13 @@ FLAVOR =		python3
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools_scm
 
-# Dependencies
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
 			sysutils/py-packaging${MODPY_FLAVOR} \
 			textproc/py-chardet${MODPY_FLAVOR} \
 			textproc/py-ruamel.yaml${MODPY_FLAVOR} \
 			www/py-requests${MODPY_FLAVOR} \
 
-# tests need network access, and pypi artifact has missed
-# tests/OpenAPI-Specification, so some test fails
-NO_TEST =		Yes
+# partial failure due to tests/OpenAPI-Specification missing from pypi artifact
+TEST_IS_INTERACTIVE =	need network access
 
 .include <bsd.port.mk>
diff --git a/devel/py-structlog/Makefile b/devel/py-structlog/Makefile
index 0fdc6e5d2..4b11fd19c 100644
--- a/devel/py-structlog/Makefile
+++ b/devel/py-structlog/Makefile
@@ -23,8 +23,8 @@ MODPY_PYBUILD =		hatch-vcs
 BUILD_DEPENDS =		devel/py-hatch-fancy-pypi-readme${MODPY_FLAVOR}
 
 TEST_DEPENDS =		devel/py-freezegun${MODPY_FLAVOR} \
-			devel/py-test-asyncio${MODPY_FLAVOR} \
 			devel/py-pretend${MODPY_FLAVOR} \
-			devel/py-simplejson${MODPY_FLAVOR}
+			devel/py-simplejson${MODPY_FLAVOR} \
+			devel/py-test-asyncio${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/misc/py-aiomcache/Makefile b/misc/py-aiomcache/Makefile
index ed7a9f400..81da4d9e1 100644
--- a/misc/py-aiomcache/Makefile
+++ b/misc/py-aiomcache/Makefile
@@ -22,6 +22,4 @@ MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		misc/py-memcached${MODPY_FLAVOR}
 
-NO_TEST =		Yes
-
 .include <bsd.port.mk>
diff --git a/security/py-krb5/Makefile b/security/py-krb5/Makefile
index 2752f7d4f..8ca09f428 100644
--- a/security/py-krb5/Makefile
+++ b/security/py-krb5/Makefile
@@ -1,4 +1,4 @@
-COMMENT =		python krb5 API interface
+COMMENT =		krb5 API interface
 
 MODPY_EGG_VERSION =	0.6.0
 DISTNAME =		krb5-${MODPY_EGG_VERSION}
@@ -11,7 +11,8 @@ HOMEPAGE =		https://github.com/jborean93/pykrb5
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
+MODULES =		lang/python \
+			security/heimdal
 
 FLAVORS =		python3
 FLAVOR =		python3
@@ -21,11 +22,6 @@ MODPY_PYBUILD =		setuptools
 
 BUILD_DEPENDS =		lang/cython${MODPY_FLAVOR}
 
-LIB_DEPENDS =		security/heimdal,-libs
-
-MAKE_ENV =		KRB5_KRB5CONFIG=${LOCALBASE}/heimdal/bin/krb5-config
-
-# required missed k5test
-NO_TEST =		Yes
+# tests need missing k5test
 
 .include <bsd.port.mk>
diff --git a/security/py-spnego/Makefile b/security/py-spnego/Makefile
index 2c630e8eb..1ca1e9f0e 100644
--- a/security/py-spnego/Makefile
+++ b/security/py-spnego/Makefile
@@ -1,8 +1,8 @@
-COMMENT =		python SPNEGO authentication library
+COMMENT =		SPNEGO authentication library
 
 MODPY_EGG_VERSION =	0.11.1
 DISTNAME =		pyspnego-${MODPY_EGG_VERSION}
-PKGNAME =		py-spnego-${MODPY_EGG_VERSION}
+PKGNAME =		${DISTNAME:S/py/py-/}
 
 CATEGORIES =		security
 
@@ -27,6 +27,8 @@ TEST_DEPENDS =		devel/py-isort${MODPY_FLAVOR} \
 			devel/py-mypy${MODPY_FLAVOR} \
 			devel/py-test-mock${MODPY_FLAVOR} \
 			textproc/py-black${MODPY_FLAVOR} \
-			textproc/py-ruamel.yaml${MODPY_FLAVOR} \
+			textproc/py-ruamel.yaml${MODPY_FLAVOR}
+
+TEST_IS_INTERACTIVE =	test_auth.py takes ages to complete
 
 .include <bsd.port.mk>
diff --git a/www/py-arsenic/Makefile b/www/py-arsenic/Makefile
index 4291ba825..0025c11c0 100644
--- a/www/py-arsenic/Makefile
+++ b/www/py-arsenic/Makefile
@@ -24,7 +24,4 @@ RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-structlog${MODPY_FLAVOR} \
 			www/py-aiohttp${MODPY_FLAVOR}
 
-# pypi artifact hasn't got any tests
-NO_TEST =		Yes
-
 .include <bsd.port.mk>
diff --git a/www/py-browser-cookie3/Makefile b/www/py-browser-cookie3/Makefile
index cff637a14..93220bc18 100644
--- a/www/py-browser-cookie3/Makefile
+++ b/www/py-browser-cookie3/Makefile
@@ -22,9 +22,8 @@ MODPY_PYBUILD =		setuptools
 
 RUN_DEPENDS =		archivers/py-lz4${MODPY_FLAVOR} \
 			devel/py-jeepney${MODPY_FLAVOR} \
-			security/py-cryptodome${MODPY_FLAVOR} \
+			security/py-cryptodome${MODPY_FLAVOR}
 
-# Tests use selenium and webdriver_manager
-NO_TEST =		Yes
+TEST_IS_INTERACTIVE =	uses selenium and webdriver_manager
 
 .include <bsd.port.mk>
diff --git a/www/py-httpx-ntlm/Makefile b/www/py-httpx-ntlm/Makefile
index 0a9f62a8b..b6c2f74f1 100644
--- a/www/py-httpx-ntlm/Makefile
+++ b/www/py-httpx-ntlm/Makefile
@@ -2,7 +2,7 @@ COMMENT =		NTLM authentication support for HTTPX
 
 MODPY_EGG_VERSION =	1.4.0
 DISTNAME =		httpx_ntlm-${MODPY_EGG_VERSION}
-PKGNAME =		py-httpx-ntlm-${MODPY_EGG_VERSION}
+PKGNAME =		py-${DISTNAME:S/_/-/}
 
 CATEGORIES =		www