From 7f0c425adf6b1fbceaf0a2e2a324474a7cf81392 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Wed, 24 Mar 2021 16:05:49 -0500 Subject: [PATCH 1/2] Update dj-python to new release. --- CHANGELOG.md | 5 +++++ pharus/server.py | 4 ++-- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e81c395..0e8e4db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention. +## [Unreleased] +### Changed +- Update to `datajoint` to newly released `0.13.0`. + ## [0.1.0b2] - 2021-03-12 ### Fixed @@ -50,6 +54,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and - Support for DataJoint attribute types: `varchar`, `int`, `float`, `datetime`, `date`, `time`, `decimal`, `uuid`. - Check dependency utility to determine child table references. +[Unreleased]: https://github.com/datajoint/pharus/compare/0.1.0b2...HEAD [0.1.0b2]: https://github.com/datajoint/pharus/compare/0.1.0b0...0.1.0b2 [0.1.0b0]: https://github.com/datajoint/pharus/compare/0.1.0a5...0.1.0b0 [0.1.0a5]: https://github.com/datajoint/pharus/releases/tag/0.1.0a5 \ No newline at end of file diff --git a/pharus/server.py b/pharus/server.py index d46b019..5044584 100644 --- a/pharus/server.py +++ b/pharus/server.py @@ -15,7 +15,7 @@ from json import loads from base64 import b64decode from datajoint.errors import IntegrityError -from datajoint.table import foregn_key_error_regexp +from datajoint.table import foreign_key_error_regexp from datajoint.utils import to_camel_case app = Flask(__name__) @@ -975,7 +975,7 @@ def delete_tuple(jwt_payload: dict) -> dict: for k, v in request.args.items() if k == 'cascade'},) return "Delete Sucessful" except IntegrityError as e: - match = foregn_key_error_regexp.match(e.args[0]) + match = foreign_key_error_regexp.match(e.args[0]) return dict(error=e.__class__.__name__, error_msg=str(e), child_schema=match.group('child').split('.')[0][1:-1], diff --git a/requirements.txt b/requirements.txt index d0581c4..8b6c2c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ flask gunicorn pyjwt[crypto] -datajoint==0.13.dev5 +datajoint>=0.13.0 datajoint_connection_hub From f163e1e2c12a11f4e82d517ede99ddbf0d6f74ee Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Wed, 24 Mar 2021 16:07:08 -0500 Subject: [PATCH 2/2] Fix typi. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e8e4db..f44b88d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and ## [Unreleased] ### Changed -- Update to `datajoint` to newly released `0.13.0`. +- Update `datajoint` to newly released `0.13.0`. ## [0.1.0b2] - 2021-03-12