Skip to content

Commit

Permalink
Update Validate to fix support for geojson (#727)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lognaturel
lognaturel authored Oct 9, 2024
1 parent e1ed282 commit ca007de
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 64 deletions.
2 changes: 1 addition & 1 deletion pyxform/validators/odk_validate/.last_check
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-09-09T20:10:06Z
2024-10-09T16:57:49Z
Binary file modified pyxform/validators/odk_validate/bin/ODK_Validate.jar
View file
Binary file not shown.
120 changes: 60 additions & 60 deletions pyxform/validators/odk_validate/bin/installed.json
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
{
"url": "https://api.github.com/repos/getodk/validate/releases/179158403",
"assets_url": "https://api.github.com/repos/getodk/validate/releases/179158403/assets",
"upload_url": "https://uploads.github.com/repos/getodk/validate/releases/179158403/assets{?name,label}",
"html_url": "https://github.com/getodk/validate/releases/tag/v1.19.2",
"id": 179158403,
"author": {
"login": "lognaturel",
"id": 967540,
"node_id": "MDQ6VXNlcjk2NzU0MA==",
"avatar_url": "https://avatars.githubusercontent.com/u/967540?v=4",
"gravatar_id": "",
"url": "https://api.github.com/users/lognaturel",
"html_url": "https://github.com/lognaturel",
"followers_url": "https://api.github.com/users/lognaturel/followers",
"following_url": "https://api.github.com/users/lognaturel/following{/other_user}",
"gists_url": "https://api.github.com/users/lognaturel/gists{/gist_id}",
"starred_url": "https://api.github.com/users/lognaturel/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/lognaturel/subscriptions",
"organizations_url": "https://api.github.com/users/lognaturel/orgs",
"repos_url": "https://api.github.com/users/lognaturel/repos",
"events_url": "https://api.github.com/users/lognaturel/events{/privacy}",
"received_events_url": "https://api.github.com/users/lognaturel/received_events",
"type": "User",
"site_admin": false
},
"node_id": "RE_kwDOAmc2ms4Krb2D",
"tag_name": "v1.19.2",
"target_commitish": "master",
"name": "v1.19.2",
"draft": false,
"prerelease": false,
"created_at": "2024-10-09T16:54:24Z",
"published_at": "2024-10-09T16:56:20Z",
"assets": [
{
"browser_download_url": "https://github.com/getodk/validate/releases/download/v1.19.1/ODK-Validate-v1.19.1.jar",
"content_type": "application/java-archive",
"created_at": "2024-09-09T20:07:24Z",
"download_count": 0,
"id": 191546524,
"url": "https://api.github.com/repos/getodk/validate/releases/assets/197958252",
"id": 197958252,
"node_id": "RA_kwDOAmc2ms4LzJps",
"name": "ODK-Validate-v1.19.2.jar",
"label": null,
"name": "ODK-Validate-v1.19.1.jar",
"node_id": "RA_kwDOAmc2ms4LasSc",
"size": 3907275,
"state": "uploaded",
"updated_at": "2024-09-09T20:07:25Z",
"uploader": {
"login": "lognaturel",
"id": 967540,
"node_id": "MDQ6VXNlcjk2NzU0MA==",
"avatar_url": "https://avatars.githubusercontent.com/u/967540?v=4",
"events_url": "https://api.github.com/users/lognaturel/events{/privacy}",
"gravatar_id": "",
"url": "https://api.github.com/users/lognaturel",
"html_url": "https://github.com/lognaturel",
"followers_url": "https://api.github.com/users/lognaturel/followers",
"following_url": "https://api.github.com/users/lognaturel/following{/other_user}",
"gists_url": "https://api.github.com/users/lognaturel/gists{/gist_id}",
"gravatar_id": "",
"html_url": "https://github.com/lognaturel",
"id": 967540,
"login": "lognaturel",
"node_id": "MDQ6VXNlcjk2NzU0MA==",
"organizations_url": "https://api.github.com/users/lognaturel/orgs",
"received_events_url": "https://api.github.com/users/lognaturel/received_events",
"repos_url": "https://api.github.com/users/lognaturel/repos",
"site_admin": false,
"starred_url": "https://api.github.com/users/lognaturel/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/lognaturel/subscriptions",
"organizations_url": "https://api.github.com/users/lognaturel/orgs",
"repos_url": "https://api.github.com/users/lognaturel/repos",
"events_url": "https://api.github.com/users/lognaturel/events{/privacy}",
"received_events_url": "https://api.github.com/users/lognaturel/received_events",
"type": "User",
"url": "https://api.github.com/users/lognaturel"
"site_admin": false
},
"url": "https://api.github.com/repos/getodk/validate/releases/assets/191546524"
"content_type": "application/java-archive",
"state": "uploaded",
"size": 5862216,
"download_count": 0,
"created_at": "2024-10-09T17:03:19Z",
"updated_at": "2024-10-09T17:03:21Z",
"browser_download_url": "https://github.com/getodk/validate/releases/download/v1.19.2/ODK-Validate-v1.19.2.jar"
}
],
"assets_url": "https://api.github.com/repos/getodk/validate/releases/174204103/assets",
"author": {
"avatar_url": "https://avatars.githubusercontent.com/u/967540?v=4",
"events_url": "https://api.github.com/users/lognaturel/events{/privacy}",
"followers_url": "https://api.github.com/users/lognaturel/followers",
"following_url": "https://api.github.com/users/lognaturel/following{/other_user}",
"gists_url": "https://api.github.com/users/lognaturel/gists{/gist_id}",
"gravatar_id": "",
"html_url": "https://github.com/lognaturel",
"id": 967540,
"login": "lognaturel",
"node_id": "MDQ6VXNlcjk2NzU0MA==",
"organizations_url": "https://api.github.com/users/lognaturel/orgs",
"received_events_url": "https://api.github.com/users/lognaturel/received_events",
"repos_url": "https://api.github.com/users/lognaturel/repos",
"site_admin": false,
"starred_url": "https://api.github.com/users/lognaturel/starred{/owner}{/repo}",
"subscriptions_url": "https://api.github.com/users/lognaturel/subscriptions",
"type": "User",
"url": "https://api.github.com/users/lognaturel"
},
"body": "## What's Changed\r\n* Exclude unused dependencies to reduce file size by @lognaturel in https://github.com/getodk/validate/pull/93\r\n\r\n\r\n**Full Changelog**: https://github.com/getodk/validate/compare/v1.19.0...v1.19.1",
"created_at": "2024-09-09T20:05:28Z",
"draft": false,
"html_url": "https://github.com/getodk/validate/releases/tag/v1.19.1",
"id": 174204103,
"mentions_count": 1,
"name": "v1.19.1",
"node_id": "RE_kwDOAmc2ms4KYiTH",
"prerelease": false,
"published_at": "2024-09-09T20:06:35Z",
"tag_name": "v1.19.1",
"tarball_url": "https://api.github.com/repos/getodk/validate/tarball/v1.19.1",
"target_commitish": "master",
"upload_url": "https://uploads.github.com/repos/getodk/validate/releases/174204103/assets{?name,label}",
"url": "https://api.github.com/repos/getodk/validate/releases/174204103",
"zipball_url": "https://api.github.com/repos/getodk/validate/zipball/v1.19.1"
}
"tarball_url": "https://api.github.com/repos/getodk/validate/tarball/v1.19.2",
"zipball_url": "https://api.github.com/repos/getodk/validate/zipball/v1.19.2",
"body": "## What's Changed\r\n* Add back jackson dependency by @lognaturel in https://github.com/getodk/validate/pull/95\r\n\r\n\r\n**Full Changelog**: https://github.com/getodk/validate/compare/v1.19.1...v1.19.2",
"mentions_count": 1
}
5 changes: 2 additions & 3 deletions pyxform/validators/updater.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,8 @@ def _install_check(bin_file_path=None):
class ODKValidateUpdater(_UpdateService):
def __init__(self):
self.update_info = _UpdateInfo(
api_url="https://api.github.com/repos/opendatakit/validate/"
"releases/latest",
repo_url="https://github.com/opendatakit/validate",
api_url="https://api.github.com/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),
Expand Down

0 comments on commit ca007de

Please sign in to comment.