Merge remote-tracking branch 'upstream/develop' into develop

Author: mangala915

.github/workflows/pythonapp.yml

@@ -15,7 +15,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.8
@@ -33,17 +32,31 @@ jobs:
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Check formatting with black
+      run: |
+        # exit if any files still need formatting
+        bash script/format --check
+      continue-on-error: true
     - name: Test with pytest
       run: |
         pip install pytest
         python -m pytest
     - name: Run App
       run: |
-        streamlit run src/app.py &
+        PARAMETERS=./defaults/cypress.cfg streamlit run src/app.py &
     - name: Cypress
-      uses: cypress-io/github-action@v1.23.2
+      uses: cypress-io/github-action@v1
       with:
         working-directory: e2e
         wait-on: 'http://localhost:8000'
         wait-on-timeout: 300
-
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: cypress-screenshots
+        path: e2e/cypress/screenshots
+    - uses: actions/upload-artifact@v1
+      if: always()
+      with:
+        name: cypress-videos
+        path: e2e/cypress/videos

.gitignore

@@ -1,5 +1,6 @@
 # Editors
 .idea/
+.vscode/settings.json
 
 # Environments
 .env

Dockerfile

@@ -1,16 +1,13 @@
 FROM python:3.7.7-slim-buster
-RUN mkdir /app
+ENV PARAMETERS=./defaults/webapp.cfg
 WORKDIR /app
 COPY README.md .
 COPY setup.cfg .
 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 defaults defaults
 COPY src src
+RUN pip install -q .
 
 CMD ["streamlit", "run", "src/app.py"]
 

Dockerfile.dash

@@ -4,11 +4,14 @@ WORKDIR /code
 
 ARG PORT
 ENV PORT $PORT
+ENV PARAMETERS=./defaults/webapp.cfg
 
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
-
+COPY README.md .
+COPY setup.py .
+COPY setup.cfg .
 COPY src src 
+COPY defaults ./src/defaults
+RUN pip install -q .
 
 # EXPOSE $PORT 
 

Pipfile

@@ -4,12 +4,13 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+black = "==19.10b0"
+pytest = "*"
 
 [packages]
 streamlit = "*"
 pandas = "*"
 numpy = "*"
-pytest = "*"
 altair = "*"
 dash = "*"
 dash-bootstrap-components = "*"
@@ -18,3 +19,6 @@ PyYAML = "*"
 
 [requires]
 python_version = "3.7"
+
+[pipenv]
+allow_prereleases = true