Merge pull request #530 from lognaturel/v1.5.0-release

Prepare for v1.5.0 release
XLSForm · Apr 16, 2021 · d2463fc · d2463fc
2 parents 3e60bcc + 0ac5b34
commit d2463fc
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,19 @@
 Pyxform Changelog
 
+# v1.5.0, 2021-04-16
+
+* #521 Use itext for dynamic selects with dynamic labels
+  * Agus Hilman @gushil (OpenClinica), Hélène Martin @lognaturel (ODK)
+* #522 Add support for csv-external
+  * Hélène Martin @lognaturel (ODK)
+* #526 Warning for dynamic defaults now more annoying than helpful
+  * Yaw Anokwa @yanokwa (ODK)
+* #524 ${} references in predicates should be expanded using current()
+  * Agus Hilman @gushil (OpenClinica)
+* #529 Apply section name check to sections only
+  * John Milner @jnm (KoBo)
+* #516 Generate correct reference when selecting choices from current repeat question
+  * Davis Raymond @DavisRayM (Ona)
 
 # v1.4.0, 2021-02-23
 

diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
 ===============
-pyxform v1.4.0
+pyxform v1.5.0
 ===============
 
 |circleci|  |appveyor| |codecov| |black|

diff --git a/pyxform/__init__.py b/pyxform/__init__.py
@@ -4,7 +4,7 @@
 Collect easy.
 """
 
-__version__ = "1.4.0"
+__version__ = "1.5.0"
 
 from pyxform.builder import (
     SurveyElementBuilder,

diff --git a/pyxform/tests_v1/test_repeat.py b/pyxform/tests_v1/test_repeat.py
@@ -678,16 +678,16 @@ def test_repeat_using_select_with_reference_path_in_predicate_uses_current(self,
         Test relative path expansion using current if reference path is inside a predicate in a survey with select choice list
         """
         xlsform_md = """
-        | survey |                 |              |                                                |                                                             |
-        |        | type            | name         | label                                          | calculation                                                 |
-        |        | begin repeat    | item-repeat  | Item                                           |                                                             |
-        |        | calculate       | item-counter |                                                | position(..)                                                |
-        |        | calculate       | item         |                                                | instance('item')/root/item[itemindex=${item-counter}]/label |
-        |        | begin group     | item-info    | Item info                                      |                                                             |
-        |        | note            | item-note    | All the following questions are about ${item}. |                                                             |
-        |        | select one item | stock-item   | Do you stock this item?                        |                                                             |
-        |        | end group       | item-info    |                                                |                                                             |
-        |        | end repeat      |              |                                                |                                                             |
+        | survey |                 |              |                                                |               |                                                             |
+        |        | type            | name         | label                                          | choice_filter | calculation                                                 |
+        |        | begin repeat    | item-repeat  | Item                                           |               |                                                             |
+        |        | calculate       | item-counter |                                                |               | position(..)                                                |
+        |        | calculate       | item         |                                                |               | instance('item')/root/item[itemindex=${item-counter}]/label |
+        |        | begin group     | item-info    | Item info                                      |               |                                                             |
+        |        | note            | item-note    | All the following questions are about ${item}. |               |                                                             |
+        |        | select one item | stock-item   | Do you stock this item?                        | true()        |                                                             |
+        |        | end group       | item-info    |                                                |               |                                                             |
+        |        | end repeat      |              |                                                |               |                                                             |
         | choices |           |                  |                   |           |
         |         | list_name | name             | label             | itemindex |
         |         | item      | gasoline-regular | Gasoline, Regular | 1         |
@@ -709,16 +709,16 @@ def test_repeat_using_select_uses_current_with_reference_path_in_predicate_and_i
         Test relative path expansion using current if reference path is inside a predicate and instance is not first expression in a survey with select choice list
         """
         xlsform_md = """
-        | survey |                 |              |                                                |                                                                               |
-        |        | type            | name         | label                                          | calculation                                                                   |
-        |        | begin repeat    | item-repeat  | Item                                           |                                                                               |
-        |        | calculate       | item-counter |                                                | position(..)                                                                  |
-        |        | calculate       | item         |                                                | ${item-counter} + instance('item')/root/item[itemindex=${item-counter}]/label |
-        |        | begin group     | item-info    | Item info                                      |                                                                               |
-        |        | note            | item-note    | All the following questions are about ${item}. |                                                                               |
-        |        | select one item | stock-item   | Do you stock this item?                        |                                                                               |
-        |        | end group       | item-info    |                                                |                                                                               |
-        |        | end repeat      |              |                                                |                                                                               |
+        | survey |                 |              |                                                |               |                                                                               |
+        |        | type            | name         | label                                          | choice_filter | calculation                                                                   |
+        |        | begin repeat    | item-repeat  | Item                                           |               |                                                                               |
+        |        | calculate       | item-counter |                                                |               | position(..)                                                                  |
+        |        | calculate       | item         |                                                |               | ${item-counter} + instance('item')/root/item[itemindex=${item-counter}]/label |
+        |        | begin group     | item-info    | Item info                                      |               |                                                                               |
+        |        | note            | item-note    | All the following questions are about ${item}. |               |                                                                               |
+        |        | select one item | stock-item   | Do you stock this item?                        | true()        |                                                                               |
+        |        | end group       | item-info    |                                                |               |                                                                               |
+        |        | end repeat      |              |                                                |               |                                                                               |
         | choices |           |                  |                   |           |
         |         | list_name | name             | label             | itemindex |
         |         | item      | gasoline-regular | Gasoline, Regular | 1         |

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="pyxform",
-    version="1.4.0",
+    version="1.5.0",
     author="github.com/xlsform",
     author_email="info@xlsform.org",
     packages=find_packages(),