Merge pull request #537 from lognaturel/v1.5.1

Prepare v1.5.1 release
XLSForm · May 18, 2021 · d054d38 · d054d38
2 parents 3184e9d + 13ee243
commit d054d38
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,12 @@
 Pyxform Changelog
 
+# v1.5.1, 2021-05-18
+
+* #535 Don't check for dynamic label if there is no label
+  * Hélène Martin @lognaturel (ODK)
+* #536 Expand refs in predicates using current() even if preceded by whitespace
+  * Agus Hilman @gushil (OpenClinica)
+
 # v1.5.0, 2021-04-16
 
 * #521 Use itext for dynamic selects with dynamic labels

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

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

diff --git a/pyxform/tests_v1/test_repeat.py b/pyxform/tests_v1/test_repeat.py
@@ -818,14 +818,14 @@ def test_repeat_with_reference_path_in_a_method_with_spaces_in_predicate_uses_cu
         |        | calculate    | pos1  |       | position(..)                                                              |
         |        | begin repeat | rep5  |       |                                                                           |
         |        | calculate    | pos5  |       | position(..)                                                              |
-        |        | calculate    | item5 |       | instance('item')/root/item[index=number(1+ ${pos5} and ${pos1} = 1]/label |
+        |        | calculate    | item5 |       | instance('item')/root/item[index=number(1+ ${pos5}) and ${pos1} = 1]/label |
         |        | end repeat   |       |       |                                                                           |
         """
         self.assertPyxformXform(
             name="data",
             md=xlsform_md,
             xml__contains=[
-                """<bind calculate="instance('item')/root/item[index=number(1+  current()/../pos5  and  /data/pos1  = 1]/label" nodeset="/data/rep5/item5" type="string"/>"""  # noqa pylint: disable=line-too-long
+                """<bind calculate="instance('item')/root/item[index=number(1+  current()/../pos5 ) and  /data/pos1  = 1]/label" nodeset="/data/rep5/item5" type="string"/>"""  # noqa pylint: disable=line-too-long
             ],
         )
 
@@ -953,19 +953,19 @@ def test_repeat_with_reference_path_after_instance_in_predicate_uses_current(sel
         ${pos5} that is in 'position()=${pos5}'' uses current because it is in a predicate (eventhough not in an instance)
         """
         xlsform_md = """
-        | survey |              |       |       |                                                                                               |
-        |        | type         | name  | label | calculation                                                                                   |
-        |        | xml-external | item  |       |                                                                                               |
-        |        | begin repeat | rep5  |       |                                                                                               |
-        |        | calculate    | pos5  |       | position(..)                                                                                  |
-        |        | calculate    | item5 |       | concat(instance('item')/root/item[index =${pos5}]/label, @data/form/[position()=${pos5}]/text |
-        |        | end repeat   |       |       |                                                                                               |
+        | survey |              |       |       |                                                                                                |
+        |        | type         | name  | label | calculation                                                                                    |
+        |        | xml-external | item  |       |                                                                                                |
+        |        | begin repeat | rep5  |       |                                                                                                |
+        |        | calculate    | pos5  |       | position(..)                                                                                   |
+        |        | calculate    | item5 |       | concat(instance('item')/root/item[index =${pos5}]/label, /data[position()=${pos5}]/text) |
+        |        | end repeat   |       |       |                                                                                                |
         """
         self.assertPyxformXform(
             name="data",
             md=xlsform_md,
             xml__contains=[
-                """<bind calculate="concat(instance('item')/root/item[index = current()/../pos5 ]/label, @data/form/[position()= current()/../pos5 ]/text" nodeset="/data/rep5/item5" type="string"/>""",  # noqa pylint: disable=line-too-long
+                """<bind calculate="concat(instance('item')/root/item[index = current()/../pos5 ]/label, /data[position()= current()/../pos5 ]/text)" nodeset="/data/rep5/item5" type="string"/>""",  # noqa pylint: disable=line-too-long
             ],
         )
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="pyxform",
-    version="1.5.0",
+    version="1.5.1",
     author="github.com/xlsform",
     author_email="[email protected]",
     packages=find_packages(),