feat(study): add new studyrule and released_data models (#309)

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>

gdcdatamodel/models/__init__.py

@@ -28,6 +28,8 @@
     submission,
     redaction,
     qcreport,
+    released_data,
+    studyrule,
 )
 
 from sqlalchemy import (
@@ -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

gdcdatamodel/models/released_data.py

@@ -0,0 +1 @@
+from gdc_ng_models.models.released_data import *

gdcdatamodel/models/studyrule.py

@@ -0,0 +1 @@
+from gdc_ng_models.models.studyrule import *

requirements.txt

@@ -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

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='gdcdatamodel',
-    version="2.1.0",
+    version="2.2.0",
     packages=find_packages(),
     install_requires=[
         'pytz',