Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dj-python to new release #97

Merged
merged 2 commits into from
Mar 24, 2021
Merged

Update dj-python to new release #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f0c425
Update dj-python to new release.
guzman-raphael Mar 24, 2021
f163e1e
Fix typi.
guzman-raphael Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 `datajoint` to newly released `0.13.0`.

## [0.1.0b2] - 2021-03-12

### Fixed
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions pharus/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
flask
gunicorn
pyjwt[crypto]
datajoint==0.13.dev5
datajoint>=0.13.0
datajoint_connection_hub