On Wed, 2 Nov 2016 19:54:17 +0100, Daniel Jakots <[email protected]>
wrote:
> On Wed, 2 Nov 2016 15:51:24 +0000, Florian Obser <[email protected]>
> 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?
Oops, Florian noticed I sent the wrong diff (PY3 was a try that I
finally discarded).
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.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
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.tools/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 14 Mar 2016 09:35:36 -0000 1.4
+++ Makefile 2 Nov 2016 18:49:34 -0000
@@ -2,7 +2,7 @@
COMMENT = official command-line client for RIPE Atlas
-MODPY_EGG_VERSION = 1.2.3
+MODPY_EGG_VERSION = 2.0.2
DISTNAME = ripe.atlas.tools-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -20,16 +20,23 @@ MODPY_SETUPTOOLS = Yes
MODULES = lang/python
-RUN_DEPENDS = devel/py-dateutil \
- devel/py-tzlocal \
- net/py-ripe.atlas.cousteau \
- net/py-ripe.atlas.sagan \
- security/py-openssl \
- textproc/py-yaml \
- www/py-requests
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-TEST_DEPENDS = ${RUN_DEPENDS}
-# runs into some problem with namespace, at least on py2.7
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
+ devel/py-tzlocal${MODPY_FLAVOR} \
+ net/py-IP${MODPY_FLAVOR} \
+ net/py-ripe.atlas.cousteau${MODPY_FLAVOR} \
+ net/py-ripe.atlas.sagan${MODPY_FLAVOR} \
+ security/py-openssl${MODPY_FLAVOR} \
+ textproc/py-yaml${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR}
+
+TEST_DEPENDS = ${RUN_DEPENDS} \
+ devel/py-coverage${MODPY_FLAVOR} \
+ devel/py-mock${MODPY_FLAVOR} \
+ devel/py-nose${MODPY_FLAVOR}
+
+# runs into some problem with namespace
NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.tools/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 14 Mar 2016 09:35:36 -0000 1.4
+++ distinfo 2 Nov 2016 18:49:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (ripe.atlas.tools-1.2.3.tar.gz) = +pN5ZiN4n7zC7WUSl6cE2k0yObXu0T1je6E2HvzOzBw=
-SIZE (ripe.atlas.tools-1.2.3.tar.gz) = 86364
+SHA256 (ripe.atlas.tools-2.0.2.tar.gz) = pqRvuFy0Dw9WRN899REMvcA5SyePKJy+ZGLLsQ7aDXg=
+SIZE (ripe.atlas.tools-2.0.2.tar.gz) = 96447
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-ripe.atlas.tools/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 20 Jan 2016 09:25:42 -0000 1.2
+++ pkg/PLIST 2 Nov 2016 18:49:34 -0000
@@ -12,104 +12,114 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
-lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/ripe.atlas.tools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}ipdetails.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}streaming.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/base.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/aggregators/base.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/cache.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/cache.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}alias.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}configure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}go.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}measurement_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}probe_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}report.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}shibboleet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/alias.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/base.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/base.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/configure.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/configure.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/go.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/go.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/base.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/base.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/dns.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/dns.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/http.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/http.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/ntp.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/ntp.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/ping.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/ping.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/sslcert.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/sslcert.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/traceroute.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measure/traceroute.pyc
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurement.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurement.pyc
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurements.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurements.pyc
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probe.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probe.pyc
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probes.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probes.pyc
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/render.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/render.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurement_info.py
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/measurement_search.py
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probe_info.py
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/probe_search.py
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/report.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/report.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/shibboleet.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/shibboleet.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/stream.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/commands/stream.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/filters.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/filters.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}colours.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}rendering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}sanitisers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/colours.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/colours.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/rendering.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/rendering.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/sanitisers.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/sanitisers.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/validators.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/helpers/validators.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/ipdetails.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/ipdetails.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/probes/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/probes/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/probes/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/probes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/probes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}aggregate_ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}dst_asn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ntp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}ssl_consistency.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}sslcert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/${MODPY_PYCACHE}traceroute_aspath.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/aggregate_ping.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/aggregate_ping.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/base.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/base.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dns.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dns.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dst_asn.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/dst_asn.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/http.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/http.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ntp.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ntp.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ping.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ping.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/raw.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/raw.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ssl_consistency.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/ssl_consistency.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/sslcert.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/sslcert.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/templates/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/templates/reports/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/templates/reports/aggregate_ping.txt
@@ -117,16 +127,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/templates/reports/ssl_consistency.txt
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/templates/reports/sslcert.txt
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/traceroute.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/traceroute.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/traceroute_aspath.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/renderers/traceroute_aspath.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/templates/
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/settings/templates/base.yaml
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/streaming.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/streaming.pyc
lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/version.py
-lib/python${MODPY_VERSION}/site-packages/ripe/atlas/tools/version.pyc
share/doc/pkg-readmes/${FULLPKGNAME}
