From 2087190d0ccd96e597b1468dba2d58836705059f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Thu, 18 Apr 2024 12:37:32 -0700 Subject: [PATCH 1/3] Update version, changelog --- CHANGES.txt | 6 ++++++ pyproject.toml | 2 +- pyxform/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5d3bc3bc..2bf36685 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,11 @@ Pyxform Changelog +v2.0.3, 2024-04-18 +* Don't use regex to clean up XML following pretty-printing by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/681 +* dev: update dependencies, testing, packaging, and linting/formatting by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/685 +* Address search and pulldata secondary instance conflict by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/697 +* Include project status and related work in readme by @lognaturel in https://github.com/XLSForm/pyxform/pull/700 + v2.0.2, 2024-01-26 * Generate translations for choice list used with search() by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/690 diff --git a/pyproject.toml b/pyproject.toml index 6861624b..56649263 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "pyxform" -version = "2.0.0" +version = "2.0.3" authors = [ {name = "github.com/xlsform", email = "info@xlsform.org"}, ] diff --git a/pyxform/__init__.py b/pyxform/__init__.py index a47e1550..0073a72b 100644 --- a/pyxform/__init__.py +++ b/pyxform/__init__.py @@ -4,7 +4,7 @@ Collect easy. """ -__version__ = "2.0.2" +__version__ = "2.0.3" from pyxform.builder import ( SurveyElementBuilder, From 591394b2554313d5ad9125b72146e4d8c3a114e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Thu, 18 Apr 2024 12:40:46 -0700 Subject: [PATCH 2/3] Update support email address to one that is monitored --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 56649263..08808cfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "pyxform" version = "2.0.3" authors = [ - {name = "github.com/xlsform", email = "info@xlsform.org"}, + {name = "github.com/xlsform", email = "support@getodk.org"}, ] description = "A Python package to create XForms for ODK Collect." readme = "README.rst" From ea21a6066537c783354f8a115646c09a8f907a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Thu, 18 Apr 2024 12:39:42 -0700 Subject: [PATCH 3/3] Fix readme formatting --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 2eb125c0..271e4686 100644 --- a/README.rst +++ b/README.rst @@ -107,7 +107,7 @@ Before committing, make sure to format and lint the code using ``ruff``:: ruff format pyxform tests ruff check pyxform tests -If you are using a copy of ``ruff`` outside your virtualenv, make sure it is the same version as listed in ``pyproject.toml``. Use the project configuration for ``ruff` in ``pyproject.toml``, which occurs automatically if ``ruff`` is run from the project root (where ``pyproject.toml`` is). +If you are using a copy of ``ruff`` outside your virtualenv, make sure it is the same version as listed in ``pyproject.toml``. Use the project configuration for ``ruff`` in ``pyproject.toml``, which occurs automatically if ``ruff`` is run from the project root (where ``pyproject.toml`` is). Contributions ------------- @@ -126,9 +126,9 @@ Documentation For developers, ``pyxform`` uses docstrings, type annotations, and test cases. Most modern IDEs can display docstrings and type annotations in a easily navigable format, so no additional docs are compiled (e.g. sphinx). In addition to the user documentation, developers should be familiar with the `ODK XForms Specification https://getodk.github.io/xforms-spec/`. For users, ``pyxform`` has documentation at the following locations: -* `XLSForm docs https://xlsform.org/` -* `XLSForm template https://docs.google.com/spreadsheets/d/1v9Bumt3R0vCOGEKQI6ExUf2-8T72-XXp_CbKKTACuko/edit#gid=1052905058` -* `ODK Docs https://docs.getodk.org/` +* `XLSForm docs `_ +* `XLSForm template `_ +* `ODK Docs `_ Change Log ==========