From 0423e1ecbf628ff1605997a4fc37f4773b559311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= Date: Thu, 5 Sep 2024 15:07:27 -0700 Subject: [PATCH] Upgrade dependencies, prepare for release --- CHANGES.txt | 7 +++++++ README.rst | 2 +- pyproject.toml | 10 +++++----- pyxform/__init__.py | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2bf36685..417d820d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,12 @@ Pyxform Changelog +v2.1.0, 2024-09-05 +* Require Python 3.10, 3.11 or 3.12 by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/706 +* Detect instance expressions with double quotes by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/709 +* Library API for non-path input, accept markdown and dict input by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/712 +* Allow whitespace on either side of main header delimiter by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/718 +* Support offline entities spec v2024.1.0 via opt-in setting by @lindsay-stevens in https://github.com/XLSForm/pyxform/pull/719 + 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 diff --git a/README.rst b/README.rst index eac4c64b..db987646 100644 --- a/README.rst +++ b/README.rst @@ -138,7 +138,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 ``kwargs.get("run_odk_validate", True)`` in ``tests/pyxform_test_case.py``. +2. Run all tests through Validate by setting the default for ``run_odk_validate`` to ``True`` in ``tests/pyxform_test_case.py``. 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. diff --git a/pyproject.toml b/pyproject.toml index 436947e1..a72dd9a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "pyxform" -version = "2.0.3" +version = "2.1.0" authors = [ {name = "github.com/xlsform", email = "support@getodk.org"}, ] @@ -9,7 +9,7 @@ readme = "README.rst" requires-python = ">=3.10" dependencies = [ "xlrd==2.0.1", # Read XLS files - "openpyxl==3.1.2", # Read XLSX files + "openpyxl==3.1.3", # Read XLSX files "defusedxml==0.7.1", # Parse XML ] @@ -17,9 +17,9 @@ dependencies = [ # Install with `pip install pyxform[dev]`. dev = [ "formencode==2.1.0", # Compare XML - "lxml==5.2.2", # XPath test expressions - "psutil==5.9.8", # Process info for performance tests - "ruff==0.4.5", # Format and lint + "lxml==5.3.0", # XPath test expressions + "psutil==6.0.0", # Process info for performance tests + "ruff==0.6.4", # Format and lint ] [project.urls] diff --git a/pyxform/__init__.py b/pyxform/__init__.py index 0073a72b..5bddfda9 100644 --- a/pyxform/__init__.py +++ b/pyxform/__init__.py @@ -4,7 +4,7 @@ Collect easy. """ -__version__ = "2.0.3" +__version__ = "2.1.0" from pyxform.builder import ( SurveyElementBuilder,