Merge branch 'develop' into feature/habitat_service_support

Author: themightychris

.gitignore

@@ -1,5 +1,6 @@
 # Editors
 .vscode/
+.idea/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -16,4 +17,13 @@ venv.bak/
 # mypy
 .mypy_cache/
 __pycache__/
+
+# Module trash
+*.egg-info
+
+# Notebooks
+devel.ipynb
+.ipynb_checkpoints
+
+# build artifacts
 results/

Dockerfile

@@ -1,13 +1,15 @@
 FROM python:3.7.7-slim-buster
-
-COPY .streamlit ~/
-
-COPY ./requirements.txt /app/requirements.txt
-
+RUN mkdir /app
 WORKDIR /app
-
-RUN pip install -q -r requirements.txt
-
-COPY . ./
+COPY README.md .
+COPY setup.py .
+COPY requirements.txt .
+# Creating an empty src dir is a (hopefully) temporary hack to improve layer caching and speed up image builds
+# todo fix once the Pipfile, setup.py, requirements.txt, pyprojec.toml build/dist story is figured out
+RUN mkdir src && pip install -q .
+COPY .streamlit .streamlit
+COPY settings.cfg .
+COPY src src
 
 CMD ["streamlit", "run", "src/app.py"]
+

Dockerfile.dash

@@ -0,0 +1,12 @@
+FROM python:3.7.7-slim-buster
+
+WORKDIR /code 
+
+COPY requirements.txt requirements.txt
+RUN pip install -q -r requirements.txt
+
+COPY src src 
+
+# EXPOSE $PORT 
+
+CMD gunicorn dash_app:server --bind 0.0.0.0:$PORT --chdir src/

Pipfile

@@ -4,13 +4,17 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-pytest = "*"
 
 [packages]
 streamlit = "*"
 pandas = "*"
 numpy = "*"
+pytest = "*"
 altair = "*"
+dash = "*"
+dash-bootstrap-components = "*"
+gunicorn = "*"
+PyYAML = "*"
 
 [requires]
 python_version = "3.7"