Merge branch 'develop' into PhilMiller/model-performance

Author: jlubken

.github/workflows/pythonapp.yml

@@ -41,9 +41,18 @@ jobs:
       run: |
         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

e2e/cypress.json

@@ -1,3 +1,5 @@
 {
-    "baseUrl": "http://localhost:8000"
+    "baseUrl": "http://localhost:8000",
+    "viewportWidth": 1200,
+    "viewportHeight": 660
 }

e2e/cypress/integration/tests/steppers.spec.js

@@ -8,12 +8,12 @@ context('Increment steppers', () => {
   it('Increment regional population', () => {
     cy.contains('Hospitalized Admissions peaks at 300');
 
-    cy.get('input.st-al').eq(0)
+    cy.get('input[type=number]').eq(0)
       .should('has.value', '3600000');
 
     cy.get('.step-up').eq(0).click();
 
-    cy.get('input.st-al').eq(0)
+    cy.get('input[type=number]').eq(0)
       .should('has.value', '3600001');
 
     cy.contains('Hospitalized Admissions peaks at 300');
@@ -22,12 +22,12 @@ context('Increment steppers', () => {
   it('Increment hospital market share', () => {
     cy.contains('Hospitalized Admissions peaks at 300');
 
-    cy.get('input.st-al').eq(1)
+    cy.get('input[type=number]').eq(1)
       .should('has.value', '15');
 
     cy.get('.step-up').eq(1).click();
 
-    cy.get('input.st-al').eq(1)
+    cy.get('input[type=number]').eq(1)
       .should('has.value', '15.1');
 
     cy.contains('Hospitalized Admissions peaks at 302');
@@ -36,12 +36,12 @@ context('Increment steppers', () => {
   it('Increment doubling time', () => {
     cy.contains('Hospitalized Admissions peaks at 300');
 
-    cy.get('input.st-al').eq(3)
+    cy.get('input[type=number]').eq(3)
       .should('has.value', '4');
 
     cy.get('.step-up').eq(3).click();
 
-    cy.get('input.st-al').eq(3)
+    cy.get('input[type=number]').eq(3)
       .should('has.value', '4.25');
 
     cy.contains('Hospitalized Admissions peaks at 272');

setup.py

@@ -1,6 +1,6 @@
 """Setup file for chime
 """
-__version__ = "1.1.2"
+__version__ = "1.1.2"  # update VERSION in constants.py
 __author__ = "Predictive Healthcare @ Penn Medicine"
 
 from os import path
@@ -30,7 +30,7 @@
         "dash",
         "dash_bootstrap_components",
         "pyyaml",
-        "gunicorn", 
+        "gunicorn",
         "selenium"
     ],
     classifiers=[

src/penn_chime/constants.py

@@ -8,6 +8,7 @@
 re-run their reports
 """
 CHANGE_DATE = date(year=2020, month=4, day=1)
+VERSION = 'v1.1.2'
 
 DATE_FORMAT = "%b, %d"  # see https://strftime.org
 DOCS_URL = "https://code-for-philly.gitbook.io/chime"

src/penn_chime/presentation.py

@@ -14,6 +14,7 @@
     EPSILON,
     FLOAT_INPUT_MIN,
     FLOAT_INPUT_STEP,
+    VERSION,
 )
 
 from .utils import dataframe_to_base64
@@ -282,8 +283,9 @@ def display_sidebar(st, d: Parameters) -> Parameters:
 
     # Build in desired order
     st.sidebar.markdown(
-        """**CHIME [v1.1.2](https://github.com/CodeForPhilly/chime/releases/tag/v1.1.1) ({change_date})**""".format(
-            change_date=CHANGE_DATE
+        """**CHIME [{version}](https://github.com/CodeForPhilly/chime/releases/tag/{version}) ({change_date})**""".format(
+            change_date=CHANGE_DATE,
+            version=VERSION,
         )
     )