Merge branch 'develop' into log-scale

Author: BrianThomasRoss

.github/workflows/pythonapp.yml

@@ -43,7 +43,7 @@ jobs:
         python -m pytest
     - name: Run App
       run: |
-        PARAMETERS=./defaults/cypress.cfg streamlit run st_app.py &
+        PARAMETERS=./defaults/cypress.cfg ASSETS=./defaults/assets streamlit run st_app.py &
     - name: Cypress
       uses: cypress-io/github-action@v1
       with:

Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.7.7-slim-buster
+ENV ASSETS=./defaults/assets/
 ENV PARAMETERS=./defaults/webapp.cfg
+ENV PORT=8000
 WORKDIR /app
 COPY README.md .
 COPY setup.cfg .
@@ -11,5 +13,4 @@ COPY src src
 COPY st_app.py st_app.py
 RUN pip install -q .
 
-CMD ["streamlit", "run", "st_app.py"]
-
+CMD STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py

Pipfile

@@ -19,6 +19,7 @@ PyYAML = "*"
 python-i18n = "*"
 gspread="*"
 oauth2client="*"
+penn-chime = {path = "."}
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -1 +1 @@
-web: PARAMETERS=defaults/webapp.cfg STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py
+web: PARAMETERS=./defaults/webapp.cfg ASSETS=./defaults/assets STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py

Procfile

@@ -6,7 +6,7 @@
 --icu-rate 0.0075
 --infectious-days 10
 --market-share 0.15
---n-days 100
+--n-days 30
 --population 3600000
 --recovered 0
 --relative-contact-rate 0.45