On Thu, Jun 18, 2020 at 01:30:43AM -0400, Kurt Mosiejczuk wrote:
> On Fri, May 29, 2020 at 06:48:05AM +0200, Bjorn Ketelaars wrote:
> > > This updates net/py-cares to 3.1.1
> > > The biggest change is dropping Python 2.x support.
> > > None of the consumers were python2, so not a problem.
> > > I moved the tests to pytest.
> > > Tests pass except for a handful that don't seem to have anything to do
> > > with the changes.
> > > ok?
> > As you are dropping py2-support, is there a reason for not setting a
> > conflict- and pkgpath- marker in PLIST?
> I thought that was to migrate someone automatically to the newer version,
> which isn't necessarily what they would want. If they are using the python2
> version for some reason, installing the python3 version instead won't help
> them.
Here's a version with the conflict and pkgpath markers in PLIST.
ok?
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-cares/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 3 Jul 2020 21:13:00 -0000 1.13
+++ Makefile 7 Jul 2020 18:37:42 -0000
@@ -3,11 +3,10 @@
# using bundled c-ares which is patched for TTL support
COMMENT = python interface for c-ares
-MODPY_EGG_VERSION = 2.4.0
+MODPY_EGG_VERSION = 3.1.1
DISTNAME = pycares-${MODPY_EGG_VERSION}
PKGNAME = py-cares-${MODPY_EGG_VERSION}
CATEGORIES = net
-REVISION = 1
# MIT
PERMIT_PACKAGE = Yes
@@ -18,17 +17,16 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS = tests/tests.py
USE_GMAKE = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-cffi${MODPY_FLAVOR}
BUILD_DEPENDS = ${RUN_DEPENDS}
TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
-
-do-test:
- cd ${WRKSRC} && ${MODPY_BIN} tests/tests.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-cares/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 3 Jan 2019 14:20:57 -0000 1.6
+++ distinfo 7 Jul 2020 18:37:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (pycares-2.4.0.tar.gz) = Dsy3bf8BVd33k6WJxicOG9v2l1soJNGNHSPbIHXX/JY=
-SIZE (pycares-2.4.0.tar.gz) = 214021
+SHA256 (pycares-3.1.1.tar.gz) = GN/U/TAPVw1sRTbB2Ye3t2c7Kp0UNGWSxdbtcW3w0QQ=
+SIZE (pycares-3.1.1.tar.gz) = 233742
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-cares/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 12 Aug 2017 16:17:10 -0000 1.3
+++ pkg/PLIST 7 Jul 2020 18:37:42 -0000
@@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2017/08/12 16:17:10 danj Exp $
+@conflict net/py-cares-*
+@pkgpath net/py-cares
lib/python${MODPY_VERSION}/site-packages/pycares/
lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pycares/__init__.py
lib/python${MODPY_VERSION}/site-packages/pycares/__main__.py
@@ -12,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pycares/_core.so
+lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+@so lib/python${MODPY_VERSION}/site-packages/pycares/_cares.so
lib/python${MODPY_VERSION}/site-packages/pycares/_version.py
lib/python${MODPY_VERSION}/site-packages/pycares/errno.py
+lib/python${MODPY_VERSION}/site-packages/pycares/utils.py
