Klemens Nanni <k...@openbsd.org> writes:
> On Mon, Jul 06, 2020 at 10:44:15PM +0300, Timo Myyrä wrote:
>> And here's a hopefully a working diff:
> This one applies and "make test" started fine but then went bananas as
> tests require network; ${WRKDIR}/test.log is almost 50.000 lines long.
>
> Shouldn't we mention this in TEST_IS_INTERACTIVE?
>
> I have not run-tested this any further, but port-wise it looks fine to
> me. With that py-configargparse can be made py3 only :)
Ah, that explains the errors in tests. The integration tests download streams
from Yle archives to check that it works. I'm using the PORTS_PRIVSEP so network
access is blocked causing the test failures.
I run the tests as my local user and they passed.
Does this look good?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile 5 Jan 2020 23:22:48 -0000 1.26
+++ Makefile 7 Jul 2020 04:45:52 -0000
@@ -2,7 +2,7 @@
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
-GH_TAGNAME = 20191022
+GH_TAGNAME = 20200628
MODPY_EGG_VERSION = ${GH_TAGNAME}
COMMENT = download videos from YLE Areena
@@ -15,29 +15,25 @@ MAINTAINER = Timo Myyra <timo.myyra@bit
# GPLv3+
PERMIT_PACKAGE = Yes
-MODULES = lang/python \
- lang/php
+MODULES = lang/python
-TEST_ENV = HOME=/tmp
-
-RUN_DEPENDS = devel/py-attrs \
- devel/py-configargparse \
- devel/py-future \
- net/rtmpdump \
- security/py-cryptodome \
- www/py-requests \
- lang/php/${MODPHP_VERSION},-curl \
+MODPY_SETUPTOOLS= Yes
+MODPY_PYTEST= Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
+RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR} \
+ devel/py-configargparse${MODPY_FLAVOR} \
+ devel/py-future${MODPY_FLAVOR} \
+ graphics/ffmpeg \
+ www/py-requests${MODPY_FLAVOR} \
net/wget \
- textproc/py-lxml \
- converters/py-mini-amf
-TEST_DEPENDS = devel/py-test-runner
-
-MODPY_SETUPTOOLS = Yes
-MODPHP_BUILDDEP = No
-MODPY_PYTEST = Yes
-
-pre-configure:
- @sed -i -e "s,'php','${MODPHP_BIN}',g" ${WRKSRC}/yledl/io.py
- @sed -i -e "s,'pycryptodomex','pycryptodome',g" ${WRKSRC}/setup.py
+ textproc/py-lxml${MODPY_FLAVOR} \
+ converters/py-mini-amf${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR}
+
+# needs network access to download streams
+TEST_IS_INTERACTIVE= Yes
+TEST_ENV = HOME=/tmp
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo 1 Dec 2019 20:59:12 -0000 1.14
+++ distinfo 7 Jul 2020 04:45:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (yle-dl-20191022.tar.gz) = +WjwqHARpvt6I6hSmdBdADrc3Didj2/gk8TevhAumo4=
-SIZE (yle-dl-20191022.tar.gz) = 84694
+SHA256 (yle-dl-20200628.tar.gz) = S47xMLgLC8/pU9Vq72QPCSJ+bmRIYQTFO8j1r3lhXp8=
+SIZE (yle-dl-20200628.tar.gz) = 61748
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/yle-dl/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST 1 Dec 2019 20:59:12 -0000 1.8
+++ pkg/PLIST 7 Jul 2020 04:45:52 -0000
@@ -1,55 +1,51 @@
@comment $OpenBSD: PLIST,v 1.8 2019/12/01 20:59:12 fcambus Exp $
bin/yle-dl
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/yle_dl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/yle_dl-20200628-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/yledl/
-lib/python${MODPY_VERSION}/site-packages/yledl/AdobeHDS.php
lib/python${MODPY_VERSION}/site-packages/yledl/__init__.py
-lib/python${MODPY_VERSION}/site-packages/yledl/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}backends.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}downloader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}ffprobe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}geolocation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}kaltura.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}localization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamfilters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamflavor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}streamprobe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}subtitles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}timestamp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}titleformatter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yledl/${MODPY_PYCACHE}yledl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yledl/backends.py
-lib/python${MODPY_VERSION}/site-packages/yledl/backends.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/downloader.py
-lib/python${MODPY_VERSION}/site-packages/yledl/downloader.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/exitcodes.py
-lib/python${MODPY_VERSION}/site-packages/yledl/exitcodes.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/extractors.py
-lib/python${MODPY_VERSION}/site-packages/yledl/extractors.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/ffprobe.py
-lib/python${MODPY_VERSION}/site-packages/yledl/ffprobe.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/geolocation.py
-lib/python${MODPY_VERSION}/site-packages/yledl/geolocation.pyc
-lib/python${MODPY_VERSION}/site-packages/yledl/hds.py
-lib/python${MODPY_VERSION}/site-packages/yledl/hds.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/http.py
-lib/python${MODPY_VERSION}/site-packages/yledl/http.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/io.py
-lib/python${MODPY_VERSION}/site-packages/yledl/io.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.py
-lib/python${MODPY_VERSION}/site-packages/yledl/kaltura.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/localization.py
-lib/python${MODPY_VERSION}/site-packages/yledl/localization.pyc
-lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.py
-lib/python${MODPY_VERSION}/site-packages/yledl/rtmp.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.py
-lib/python${MODPY_VERSION}/site-packages/yledl/streamfilters.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.py
-lib/python${MODPY_VERSION}/site-packages/yledl/streamflavor.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/streamprobe.py
-lib/python${MODPY_VERSION}/site-packages/yledl/streamprobe.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/subtitles.py
-lib/python${MODPY_VERSION}/site-packages/yledl/subtitles.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.py
-lib/python${MODPY_VERSION}/site-packages/yledl/timestamp.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.py
-lib/python${MODPY_VERSION}/site-packages/yledl/titleformatter.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/utils.py
-lib/python${MODPY_VERSION}/site-packages/yledl/utils.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/version.py
-lib/python${MODPY_VERSION}/site-packages/yledl/version.pyc
lib/python${MODPY_VERSION}/site-packages/yledl/yledl.py
-lib/python${MODPY_VERSION}/site-packages/yledl/yledl.pyc
