Merge branch 'develop' into develop

Author: BrianThomasRoss

.github/workflows/infra-deploy.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0  # Get full history for tag lookup
       - uses: azure/setup-kubectl@v1
         with:
-          version: v1.18.0
+          version: v1.18.2
 
       - name: Add kubeconfig to environment
         run: |

.github/workflows/infra-release.yml

@@ -246,7 +246,7 @@ jobs:
     steps:
       - uses: azure/setup-kubectl@v1
         with:
-          version: v1.18.0
+          version: v1.18.2
 
       - name: Add kubeconfig to environment
         run: |
@@ -331,12 +331,14 @@ jobs:
     needs: publish-manifests
     if: github.event_name == 'release' && ! github.event.release.prerelease
     runs-on: ubuntu-latest
+    env:
+      KUBE_CONFIG_DATA: ${{ secrets.kubeconfig_data_prod }}
 
     steps:
       - uses: actions/checkout@v2
       - uses: azure/setup-kubectl@v1
         with:
-          version: v1.18.0
+          version: v1.18.2
 
       - name: Add kubeconfig to environment
         run: |

.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,14 +1,16 @@
 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 .
 COPY setup.py .
+COPY MANIFEST.in .
 COPY .streamlit .streamlit
 COPY defaults defaults
 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

MANIFEST.in

@@ -0,0 +1 @@
+include src/penn_chime/locales/*.yml

Pipfile

@@ -16,6 +16,10 @@ dash = "*"
 dash-bootstrap-components = "*"
 gunicorn = "*"
 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