From f34109907330ee96d27389befccd0f032d82039e Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 30 Jan 2020 13:08:26 +0000 Subject: [PATCH] update to py3-natsort-7.0.1 (drops python2 support) --- textproc/Makefile | 3 +-- textproc/py-natsort/Makefile | 8 +++----- textproc/py-natsort/distinfo | 4 ++-- textproc/py-natsort/pkg/PLIST | 6 +----- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/textproc/Makefile b/textproc/Makefile index 8ba0967d16f..d0718bb4e86 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.618 2020/01/26 16:59:37 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.619 2020/01/30 13:08:26 jasper Exp $ SUBDIR = SUBDIR += TclXML @@ -405,7 +405,6 @@ SUBDIR += py-m2r,python3 SUBDIR += py-mistune SUBDIR += py-mistune,python3 - SUBDIR += py-natsort SUBDIR += py-natsort,python3 SUBDIR += py-nltk SUBDIR += py-nltk,python3 diff --git a/textproc/py-natsort/Makefile b/textproc/py-natsort/Makefile index 7d979c77f3d..f23406c63d5 100644 --- a/textproc/py-natsort/Makefile +++ b/textproc/py-natsort/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.14 2020/01/03 22:21:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2020/01/30 13:08:26 jasper Exp $ COMMENT = simple yet flexible natural sorting -MODPY_EGG_VERSION = 6.2.0 +MODPY_EGG_VERSION = 7.0.1 DISTNAME = natsort-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} @@ -18,9 +18,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes - -FLAVORS = python3 -FLAVOR ?= +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} # could also make use of 'fastnumbers' RUN_DEPENDS = textproc/py-ICU${MODPY_FLAVOR} diff --git a/textproc/py-natsort/distinfo b/textproc/py-natsort/distinfo index 9142dba9a28..af5769128c1 100644 --- a/textproc/py-natsort/distinfo +++ b/textproc/py-natsort/distinfo @@ -1,2 +1,2 @@ -SHA256 (natsort-6.2.0.tar.gz) = WMb7LzVRF+iKGYCDlOwe0wov+IG90sgcQ2lSyuvTBmg= -SIZE (natsort-6.2.0.tar.gz) = 139341 +SHA256 (natsort-7.0.1.tar.gz) = pjNGTcOiKzBd8PJ6vLPoNRWJiqH9DtL5cmw1caJyWM8= +SIZE (natsort-7.0.1.tar.gz) = 139272 diff --git a/textproc/py-natsort/pkg/PLIST b/textproc/py-natsort/pkg/PLIST index 3c267b0fa30..abc0dedb665 100644 --- a/textproc/py-natsort/pkg/PLIST +++ b/textproc/py-natsort/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2019/11/13 20:13:20 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.9 2020/01/30 13:08:26 jasper Exp $ bin/natsort${MODPY_BIN_SUFFIX} lib/python${MODPY_VERSION}/site-packages/natsort/ lib/python${MODPY_VERSION}/site-packages/natsort-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ @@ -25,13 +25,9 @@ lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}__init__ lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}fake_fastnumbers.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}fastnumbers.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}locale.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}pathlib.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/natsort/compat/${MODPY_PYCACHE}py23.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/natsort/compat/fake_fastnumbers.py lib/python${MODPY_VERSION}/site-packages/natsort/compat/fastnumbers.py lib/python${MODPY_VERSION}/site-packages/natsort/compat/locale.py -lib/python${MODPY_VERSION}/site-packages/natsort/compat/pathlib.py -lib/python${MODPY_VERSION}/site-packages/natsort/compat/py23.py lib/python${MODPY_VERSION}/site-packages/natsort/natsort.py lib/python${MODPY_VERSION}/site-packages/natsort/ns_enum.py lib/python${MODPY_VERSION}/site-packages/natsort/unicode_numbers.py