py-FormEncode: update to 2.0.1.

2.0.1
-----
 - Add support for 3.10
 - use Pytest instead of Nose and Github Actions instead of Travis for tests
 - Documentation updates
 - Note this will be the last version to support Python 2.7. The next version
   will be 2.1 to signal this change. If you want to keep support for Python
   2.7 update your dependencies spec to be below 2.1

2.0.0
-----

 - `FormEncode` can now run on Python 3.6 and higher without needing to run 2to3 first.
 - `FormEncode` 2.0 is no longer compatible with Python 2.6 and 3.2 to 3.5.
   If you need Python 2.6 or 3.2 to 3.5 compatibility please use `FormEncode` 1.3.
   You might also try `FormEncode` 2.0.0a1 which supports Python 2.6 and Python 3.3-3.5.
 - This will be the last major version to support Python 2.7
 - Add strict flag to USPostalCode to raise error on postal codes that has too
   many digits instead of just truncating
 - Various Python 3 fixes
 - Serbian latin translation
 - Changed License to MIT
 - Dutch, UK, Greek and South Korean postal code format fixes
 - Add postal code formats for Switzerland, Cyprus, Faroe Islands, San Marino, Ukraine and Vatican City.
 - Add ISODateTimeConverter validator
 - Add ability to target htmlfill to particular form or ignore a form
 - Fix format errors in some translations
 - The version of the library can be checked using formencode.__version__

4 files changed, 38 insertions, 25 deletions

diff --git a/www/py-FormEncode/Makefile b/www/py-FormEncode/Makefile
index be3c4ec844a..da6edf319f5 100644
--- a/www/py-FormEncode/Makefile
+++ b/www/py-FormEncode/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/03/22 12:28:28 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2021/12/06 14:41:21 wiz Exp $
 
-DISTNAME=	FormEncode-1.3.1
+DISTNAME=	FormEncode-2.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=F/FormEncode/}
@@ -10,17 +10,22 @@ HOMEPAGE=	http://formencode.org/
 COMMENT=	HTML form validation, generation, and conversion package
 LICENSE=	python-software-foundation
 
+BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm_git_archive-[0-9]*:../../devel/py-setuptools_scm_git_archive
 TEST_DEPENDS+=	${PYPKGPREFIX}-country-[0-9]*:../../geography/py-country
 TEST_DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
-TEST_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == py27
-TEST_DEPENDS=	# none; py-country is incompatible with py27
-do-test:
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-country
+
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
+
+INSTALLATION_DIRS+=	share/doc/${PYPKGPREFIX}-FormEncode
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/LICENSE.txt ${DESTDIR}${PREFIX}/share/doc/${PYPKGPREFIX}-FormEncode
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-FormEncode/PLIST b/www/py-FormEncode/PLIST
index 1bc8523eff8..a30293560ff 100644
--- a/www/py-FormEncode/PLIST
+++ b/www/py-FormEncode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/07/15 18:30:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/12/06 14:41:21 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -18,6 +18,7 @@ ${PYSITELIB}/docs/modules.txt
 ${PYSITELIB}/docs/whatsnew-0-to-1.2.4.txt
 ${PYSITELIB}/docs/whatsnew-1.2.5.txt
 ${PYSITELIB}/docs/whatsnew-1.3.txt
+${PYSITELIB}/docs/whatsnew-2.0.txt
 ${PYSITELIB}/formencode/__init__.py
 ${PYSITELIB}/formencode/__init__.pyc
 ${PYSITELIB}/formencode/__init__.pyo
@@ -82,6 +83,8 @@ ${PYSITELIB}/formencode/i18n/ko/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/ko/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/lt/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/lt/LC_MESSAGES/FormEncode.po
+${PYSITELIB}/formencode/i18n/mk/LC_MESSAGES/FormEncode.mo
+${PYSITELIB}/formencode/i18n/mk/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/nb_NO/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/nb_NO/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/nl/LC_MESSAGES/FormEncode.mo
@@ -100,6 +103,8 @@ ${PYSITELIB}/formencode/i18n/sl/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/sl/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/sr/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/sr/LC_MESSAGES/FormEncode.po
+${PYSITELIB}/formencode/i18n/sr@latin/LC_MESSAGES/FormEncode.mo
+${PYSITELIB}/formencode/i18n/sr@latin/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/sv/LC_MESSAGES/FormEncode.mo
 ${PYSITELIB}/formencode/i18n/sv/LC_MESSAGES/FormEncode.po
 ${PYSITELIB}/formencode/i18n/tr/LC_MESSAGES/FormEncode.mo
