Feat/dev 551 add batch tables (#349)

* Bump gdc-ng-models version

Ugprade gdc-ng-models version to include new Batch and BatchMembership
tables

* add new files for batch tables

* DEV-551 update gdc-ng-models tag

* DEV-551 pin setuptools-scm range

* DEV-551 pin gdc-ng-models tag to 1.5.2-rc.3

* DEV-551 update gdcdictionary and psqlgraph pins

* DEV-551 add newline at end of file

.gitignore

@@ -69,4 +69,7 @@ target/
 # vim
 *.swp
 
+# pyenv
+*.python-version
+
 .mypy_cache/

gdcdatamodel/models/__init__.py

@@ -38,6 +38,7 @@
     qcreport,
     released_data,
     studyrule,
+    batch
 )
 
 from sqlalchemy import (

gdcdatamodel/models/batch.py

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

requirements.txt

@@ -6,9 +6,9 @@
 #
 attrs==19.3.0
     # via jsonschema
-git+https://github.com/NCI-GDC/[email protected].1#egg=gdc-ng-models
+git+https://github.com/NCI-GDC/[email protected].3#egg=gdc-ng-models
     # via gdcdatamodel (setup.py)
-git+https://github.com/NCI-GDC/[email protected]#egg=gdcdictionary
+git+https://github.com/NCI-GDC/[email protected].1-rc.0#egg=gdcdictionary
     # via gdcdatamodel (setup.py)
 graphviz==0.4.10
     # via gdcdatamodel (setup.py)
@@ -18,7 +18,7 @@ jsonschema==3.2.0
     # via
     #   gdcdatamodel (setup.py)
     #   gdcdictionary
-git+https://github.com/NCI-GDC/[email protected].2#egg=psqlgraph
+git+https://github.com/NCI-GDC/[email protected].3#egg=psqlgraph
     # via gdcdatamodel (setup.py)
 psycopg2==2.8.5
     # via psqlgraph

setup.py

@@ -6,15 +6,15 @@
         "local_scheme": "dirty-tag",
         "write_to": "gdcdatamodel/_version.py",
     },
-    setup_requires=["setuptools_scm"],
+    setup_requires=["setuptools_scm<6"],
     packages=find_packages(),
     install_requires=[
         "pytz~=2020.1",
         "graphviz==0.4.10",
         "jsonschema~=3.2",
-        "gdcdictionary @ git+https://github.com/NCI-GDC/[email protected]#egg=gdcdictionary",
-        "gdc-ng-models @ git+https://github.com/NCI-GDC/[email protected].1#egg=gdc-ng-models",
-        "psqlgraph @ git+https://github.com/NCI-GDC/[email protected].2#egg=psqlgraph",
+        "gdcdictionary @ git+https://github.com/NCI-GDC/[email protected].1-rc.0#egg=gdcdictionary",
+        "gdc-ng-models @ git+https://github.com/NCI-GDC/[email protected].3#egg=gdc-ng-models",
+        "psqlgraph @ git+https://github.com/NCI-GDC/[email protected].3#egg=psqlgraph",
     ],
     extras_require={
         'python_version == "2.7"': [