From 255bdb55bb37db32363eb4b7eb01e5dc9cbb0a67 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 24 Jul 2017 16:44:31 +0000 Subject: [PATCH] 2.0.1: - Update mando dependency 2.0.1: - Fix bug in the error message of Flake8's plugin 2.0.0: - Add ``--sort`` option to ``mi`` command - Add comment stats summary when using the ``-s, --summary`` option of the ``raw`` command - Fix encoding bug - Fix raw metrics (ensure that LOC = SLOC + Multi + Single Comments + Blank) - Python 2.6 is not supported anymore --- devel/py-radon/Makefile | 15 +++++++-------- devel/py-radon/distinfo | 12 +++++------- devel/py-radon/patches/patch-requirements.txt | 13 ------------- devel/py-radon/patches/patch-setup.py | 18 ------------------ 4 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 devel/py-radon/patches/patch-requirements.txt delete mode 100644 devel/py-radon/patches/patch-setup.py diff --git a/devel/py-radon/Makefile b/devel/py-radon/Makefile index dfda5f489fd6..11b3c1a29a85 100644 --- a/devel/py-radon/Makefile +++ b/devel/py-radon/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/04/04 14:33:24 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2017/07/24 16:44:31 adam Exp $ -DISTNAME= radon-1.5.0 +DISTNAME= radon-2.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=r/radon/} @@ -12,10 +11,10 @@ COMMENT= Code Metrics in Python LICENSE= mit # according to README, only mando is really necessary -DEPENDS+= ${PYPKGPREFIX}-mando>=0.4:../../devel/py-mando +DEPENDS+= ${PYPKGPREFIX}-mando>=0.6:../../devel/py-mando # but these are in "requirements.txt" -DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3.2:../../comms/py-colorama -DEPENDS+= ${PYPKGPREFIX}-flake8-polyfill>=1.0.1:../../devel/py-flake8-polyfill +DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3:../../comms/py-colorama +DEPENDS+= ${PYPKGPREFIX}-flake8-polyfill-[0-9]*:../../devel/py-flake8-polyfill # TEST_DEPENDS BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test BUILD_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock @@ -24,10 +23,10 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox USE_LANGUAGES= # none post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/radon ${DESTDIR}${PREFIX}/bin/radon-${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} radon radon-${PYVERSSUFFIX} || ${TRUE} do-test: - ${RUN} cd ${WRKSRC}/radon/tests; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run.py + cd ${WRKSRC}/radon/tests && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run.py .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-radon/distinfo b/devel/py-radon/distinfo index 10368fc3e705..10eb8d678c2c 100644 --- a/devel/py-radon/distinfo +++ b/devel/py-radon/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.1 2017/04/04 14:19:58 wiz Exp $ +$NetBSD: distinfo,v 1.2 2017/07/24 16:44:31 adam Exp $ -SHA1 (radon-1.5.0.tar.gz) = f505e57e3e8b128d8a29d836f5ffdcf58d6c315c -RMD160 (radon-1.5.0.tar.gz) = b0b68f9304baebb022c538c6a36e899f921db826 -SHA512 (radon-1.5.0.tar.gz) = a2336b7e6592d4efa8c78eadad61b386e35f551be31f7691dd2ca8f9d5d2afff9d96a2d25ced8b93dc0a1d1ccbf12fd8dc7b69f0b04bd3c3986335205a1b6650 -Size (radon-1.5.0.tar.gz) = 3492497 bytes -SHA1 (patch-requirements.txt) = d09c6b9a90e11cffef7a7726ea6272d96c7d293f -SHA1 (patch-setup.py) = 5faf02aa86dc3aba3cd028c1cd6532fdd3164bc9 +SHA1 (radon-2.0.2.tar.gz) = bc4797702969089bd4ed8e5a66d7d838c0a69d68 +RMD160 (radon-2.0.2.tar.gz) = 568487ed5fc7bfe3eb382234a706348d0910906b +SHA512 (radon-2.0.2.tar.gz) = a4c5752003960c41ec37fd6b940d7b566670927292233b99d6870f8b51f2dcce3166462ba8f75c7ed91bac8bd69b39d1c8de1b06f7445214fb838e07699d5249 +Size (radon-2.0.2.tar.gz) = 3492178 bytes diff --git a/devel/py-radon/patches/patch-requirements.txt b/devel/py-radon/patches/patch-requirements.txt deleted file mode 100644 index 72d6fddd4fc8..000000000000 --- a/devel/py-radon/patches/patch-requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-requirements.txt,v 1.1 2017/04/04 14:19:58 wiz Exp $ - -mando-0.5 is fine. -https://github.com/rubik/radon/issues/112 - ---- requirements.txt.orig 2017-02-04 09:44:37.000000000 +0000 -+++ requirements.txt -@@ -1,3 +1,3 @@ --mando>=0.3,<0.4 --colorama>=0.3,<0.4 -+mando -+colorama - flake8_polyfill diff --git a/devel/py-radon/patches/patch-setup.py b/devel/py-radon/patches/patch-setup.py deleted file mode 100644 index 5bc9813b81f6..000000000000 --- a/devel/py-radon/patches/patch-setup.py +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-setup.py,v 1.1 2017/04/04 14:19:58 wiz Exp $ - -mando-0.5 is fine. -https://github.com/rubik/radon/issues/112 - ---- setup.py.orig 2016-11-02 12:22:42.000000000 +0000 -+++ setup.py -@@ -19,8 +19,8 @@ setup(name='radon', - packages=find_packages(), - tests_require=['tox'], - install_requires=[ -- 'mando>=0.3,<0.4', -- 'colorama>=0.3,<0.4', -+ 'mando', -+ 'colorama', - 'flake8-polyfill', - ], - entry_points={