@@ -156,6 +161,9 @@ ${PYSITELIB}/formencode/tests/test_email.pyo
 ${PYSITELIB}/formencode/tests/test_htmlfill.py
 ${PYSITELIB}/formencode/tests/test_htmlfill.pyc
 ${PYSITELIB}/formencode/tests/test_htmlfill.pyo
+${PYSITELIB}/formencode/tests/test_htmlfill_control.py
+${PYSITELIB}/formencode/tests/test_htmlfill_control.pyc
+${PYSITELIB}/formencode/tests/test_htmlfill_control.pyo
 ${PYSITELIB}/formencode/tests/test_htmlgen.py
 ${PYSITELIB}/formencode/tests/test_htmlgen.pyc
 ${PYSITELIB}/formencode/tests/test_htmlgen.pyo
@@ -186,3 +194,4 @@ ${PYSITELIB}/formencode/validators.pyo
 ${PYSITELIB}/formencode/variabledecode.py
 ${PYSITELIB}/formencode/variabledecode.pyc
 ${PYSITELIB}/formencode/variabledecode.pyo
+share/doc/${PYPKGPREFIX}-FormEncode/LICENSE.txt
diff --git a/www/py-FormEncode/distinfo b/www/py-FormEncode/distinfo
index 3033db54a7c..c0b562f7299 100644
--- a/www/py-FormEncode/distinfo
+++ b/www/py-FormEncode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:30:26 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/12/06 14:41:21 wiz Exp $
 
-BLAKE2s (FormEncode-1.3.1.tar.gz) = f2309ed3ce6ba6d1933f7c939c906c37eccf5fb719f8bbaab2d3d5c6a58a745c
-SHA512 (FormEncode-1.3.1.tar.gz) = 5f53d4e868c70adf2615f3f18ca1053b037abc14e0e23f553237af24b77666ce6489390106d1c2be02fe85e63a216722dc5e459c1c41e748d76c332521974626
-Size (FormEncode-1.3.1.tar.gz) = 197305 bytes
-SHA1 (patch-setup.py) = c560e9817f9854c6ec2ecf09baefae6c37c965e7
+BLAKE2s (FormEncode-2.0.1.tar.gz) = 13225ffbde085fb4d0920c6d91e678c11546594c335f14dc87e9333303ba30ae
+SHA512 (FormEncode-2.0.1.tar.gz) = 165d2b5abfd37a361144aaf33b053537660bef5ba6a266b869beb2e1d5467719fd7a9dc6d2cec75a04f0ee0d07d46cc76d90ad6ead5b4adef570e22d566fa87b
+Size (FormEncode-2.0.1.tar.gz) = 256130 bytes
+SHA1 (patch-setup.py) = e5bf0b4ad7900873574c3485bbf0c300411bce09
diff --git a/www/py-FormEncode/patches/patch-setup.py b/www/py-FormEncode/patches/patch-setup.py
index 49520cc3c3c..a0050876b98 100644
--- a/www/py-FormEncode/patches/patch-setup.py
+++ b/www/py-FormEncode/patches/patch-setup.py
@@ -1,16 +1,15 @@
-$NetBSD: patch-setup.py,v 1.1 2017/10/27 15:47:31 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2021/12/06 14:41:21 wiz Exp $
 
-dnspython3 has been superseded by the regular dnspython
+Remove hardcoded version limits.
 
---- setup.py.orig	2017-10-27 15:37:17.000000000 +0000
+--- setup.py.orig	2021-10-05 12:14:00.000000000 +0000
 +++ setup.py
-@@ -14,8 +14,7 @@ version = '1.3.1'
- if not '2.6' <= sys.version < '3.0' and not '3.2' <= sys.version:
-     raise ImportError('Python version not supported')
+@@ -16,7 +16,7 @@ if not (2,7) <= sys.version_info[:2] < (
  
--tests_require = ['nose', 'pycountry',
--    'dnspython' if sys.version < '3.0' else 'dnspython3']
-+tests_require = ['nose', 'pycountry', 'dnspython']
+ tests_require = [
+     'pytest<4.7' if sys.version_info[:2] < (3,0) else 'pytest',
+-    'dnspython==1.16.0' if sys.version_info[:2] < (3,0) else 'dnspython>=2.0.0',
++    'dnspython',
+     'pycountry<19' if sys.version_info < (3,0) else 'pycountry']
  
- doctests = ['docs/htmlfill.txt', 'docs/Validator.txt',
-     'formencode/tests/non_empty.txt']
+ setup_requires = [