py-xmlschema: updated to 1.2.4

v1.2.4:
* Use the regex engine of *elementpath* library
* Fix and extend tests on xs:assert

4 files changed, 17 insertions, 28 deletions

diff --git a/textproc/py-xmlschema/Makefile b/textproc/py-xmlschema/Makefile
index 7eaf6e89655..b8c8414153d 100644
--- a/textproc/py-xmlschema/Makefile
+++ b/textproc/py-xmlschema/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2020/08/27 12:28:59 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2020/09/14 08:57:38 adam Exp $
 
-DISTNAME=	xmlschema-1.2.3
+DISTNAME=	xmlschema-1.2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=x/xmlschema/}
@@ -10,9 +10,9 @@ HOMEPAGE=	https://github.com/brunato/xmlschema
 COMMENT=	XML Schema validator and decoder
 LICENSE=	mit
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-elementpath>=1.4.0:../../textproc/py-elementpath
 TEST_DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+TOOL_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 
 USE_LANGUAGES=	# none
 
diff --git a/textproc/py-xmlschema/PLIST b/textproc/py-xmlschema/PLIST
index c0a33034c32..e42ac83c5c9 100644
--- a/textproc/py-xmlschema/PLIST
+++ b/textproc/py-xmlschema/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/08/21 08:00:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/09/14 08:57:38 adam Exp $
 bin/xmlschema-json2xml-${PYVERSSUFFIX}
 bin/xmlschema-validate-${PYVERSSUFFIX}
 bin/xmlschema-xml2json-${PYVERSSUFFIX}
@@ -14,9 +14,6 @@ ${PYSITELIB}/xmlschema/__init__.pyo
 ${PYSITELIB}/xmlschema/cli.py
 ${PYSITELIB}/xmlschema/cli.pyc
 ${PYSITELIB}/xmlschema/cli.pyo
-${PYSITELIB}/xmlschema/codepoints.py
-${PYSITELIB}/xmlschema/codepoints.pyc
-${PYSITELIB}/xmlschema/codepoints.pyo
 ${PYSITELIB}/xmlschema/compat.py
 ${PYSITELIB}/xmlschema/compat.pyc
 ${PYSITELIB}/xmlschema/compat.pyo
@@ -44,9 +41,6 @@ ${PYSITELIB}/xmlschema/namespaces.pyo
 ${PYSITELIB}/xmlschema/qnames.py
 ${PYSITELIB}/xmlschema/qnames.pyc
 ${PYSITELIB}/xmlschema/qnames.pyo
-${PYSITELIB}/xmlschema/regex.py
-${PYSITELIB}/xmlschema/regex.pyc
-${PYSITELIB}/xmlschema/regex.pyo
 ${PYSITELIB}/xmlschema/resources.py
 ${PYSITELIB}/xmlschema/resources.pyc
 ${PYSITELIB}/xmlschema/resources.pyo
@@ -65,7 +59,6 @@ ${PYSITELIB}/xmlschema/testing/factory.pyo
 ${PYSITELIB}/xmlschema/testing/observers.py
 ${PYSITELIB}/xmlschema/testing/observers.pyc
 ${PYSITELIB}/xmlschema/testing/observers.pyo
-${PYSITELIB}/xmlschema/unicode_categories.json
 ${PYSITELIB}/xmlschema/validators/__init__.py
 ${PYSITELIB}/xmlschema/validators/__init__.pyc
 ${PYSITELIB}/xmlschema/validators/__init__.pyo
diff --git a/textproc/py-xmlschema/distinfo b/textproc/py-xmlschema/distinfo
index 1b6f9bdf4e7..0e53226ba82 100644
--- a/textproc/py-xmlschema/distinfo
+++ b/textproc/py-xmlschema/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2020/08/21 08:00:51 adam Exp $
+$NetBSD: distinfo,v 1.12 2020/09/14 08:57:38 adam Exp $
 
-SHA1 (xmlschema-1.2.3.tar.gz) = 942c6c20207414d3dfb0d598250e7a0f2b1d35bf
-RMD160 (xmlschema-1.2.3.tar.gz) = dbb9ad595c1dfa72e748c94a60baf0095ba47ab1
-SHA512 (xmlschema-1.2.3.tar.gz) = 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
-Size (xmlschema-1.2.3.tar.gz) = 322076 bytes
-SHA1 (patch-setup.py) = 6007d0da37c00e14a7217b588df8e92679fc7c96
+SHA1 (xmlschema-1.2.4.tar.gz) = 927dc02248ab96ab4139fad16c6e68c371571309
+RMD160 (xmlschema-1.2.4.tar.gz) = c829b01af54f5c8cb46573474f3a4bbc03bcdaf2
+SHA512 (xmlschema-1.2.4.tar.gz) = 27f50890728be149e3c36a5ad706b27c32efecf859699a99bebe9a0b81dea2c1ab733860366a2cf0d30680de7f45d8ae581cb445ba78708db3ed25ff7eef94ee
+Size (xmlschema-1.2.4.tar.gz) = 287636 bytes
+SHA1 (patch-setup.py) = 33f441c48a538fde5156588c17cc6e8af1d692e6
diff --git a/textproc/py-xmlschema/patches/patch-setup.py b/textproc/py-xmlschema/patches/patch-setup.py
index 1f634df6716..06e75e81337 100644
--- a/textproc/py-xmlschema/patches/patch-setup.py
+++ b/textproc/py-xmlschema/patches/patch-setup.py
@@ -1,19 +1,15 @@
-$NetBSD: patch-setup.py,v 1.1 2020/05/31 20:49:34 joerg Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/09/14 08:57:38 adam Exp $
 
---- setup.py.orig	2020-05-31 18:07:15.361949598 +0000
+Fix for Python 3.6.
+
+--- setup.py.orig	2020-09-13 19:12:09.000000000 +0000
 +++ setup.py
-@@ -8,12 +8,13 @@
- #
- # @author Davide Brunato <brunato@sissa.it>
+@@ -10,7 +10,7 @@
  #
-+import sys
- import importlib
- from setuptools import setup
- from setuptools.command.develop import develop
- from setuptools.command.install import install
+ from setuptools import setup, find_packages
  
 -with open("README.rst") as readme:
-+with open("README.rst", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as readme:
++with open("README.rst", encoding='utf-8') as readme:
      long_description = readme.read()