Merge branch 'magdainit'

# Conflicts: # static/js/plots.js # templates/plots/numeric_tab.html # url_handlers/plots.py
dieterich-lab · Mar 27, 2020 · 4f31c6f · 4f31c6f
2 parents 55f21f7 + 9a05bdd
commit 4f31c6f
Show file tree

Hide file tree

Showing 67 changed files with 2,029 additions and 4,638 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/Pipfile b/Pipfile
@@ -15,26 +15,34 @@ pyyaml = "*"
 nltk = "*"
 redis = "*"
 ipython = "*"
-"pybind11" = "*"
+pybind11 = "*"
 python-dotenv = "*"
 click = "*"
 flask = "*"
-misc = {git = "https://bitbucket.org/bmmalone/misc.git"}
-autosklearn = {ref = "development",git = "https://github.com/automl/auto-sklearn.git"}
 flask-redis = "*"
 sklearn = "*"
 seaborn = "*"
 matplotlib = "*"
-"jinja2" = "*"
+jinja2 = "*"
 flask-login = "*"
 passlib = "*"
+plotly = "*"
 pytest = "*"
 apscheduler = "*"
 waitress = "*"
 ipdb = "*"
+sqlalchemy = "*"
+
 
 [dev-packages]
 pylint = "*"
 
 [requires]
 python_version = "3.7"
+
+[packages.misc]
+git = "https://bitbucket.org/bmmalone/misc.git"
+
+[packages.autosklearn]
+ref = "development"
+git = "https://github.com/automl/auto-sklearn.git"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/data_warehouse/create_redis_load_script.py b/data_warehouse/create_redis_load_script.py