Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for v1.5.0 release #530

Merged
merged 2 commits into from
Apr 16, 2021
Merged

Prepare for v1.5.0 release #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36fb3e
Force secondary instance creation so query can be used
lognaturel Apr 16, 2021
0ac5b34
Update for v1.5.0 release
lognaturel Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
===============
pyxform v1.4.0
pyxform v1.5.0
===============

|circleci| |appveyor| |codecov| |black|
Expand Down
2 changes: 1 addition & 1 deletion pyxform/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Collect easy.
"""

__version__ = "1.4.0"
__version__ = "1.5.0"

from pyxform.builder import (
SurveyElementBuilder,
Expand Down
40 changes: 20 additions & 20 deletions pyxform/tests_v1/test_repeat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name="pyxform",
version="1.4.0",
version="1.5.0",
author="github.com/xlsform",
author_email="[email protected]",
packages=find_packages(),
Expand Down