Skip to content

Commit

Permalink
feat(study): add new studyrule and released_data models (#309)
Browse files Browse the repository at this point in the history
DEV-106: add new studyrule and released_data models
Added references to studyrule and released_data models from ng_models

Co-authored-by: ProfOak <OpenProfOak@gmail.com>
  • Loading branch information
kulgan and ProfOak committed Apr 28, 2020
1 parent 171d251 commit 45a1b09
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion gdcdatamodel/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
submission,
redaction,
qcreport,
released_data,
studyrule,
)

from sqlalchemy import (
Expand Down Expand Up @@ -356,7 +358,7 @@ def node_id(self, value):
'additionalProperties', 'links', 'properties',
'uniqueKeys', 'id' ]
attributes['_dictionary'] = {
key: schema[key] for key in schema if key not in skipped_dict_vals
key: schema[key] for key in schema if key not in skipped_dict_vals
}

# _pg_links are out_edges, links TO other types
Expand Down
1 change: 1 addition & 0 deletions gdcdatamodel/models/released_data.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from gdc_ng_models.models.released_data import *
1 change: 1 addition & 0 deletions gdcdatamodel/models/studyrule.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from gdc_ng_models.models.studyrule import *
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ future
SQLAlchemy==1.3.3
git+https://github.com/NCI-GDC/psqlgraph.git@2.0.0#egg=psqlgraph
git+https://github.com/NCI-GDC/gdcdictionary.git@2.1.0#egg=gdcdictionary
git+https://github.com/NCI-GDC/gdc-ng-models.git@1.1.0#egg=gdc-ng-models

git+https://github.com/NCI-GDC/gdc-ng-models.git@1.2.0-alpha##egg=gdc-ng-models
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='gdcdatamodel',
version="2.1.0",
version="2.2.0",
packages=find_packages(),
install_requires=[
'pytz',
Expand Down

0 comments on commit 45a1b09

Please sign in to comment.