From 92cf5315c533c0ab2572882f06788e122497242f Mon Sep 17 00:00:00 2001 From: Martijn van de Rijdt Date: Thu, 14 Jan 2021 11:23:45 -0700 Subject: [PATCH 1/2] Release v1.3.4 --- CHANGES.txt | 8 ++++++++ README.rst | 4 ++-- pyxform/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1da063906..3a7d67036 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,13 @@ Pyxform Changelog + +# v1.3.4, 2021-01-15 + +* #510 Show a more helpful error message is section name is equal to form name + * Agus Hilman @gushil (OpenClinica) +* #484 Use absolute path for first argument in indexed-repeat() output + * Agus Hilman @gushil (OpenClinica) + # v1.3.3, 2020-12-17 * #500 Use same versions as requirements.pip to prevent unexpected upgrades diff --git a/README.rst b/README.rst index d3a839169..967d0d259 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ =============== -pyxform v1.3.3 +pyxform v1.3.4 =============== |circleci| |appveyor| |codecov| |black| @@ -121,7 +121,7 @@ Releasing pyxform pyxform_validator_update odk update ODK-Validate-vx.x.x.jar -2. Run all tests through Validate by setting the default for ``run_odk_validate`` to ``kwargs.get("run_odk_validate", True)`` in ``pyxform_test_case``. +2. Run all tests through Validate by setting the default for ``run_odk_validate`` to ``kwargs.get("run_odk_validate", True)`` in ``pyxform/tests_v1/pyxform_test_case.py``. 3. Draft a new GitHub release with the list of merged PRs. Follow the title and description pattern of the previous release. 4. Checkout a release branch from latest upstream master. 5. Update ``CHANGES.txt`` with the text of the draft release. diff --git a/pyxform/__init__.py b/pyxform/__init__.py index 247d350c8..ba446e28e 100644 --- a/pyxform/__init__.py +++ b/pyxform/__init__.py @@ -4,7 +4,7 @@ Collect easy. """ -__version__ = "1.3.3" +__version__ = "1.3.4" from pyxform.builder import ( SurveyElementBuilder, diff --git a/setup.py b/setup.py index 6b6ffd671..5e6d10ff7 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setup( name="pyxform", - version="1.3.3", + version="1.3.4", author="github.com/xlsform", author_email="info@xlsform.org", packages=find_packages(), From ff092559a9ecbe4026f8265608b6ff6d87a99f85 Mon Sep 17 00:00:00 2001 From: Martijn van de Rijdt Date: Thu, 14 Jan 2021 11:33:02 -0700 Subject: [PATCH 2/2] Added additional item to changes.rst [SQUASH] --- CHANGES.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3a7d67036..76191fe12 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,8 +5,10 @@ Pyxform Changelog * #510 Show a more helpful error message is section name is equal to form name * Agus Hilman @gushil (OpenClinica) +* #507 Fixed KeyError that occurs with some dynamic default expressions + * Agus Hilman @gushil (OpenClinica) * #484 Use absolute path for first argument in indexed-repeat() output - * Agus Hilman @gushil (OpenClinica) + * Agus Hilman @gushil (OpenClinica) # v1.3.3, 2020-12-17