On Wed, 2 Nov 2016 15:51:24 +0000, Florian Obser <flor...@narrans.de>
wrote:
> What we currently have doesn't work after an api change.
> OK?
What about adding flavor to libs (Sagan and Cousteau) and switch tools
(Magellan) to py3?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 14 Mar 2016 09:33:52 -0000 1.3
+++ Makefile 2 Nov 2016 17:58:35 -0000
@@ -2,7 +2,7 @@
COMMENT = python bindings for the RIPE Atlas API
-MODPY_EGG_VERSION = 1.2
+MODPY_EGG_VERSION = 1.3
DISTNAME = ripe.atlas.cousteau-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -20,11 +20,18 @@ MODPY_SETUPTOOLS = Yes
MODULES = lang/python
-RUN_DEPENDS = devel/py-dateutil \
- net/py-socketio-client \
- www/py-requests
+FLAVORS = python3
+FLAVOR ?=
-# unported dep: pbr (also need py-functools32, py-jsonschema)
-NO_TEST = Yes
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
+ net/py-socketio-client${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR}
+
+TEST_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-coverage${MODPY_FLAVOR} \
+ devel/py-funcsigs${MODPY_FLAVOR} \
+ devel/py-jsonschema${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-nose${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 14 Mar 2016 09:33:52 -0000 1.3
+++ distinfo 2 Nov 2016 17:58:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.cousteau-1.2.tar.gz) = C07VFkePtqniJo3GjsqGcilh7EIJ+eVP43VkdlxWAl4=
-SIZE (ripe.atlas.cousteau-1.2.tar.gz) = 47015
+SHA256 (ripe.atlas.cousteau-1.3.tar.gz) = Jgw+/8CxEmnst/vV/eeQxR/56eEuv9yjyhaArk2a/X8=
+SIZE (ripe.atlas.cousteau-1.3.tar.gz) = 48301
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 14 Mar 2016 09:33:52 -0000 1.2
+++ pkg/PLIST 2 Nov 2016 17:58:35 -0000
@@ -6,26 +6,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_listing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_meta_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_listing.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_listing.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_meta_data.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_meta_data.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/measurement.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/measurement.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/request.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/request.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/source.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/source.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/stream.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/stream.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/version.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/version.pyc
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 14 Mar 2016 09:33:52 -0000 1.3
+++ Makefile 2 Nov 2016 17:46:28 -0000
@@ -2,7 +2,7 @@
COMMENT = python bindings for the RIPE Atlas API
-MODPY_EGG_VERSION = 1.2
+MODPY_EGG_VERSION = 1.3
DISTNAME = ripe.atlas.cousteau-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -20,11 +20,16 @@ MODPY_SETUPTOOLS = Yes
MODULES = lang/python
-RUN_DEPENDS = devel/py-dateutil \
- net/py-socketio-client \
- www/py-requests
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-# unported dep: pbr (also need py-functools32, py-jsonschema)
-NO_TEST = Yes
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
+ net/py-socketio-client${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
+ devel/py-funcsigs${MODPY_FLAVOR} \
+ devel/py-jsonschema${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-nose${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 14 Mar 2016 09:33:52 -0000 1.3
+++ distinfo 2 Nov 2016 17:46:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.cousteau-1.2.tar.gz) = C07VFkePtqniJo3GjsqGcilh7EIJ+eVP43VkdlxWAl4=
-SIZE (ripe.atlas.cousteau-1.2.tar.gz) = 47015
+SHA256 (ripe.atlas.cousteau-1.3.tar.gz) = Jgw+/8CxEmnst/vV/eeQxR/56eEuv9yjyhaArk2a/X8=
+SIZE (ripe.atlas.cousteau-1.3.tar.gz) = 48301
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.cousteau/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 14 Mar 2016 09:33:52 -0000 1.2
+++ pkg/PLIST 2 Nov 2016 17:46:28 -0000
@@ -6,26 +6,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_listing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}api_meta_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}measurement.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_listing.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_listing.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_meta_data.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/api_meta_data.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/measurement.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/measurement.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/request.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/request.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/source.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/source.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/stream.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/stream.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/version.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/version.pyc
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.sagan/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 14 Mar 2016 09:34:37 -0000 1.4
+++ Makefile 2 Nov 2016 18:05:48 -0000
@@ -2,7 +2,7 @@
COMMENT = parsing library for RIPE Atlas measurement results
-MODPY_EGG_VERSION = 1.1.10
+MODPY_EGG_VERSION = 1.1.11
DISTNAME = ripe.atlas.sagan-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -20,11 +20,14 @@ MODPY_SETUPTOOLS = Yes
MODULES = lang/python
-RUN_DEPENDS = devel/py-dateutil \
- devel/py-tz \
- net/py-IP \
- security/py-openssl
+FLAVORS = python3
+FLAVOR ?=
-TEST_DEPENDS = ${RUN_DEPENDS}
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
+ devel/py-tz${MODPY_FLAVOR} \
+ security/py-openssl${MODPY_FLAVOR}
+
+TEST_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-nose${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.sagan/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 14 Mar 2016 09:34:37 -0000 1.4
+++ distinfo 2 Nov 2016 18:05:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.sagan-1.1.10.tar.gz) = ODG/K8ZhiMV2Sz0LPA5Th7PWcNCog57UZKJExv/lKIs=
-SIZE (ripe.atlas.sagan-1.1.10.tar.gz) = 128425
+SHA256 (ripe.atlas.sagan-1.1.11.tar.gz) = tRxGS2708sygYhuxxKLGJrWK++nDLFKSxqt8jBtwXQg=
+SIZE (ripe.atlas.sagan-1.1.11.tar.gz) = 102136
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.sagan/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 14 Mar 2016 09:34:37 -0000 1.3
+++ pkg/PLIST 2 Nov 2016 18:05:48 -0000
@@ -11,27 +11,31 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/${MODPY_PYCACHE}wifi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/base.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/base.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/dns.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/dns.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}abuf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/abuf.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/abuf.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/compatibility.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/helpers/compatibility.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/http.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/http.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ntp.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ntp.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ping.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ping.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ssl.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ssl.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/traceroute.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/traceroute.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/version.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/version.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/wifi.py
