diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 9e6e3ba19d61..9009d0d8ccb8 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= html2text -PORTVERSION= 2018.1.9 -PORTREVISION= 2 +PORTVERSION= 2020.1.16 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,15 +13,16 @@ COMMENT= Convert HTML into clean plain ASCII text LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -CONFLICTS= html2text +CONFLICTS_INSTALL= html2text py*-html2text2018 do-test: - @cd ${WRKSRC} && coverage run --source=html2text setup.py test -v + @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest --cov=html2text .include diff --git a/textproc/py-html2text/distinfo b/textproc/py-html2text/distinfo index c86459ac5332..4a6a192b210b 100644 --- a/textproc/py-html2text/distinfo +++ b/textproc/py-html2text/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515708173 -SHA256 (html2text-2018.1.9.tar.gz) = 627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4 -SIZE (html2text-2018.1.9.tar.gz) = 52211 +TIMESTAMP = 1579470104 +SHA256 (html2text-2020.1.16.tar.gz) = e296318e16b059ddb97f7a8a1d6a5c1d7af4544049a01e261731d2d5cc277bbb +SIZE (html2text-2020.1.16.tar.gz) = 49464 diff --git a/www/py-weboob/Makefile b/www/py-weboob/Makefile index 587b36f78923..1e121488953e 100644 --- a/www/py-weboob/Makefile +++ b/www/py-weboob/Makefile @@ -2,6 +2,7 @@ PORTNAME= weboob PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -30,10 +31,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ wget:ftp/wget \ gpg2:security/gnupg -py27_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>0:www/py-mechanize@${PY_FLAVOR} -py27_RUN_DEPENDS:= ${py27_BUILD_DEPENDS} - -USES= python +USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes