Skip to content

Commit

Permalink
Merge pull request #433 from yanokwa/release-v1.0.2
Browse files Browse the repository at this point in the history
Prepare for release v1.1.0
  • Loading branch information
yanokwa authored Feb 17, 2020
2 parents c079d24 + d8a315a commit 3d2e6dd
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
Pyxform Changelog

# v1.1.0, 2020-02-17

* #429 Adding a hash to properly route to the choicenames url
* Zach Weed @zachhweed
* #430 Add odk:xforms-version="1.0.0" attribute to <model>
* Martijn van de Rijdt @MartijnR (Enketo)
* #431 Put setvalue action for repeats in the body
* Hélène Martin @lognaturel (Nafundi)

# v1.0.1, 2020-02-06

* #423 Update to ODK Validate v1.14.0
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
===============
pyxform v1.0.1
pyxform v1.1.0
===============

|circleci| |appveyor| |codecov| |black|
Expand Down Expand Up @@ -118,7 +118,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 ``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_test_case``.
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.
Expand Down
2 changes: 1 addition & 1 deletion pyxform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Collect easy.
"""

__version__ = "1.0.1"
__version__ = "1.1.0"

from pyxform.builder import (
SurveyElementBuilder,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name="pyxform",
version="1.0.1",
version="1.1.0",
author="github.com/xlsform",
author_email="info@xlsform.org",
packages=find_packages(),
Expand Down

0 comments on commit 3d2e6dd

Please sign in to comment.