From de22181865d02aa143083360d9d9d80a785a1763 Mon Sep 17 00:00:00 2001
From: Davide Brunato <brunato@sissa.it>
Date: Sun, 13 Sep 2020 17:25:31 +0200
Subject: [PATCH] Update to release v1.2.4

---
 CHANGELOG.rst                 | 5 +++--
 publiccode.yml                | 2 +-
 tox.ini                       | 7 ++++++-
 xmlschema/testing/builders.py | 3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b53b1e4d..a6d233b5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,9 +2,10 @@
 CHANGELOG
 *********
 
-`v1.2.4`_ (2020-08-xx)
+`v1.2.4`_ (2020-09-13)
 ======================
-* Use regex engine from XPath processor 
+* Use the regex engine of *elementpath* library
+* Fix and extend tests on xs:assert
 
 `v1.2.3`_ (2020-08-14)
 ======================
diff --git a/publiccode.yml b/publiccode.yml
index 71372b27..63f6a065 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -6,7 +6,7 @@ publiccodeYmlVersion: '0.2'
 name: xmlschema
 url: 'https://github.com/sissaschool/xmlschema'
 landingURL: 'https://github.com/sissaschool/xmlschema'
-releaseDate: '2020-08-xx'
+releaseDate: '2020-09-13'
 softwareVersion: v1.2.4
 developmentStatus: stable
 platforms:
diff --git a/tox.ini b/tox.ini
index 5ce308a9..f43bc189 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py35, py36, py37, py38, pypy3, ep202, docs, flake8, coverage
+envlist = py35, py36, py37, py38, pypy3, ep202, ep203, docs, flake8, coverage
 skip_missing_interpreters = true
 toxworkdir = {homedir}/.tox/xmlschema
 
@@ -26,6 +26,11 @@ deps =
     elementpath==2.0.2
     lxml
 
+[ep203]
+deps =
+    elementpath==2.0.3
+    lxml
+
 [testenv:docs]
 commands =
     make -C doc html
diff --git a/xmlschema/testing/builders.py b/xmlschema/testing/builders.py
index e721decc..8cad5676 100644
--- a/xmlschema/testing/builders.py
+++ b/xmlschema/testing/builders.py
@@ -322,6 +322,9 @@ def check_json_serialization(self, root, converter=None, **kwargs):
             if isinstance(elem1, tuple):
                 elem1 = elem1[0]
 
+            if lax_encode:
+                kwargs['validation'] = kwargs.get('validation', 'lax')
+
             json_data2 = xmlschema.to_json(
                 elem1, schema=self.schema, converter=converter, **kwargs
             )