Apply pyxform 1.5.1 upgrade to beta branch #719
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to-formList Add version information to form list
* Recognize select questions from the question elements themselves
instead of checking the bind type; see XLSForm/pyxform#168
* Recognize new error message when a group name matches the form name
See XLSForm/pyxform#510
* Set `allow_choice_duplicates` to `yes` in cascade test XLSForms
See XLSForm/pyxform#23; XLSForm/pyxform#373 (comment)
* Update tests to use `default_name` instead of relying on the XLSForm file name
See XLSForm/pyxform#130
* Update expected XML in tests to match new pyxform behavior:
* `<model>` becomes `<model odk:xforms-version="1.0.0">`
* See XLSForm/pyxform#393
* The bind type for `select` and `select1` becomes `string`
* See XLSForm/pyxform#168
* `calculate="concat('uuid:', uuid())"` becomes `jr:preload="uid"`
* See XLSForm/pyxform#94
This squashed set of changes includes work from #699.
Thanks to @duvld for that contribution.
…-master Upgrade to pyxform 1.5.1
This reverts commit 63abebc.
…to avoid running pip-compile three times manually whenever there's a Python dependency change
Includes a humongous diff thanks to jazzband/pip-tools#1237, which places each "via" package on a separate line
issues in unit tests
…and prefer explicit encoding/decoding over `smart_str()`. See #718
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Addresses any conflicts and Python 3 / Django 2 incompatibilities with the previous upgrade to pyxform 1.5.1 (#716).
Related issues
Incorporates #716
Closes #604 (on beta branch)
Supersedes #699 (completely)
Begins work on #718