py-humanize: updated to 2.1.0

2.1.0:
Added
Add ndigits option to intcomma
Show more than bytes for negative file sizes

2.0.0:
Note: Humanize 1.1.0 was meant to be tagged 2.0.0 because it drops support for Python 2, so is also released as 2.0.0. If you still support Python 2, use Humanize 1.0.0.

Added
Disambiguate naturaldate return: only append year if more than ~5 months away
Add scientific notation to string support
Add micro- and millisecond units to naturaldelta and naturaltime

Changed
Disambiguate naturaldate return: only append year if more than ~5 months away
Convert remaining tests to use pytest.mark.parametrize
Refactor some tests to use pytest.mark.parametrize

Removed
Drop support for EOL Python 2

Fixed
Fix intword returning 1000.0 million instead of 1.0 billion

3 files changed, 50 insertions, 23 deletions

diff --git a/textproc/py-humanize/Makefile b/textproc/py-humanize/Makefile
index 9d49dec250c..f16572b534a 100644
--- a/textproc/py-humanize/Makefile
+++ b/textproc/py-humanize/Makefile
@@ -1,19 +1,25 @@
-# $NetBSD: Makefile,v 1.2 2017/09/04 18:08:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/21 11:23:57 adam Exp $
 
-DISTNAME=		humanize-0.5.1
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		python textproc
-MASTER_SITES=		${MASTER_SITE_PYPI:=h/humanize/}
+DISTNAME=	humanize-2.1.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	python textproc
+MASTER_SITES=	${MASTER_SITE_PYPI:=h/humanize/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://travis-ci.org/jmoiron/humanize
-COMMENT=		Convert numbers into easily readable format
-LICENSE=		mit
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/jmoiron/humanize
+COMMENT=	Convert numbers into easily readable format
+LICENSE=	mit
 
-# TEST_DEPENDS
-#BUILD_DEPENDS+=		${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-#BUILD_DEPENDS+=		${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
-# tests not included in distfile
+TEST_DEPENDS+=	${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+
+USE_LANGUAGES=	# none
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+do-test:
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-humanize/PLIST b/textproc/py-humanize/PLIST
index b430d445c7b..dbb0aa56ccc 100644
--- a/textproc/py-humanize/PLIST
+++ b/textproc/py-humanize/PLIST
@@ -1,28 +1,49 @@
-@comment $NetBSD: PLIST,v 1.1 2017/04/04 11:34:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/03/21 11:23:57 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/humanize/__init__.py
 ${PYSITELIB}/humanize/__init__.pyc
 ${PYSITELIB}/humanize/__init__.pyo
-${PYSITELIB}/humanize/compat.py
-${PYSITELIB}/humanize/compat.pyc
-${PYSITELIB}/humanize/compat.pyo
 ${PYSITELIB}/humanize/filesize.py
 ${PYSITELIB}/humanize/filesize.pyc
 ${PYSITELIB}/humanize/filesize.pyo
 ${PYSITELIB}/humanize/i18n.py
 ${PYSITELIB}/humanize/i18n.pyc
 ${PYSITELIB}/humanize/i18n.pyo
+${PYSITELIB}/humanize/locale/de_DE/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/de_DE/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/fa_IR/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/fa_IR/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/fi_FI/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/fi_FI/LC_MESSAGES/humanize.po
 ${PYSITELIB}/humanize/locale/fr_FR/LC_MESSAGES/humanize.mo
 ${PYSITELIB}/humanize/locale/fr_FR/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/id_ID/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/id_ID/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/it_IT/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/it_IT/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/ja_JP/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/ja_JP/LC_MESSAGES/humanize.po
 ${PYSITELIB}/humanize/locale/ko_KR/LC_MESSAGES/humanize.mo
 ${PYSITELIB}/humanize/locale/ko_KR/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/nl_NL/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/pt_BR/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/pt_BR/LC_MESSAGES/humanize.po
 ${PYSITELIB}/humanize/locale/ru_RU/LC_MESSAGES/humanize.mo
 ${PYSITELIB}/humanize/locale/ru_RU/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/sk_SK/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/sk_SK/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/tr_TR/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/tr_TR/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/vi_VI/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/vi_VI/LC_MESSAGES/humanize.po
+${PYSITELIB}/humanize/locale/zh_CN/LC_MESSAGES/humanize.mo
+${PYSITELIB}/humanize/locale/zh_CN/LC_MESSAGES/humanize.po
 ${PYSITELIB}/humanize/number.py
 ${PYSITELIB}/humanize/number.pyc
 ${PYSITELIB}/humanize/number.pyo
diff --git a/textproc/py-humanize/distinfo b/textproc/py-humanize/distinfo
index b55e9a6d736..002971d8306 100644
--- a/textproc/py-humanize/distinfo
+++ b/textproc/py-humanize/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2017/04/04 11:34:05 wiz Exp $
+$NetBSD: distinfo,v 1.2 2020/03/21 11:23:57 adam Exp $
 
-SHA1 (humanize-0.5.1.tar.gz) = 8b883f6c712dbc5b866382842e59567cdb3c7240
-RMD160 (humanize-0.5.1.tar.gz) = 7c5a7c9c5ac28eb29b04e80e83506e14bf46f811
-SHA512 (humanize-0.5.1.tar.gz) = 2727268d9fc7b393228f7eb9e71a5c881988ec56e265ddf83613fe57116da3aaad70d2417db4cef8a8c40cb73753eb2c2bd775d3cd25c2de751cb61373f0a551
-Size (humanize-0.5.1.tar.gz) = 14250 bytes
+SHA1 (humanize-2.1.0.tar.gz) = b2325f8a7e4dbd97d9e3595066097bf3bb346cbc
+RMD160 (humanize-2.1.0.tar.gz) = 870c751b1cf7136dba039bfbb7b06a7f15ac7de6
+SHA512 (humanize-2.1.0.tar.gz) = 1efd1c34febf6140a02f15b73a90f453630b255414e056c75fd77c83e9aaa30f802a845b7e1c4e90baf0da26fa6d258e0d0fd84f0d4660b55730baccfde62b2d
+Size (humanize-2.1.0.tar.gz) = 38484 bytes