On Wed, Feb 26, 2020 at 11:02:32AM +0100, Bjorn Ketelaars wrote:
> On Wed 26/02/2020 10:15, Martin Reindl wrote:
> > Update py-daemon from 1.6 to 2.2.4:
> >
> > - move from python2 to python3-only (no consumers)
> > - take MAINTAINER
> > - ' =' vs '=' sanity in Makefile
> > - license changed to GPL-3/ASF-2
> > - adjust tests, needs py-testscenarios which I might send out at a later
> > point
> > 1 failed, 242 passed, 2 skipped, 1 warnings
> > - sending this out now so that any users can speak up if they need/want the
> > python2 variant
> > - extra adjustment in quirks not included in the diff
> >
> > Comments? OK?
> >
> > +CATEGORIES = sysutils
> >
> > -CATEGORIES= sysutils
>
> Maybe you could add HOMEPAGE=https://pagure.io/python-daemon/ ?
>
> > +BUILD_DEPENDS = www/py-requests${MODPY_FLAVOR} \
> > + textproc/py-docutils${MODPY_FLAVOR} \
> > + security/py-keyring${MODPY_FLAVOR}
>
>
> This update seems to need twine. I'm building with PORTS_PRIVSEP=Yes and
> I'm seeing the error below:
>
> distutils.errors.DistutilsError: Could not find suitable distribution for
> Requirement.parse('twine')
> Download error on https://pypi.org/simple/twine/: [Errno 65] No route to host
> -- Some packages may not be found!
> Couldn't find index page for 'twine' (maybe misspelled?)
>
> I glanced at the documentation of py-daemon and didn't find any
> mentioning of py-keyring. Why is this needed as BDEP?
Twine needs py-keyring. But twine is only needed for publishing to PyPI.
Fixed diff below plus patches/ and HOMEPAGE.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/Makefile,v
retrieving revision 1.553
diff -u -p -u -p -r1.553 Makefile
--- Makefile 17 Feb 2020 09:37:59 -0000 1.553
+++ Makefile 26 Feb 2020 10:27:17 -0000
@@ -246,7 +246,7 @@
SUBDIR += py-augeas,python3
SUBDIR += py-croniter
SUBDIR += py-croniter,python3
- SUBDIR += py-daemon
+ SUBDIR += py-daemon,python3
SUBDIR += py-daemonize
SUBDIR += py-daemonize,python3
SUBDIR += py-distro
Index: py-daemon/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/py-daemon/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- py-daemon/Makefile 2 Dec 2019 04:42:47 -0000 1.11
+++ py-daemon/Makefile 26 Feb 2020 10:27:17 -0000
@@ -1,30 +1,41 @@
# $OpenBSD: Makefile,v 1.11 2019/12/02 04:42:47 kmos Exp $
-COMMENT= library to implement a Unix daemon process
+COMMENT = library to implement a Unix daemon process
-MODPY_EGG_VERSION= 1.6
-DISTNAME= python-daemon-${MODPY_EGG_VERSION}
-PKGNAME= py-daemon-${MODPY_EGG_VERSION}
-REVISION= 3
+MODPY_EGG_VERSION = 2.2.4
+DISTNAME = python-daemon-${MODPY_EGG_VERSION}
+PKGNAME = py-daemon-${MODPY_EGG_VERSION}
+CATEGORIES = sysutils
-CATEGORIES= sysutils
+MAINTAINER = Martin Reindl <[email protected]>
+HOMEPAGE = https://pagure.io/python-daemon/
-# PSF-2+
+# GPL-3 and ASF-2
PERMIT_PACKAGE = Yes
+FLAVORS = python3
+FLAVOR = python3
+
+MODULES = lang/python
MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
-MODULES= lang/python
+BUILD_DEPENDS = www/py-requests${MODPY_FLAVOR} \
+ textproc/py-docutils${MODPY_FLAVOR}
-MODPY_SETUPTOOLS= Yes
-MODPY_PYTEST = Yes
+# XXX also needs py-testscenarios
+TEST_DEPENDS = sysutils/py-lockfile${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR} \
+# devel/py-testscenarios${MODPY_FLAVOR} \
+ devel/py-testtools${MODPY_FLAVOR}
-TEST_DEPENDS= devel/py-minimock \
- sysutils/py-lockfile
+DOCSDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}daemon
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-daemon/
- ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/doc/py-daemon/
+ ${INSTALL_DATA_DIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}
.include <bsd.port.mk>
Index: py-daemon/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/py-daemon/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-daemon/distinfo 18 Jan 2015 03:15:14 -0000 1.2
+++ py-daemon/distinfo 26 Feb 2020 10:27:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (python-daemon-1.6.tar.gz) =
FmX7Fr/q5y8Wqi3kC8dWYUWL1Ccxp9RjqRGo1er5bAs=
-SIZE (python-daemon-1.6.tar.gz) = 41564
+SHA256 (python-daemon-2.2.4.tar.gz) =
V8hPUKBNeCVRXk2/OjHHDMREFDlKcWCN7mz95GnoF2Y=
+SIZE (python-daemon-2.2.4.tar.gz) = 80775
Index: py-daemon/patches/patch-setup_py
===================================================================
RCS file: py-daemon/patches/patch-setup_py
diff -N py-daemon/patches/patch-setup_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ py-daemon/patches/patch-setup_py 26 Feb 2020 10:27:17 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -68,7 +68,6 @@ setup_kwargs = dict(
+ zip_safe=False,
+ setup_requires=[
+ "docutils",
+- "twine",
+ ],
+ test_suite="setup.test_suite",
+ tests_require=test_requirements,
Index: py-daemon/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/py-daemon/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- py-daemon/pkg/PLIST 12 Oct 2010 16:49:09 -0000 1.1.1.1
+++ py-daemon/pkg/PLIST 26 Feb 2020 10:27:17 -0000
@@ -1,18 +1,18 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/10/12 16:49:09 jasper Exp $
+@conflict py-daemon-*
+@pkgpath sysutils/py-daemon
lib/python${MODPY_VERSION}/site-packages/daemon/
lib/python${MODPY_VERSION}/site-packages/daemon/__init__.py
-lib/python${MODPY_VERSION}/site-packages/daemon/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}_metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}pidfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/daemon/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/daemon/_metadata.py
lib/python${MODPY_VERSION}/site-packages/daemon/daemon.py
-lib/python${MODPY_VERSION}/site-packages/daemon/daemon.pyc
lib/python${MODPY_VERSION}/site-packages/daemon/pidfile.py
-lib/python${MODPY_VERSION}/site-packages/daemon/pidfile.pyc
lib/python${MODPY_VERSION}/site-packages/daemon/runner.py
-lib/python${MODPY_VERSION}/site-packages/daemon/runner.pyc
-lib/python${MODPY_VERSION}/site-packages/daemon/version/
-lib/python${MODPY_VERSION}/site-packages/daemon/version/__init__.py
-lib/python${MODPY_VERSION}/site-packages/daemon/version/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/daemon/version/version_info.py
-lib/python${MODPY_VERSION}/site-packages/daemon/version/version_info.pyc
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -20,5 +20,5 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/python_daemon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-share/doc/py-daemon/
-share/doc/py-daemon/FAQ
+share/doc/${MODPY_PY_PREFIX}daemon/
+share/doc/${MODPY_PY_PREFIX}daemon/FAQ
