diff --git a/CHANGES.txt b/CHANGES.txt index 00e22207..b94cffc6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,8 @@ Pyxform Changelog +v1.12.2, 2023-09-15 +* Alias list_name to dataset in entities sheet by @lognaturel in https://github.com/XLSForm/pyxform/pull/654 + v1.12.1, 2023-05-16 * Pass through itemset ref case by @lognaturel in https://github.com/XLSForm/pyxform/pull/644 diff --git a/README.rst b/README.rst index 68aa100b..c6b4ab60 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ =============== -pyxform v1.12.1 +pyxform v1.12.2 =============== |python| |black| diff --git a/pyxform/__init__.py b/pyxform/__init__.py index ba05c54b..8a0b5cc8 100644 --- a/pyxform/__init__.py +++ b/pyxform/__init__.py @@ -4,7 +4,7 @@ Collect easy. """ -__version__ = "1.12.1" +__version__ = "1.12.2" from pyxform.builder import ( SurveyElementBuilder, diff --git a/pyxform/validators/odk_validate/.last_check b/pyxform/validators/odk_validate/.last_check index a13c0280..8796f9f2 100644 --- a/pyxform/validators/odk_validate/.last_check +++ b/pyxform/validators/odk_validate/.last_check @@ -1 +1 @@ -2022-02-15T16:24:49Z \ No newline at end of file +2023-09-16T04:49:23Z \ No newline at end of file diff --git a/pyxform/validators/odk_validate/bin/ODK_Validate.jar b/pyxform/validators/odk_validate/bin/ODK_Validate.jar index 50f179da..e60eb8e7 100755 Binary files a/pyxform/validators/odk_validate/bin/ODK_Validate.jar and b/pyxform/validators/odk_validate/bin/ODK_Validate.jar differ diff --git a/pyxform/validators/odk_validate/bin/installed.json b/pyxform/validators/odk_validate/bin/installed.json index bb258aa2..efbfe0e3 100644 --- a/pyxform/validators/odk_validate/bin/installed.json +++ b/pyxform/validators/odk_validate/bin/installed.json @@ -1,17 +1,17 @@ { "assets": [ { - "browser_download_url": "https://github.com/getodk/validate/releases/download/v1.17.0/ODK-Validate-v1.17.0.jar", + "browser_download_url": "https://github.com/getodk/validate/releases/download/v1.18.0/ODK-Validate-v1.18.0.jar", "content_type": "application/java-archive", - "created_at": "2022-01-25T17:40:00Z", - "download_count": 20, - "id": 54930301, + "created_at": "2023-09-16T04:28:56Z", + "download_count": 1, + "id": 126294873, "label": null, - "name": "ODK-Validate-v1.17.0.jar", - "node_id": "RA_kwDOAmc2ms4DRit9", - "size": 1692279, + "name": "ODK-Validate-v1.18.0.jar", + "node_id": "RA_kwDOAmc2ms4HhxtZ", + "size": 5618270, "state": "uploaded", - "updated_at": "2022-01-25T17:40:03Z", + "updated_at": "2023-09-16T04:28:57Z", "uploader": { "avatar_url": "https://github.com/avatars/u/967540?v=4", "events_url": "https://github.com/gitapi/users/lognaturel/events{/privacy}", @@ -32,10 +32,10 @@ "type": "User", "url": "https://github.com/gitapi/users/lognaturel" }, - "url": "https://github.com/gitapi/repos/getodk/validate/releases/assets/54930301" + "url": "https://github.com/gitapi/repos/getodk/validate/releases/assets/126294873" } ], - "assets_url": "https://github.com/gitapi/repos/getodk/validate/releases/57942979/assets", + "assets_url": "https://github.com/gitapi/repos/getodk/validate/releases/121394106/assets", "author": { "avatar_url": "https://github.com/avatars/u/967540?v=4", "events_url": "https://github.com/gitapi/users/lognaturel/events{/privacy}", @@ -56,20 +56,20 @@ "type": "User", "url": "https://github.com/gitapi/users/lognaturel" }, - "body": "## What's Changed\r\n* https://github.com/getodk/validate/pull/86 Validate forms with itemsets using external instances and custom refs\r\n * H\u00e9l\u00e8ne Martin @lognaturel (ODK)\r\n\r\n**Full Changelog**: https://github.com/getodk/validate/compare/v1.16.0...v1.17.0", - "created_at": "2022-01-25T17:36:01Z", + "body": "## What's Changed\r\n* Upgrade [JavaRosa to 4.2.0](https://github.com/getodk/javarosa/releases/tag/v4.2.0) by @lognaturel in https://github.com/getodk/validate/pull/89\r\n\r\n\r\n**Full Changelog**: https://github.com/getodk/validate/compare/v1.17.0...v1.18.0", + "created_at": "2023-09-16T04:14:54Z", "draft": false, - "html_url": "https://github.com/getodk/validate/releases/tag/v1.17.0", - "id": 57942979, + "html_url": "https://github.com/getodk/validate/releases/tag/v1.18.0", + "id": 121394106, "mentions_count": 1, - "name": "ODK Validate v1.17.0", - "node_id": "RE_kwDOAmc2ms4DdCPD", + "name": "v1.18.0", + "node_id": "RE_kwDOAmc2ms4HPFO6", "prerelease": false, - "published_at": "2022-01-25T17:38:06Z", - "tag_name": "v1.17.0", - "tarball_url": "https://github.com/gitapi/repos/getodk/validate/tarball/v1.17.0", + "published_at": "2023-09-16T04:23:43Z", + "tag_name": "v1.18.0", + "tarball_url": "https://github.com/gitapi/repos/getodk/validate/tarball/v1.18.0", "target_commitish": "master", - "upload_url": "https://uploads.github.com/repos/getodk/validate/releases/57942979/assets{?name,label}", - "url": "https://github.com/gitapi/repos/getodk/validate/releases/57942979", - "zipball_url": "https://github.com/gitapi/repos/getodk/validate/zipball/v1.17.0" + "upload_url": "https://uploads.github.com/repos/getodk/validate/releases/121394106/assets{?name,label}", + "url": "https://github.com/gitapi/repos/getodk/validate/releases/121394106", + "zipball_url": "https://github.com/gitapi/repos/getodk/validate/zipball/v1.18.0" } \ No newline at end of file diff --git a/pyxform/validators/updater.py b/pyxform/validators/updater.py index 73e5994b..6a6515f4 100644 --- a/pyxform/validators/updater.py +++ b/pyxform/validators/updater.py @@ -539,9 +539,8 @@ def _install_check(bin_file_path=None): class ODKValidateUpdater(_UpdateService): def __init__(self): self.update_info = _UpdateInfo( - api_url="https://github.com/gitapi/repos/opendatakit/validate/" - "releases/latest", - repo_url="https://github.com/opendatakit/validate", + api_url="https://github.com/gitapi/repos/getodk/validate/" "releases/latest", + repo_url="https://github.com/getodk/validate", validate_subfolder="odk_validate", install_check=self._install_check, validator_basename=os.path.basename(odk_validate.ODK_VALIDATE_PATH), diff --git a/setup.py b/setup.py index 6d37f9cb..22a39b2e 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="pyxform", - version="1.12.1", + version="1.12.2", author="github.com/xlsform", author_email="info@xlsform.org", packages=find_packages(exclude=["tests", "tests.*"]),