Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
d2b7ca3
Merge pull request #199 from cmu-delphi/main
krivard Oct 4, 2021
19786cb
instead of hiding showForecasts button, gray out
nmdefries Oct 11, 2021
4e1d27c
small code fixes
nmdefries Oct 12, 2021
7ed6856
Revert "Merge pull request #196 from cmu-delphi/patch-asof-dates"
nmdefries Oct 13, 2021
6ed7d23
Revert "Merge pull request #193 from cmu-delphi/revert-template-refac…
nmdefries Oct 13, 2021
5cf4f34
bring up to date with dev
nmdefries Oct 13, 2021
150329d
styling
nmdefries Oct 13, 2021
09616c0
make sure score info appears at the right time
nmdefries Oct 13, 2021
0c2e20d
track colorseed in session var
nmdefries Oct 15, 2021
f9f5ebd
Merge branch 'add-template-refactor-back-plus-patches' into gray-out-…
nmdefries Oct 15, 2021
e39e0d4
styling
nmdefries Oct 15, 2021
c01f205
Merge branch 'add-template-refactor-back-plus-patches' into small-cod…
nmdefries Oct 15, 2021
4307e85
simplify and clarify filters, dim, joins
nmdefries Oct 15, 2021
6b1d006
move height setting, remove shape setting
nmdefries Oct 15, 2021
0a6b7a9
display full location names
nmdefries Oct 15, 2021
94ccbe2
Merge pull request #210 from cmu-delphi/fix-truth-plot-startup-colors
nmdefries Oct 18, 2021
0f49364
modify layout css to support resizing
nmdefries Oct 18, 2021
9c8f8d8
Merge pull request #211 from cmu-delphi/full-territory-names
nmdefries Oct 19, 2021
6ab76a9
Merge pull request #206 from cmu-delphi/fix-missing-messages
nmdefries Oct 19, 2021
ae709d6
Merge pull request #212 from cmu-delphi/fix-resizing
nmdefries Nov 5, 2021
e6a2fe8
Merge pull request #204 from cmu-delphi/small-code-simplifications
nmdefries Nov 5, 2021
36f014f
Merge pull request #202 from cmu-delphi/gray-out-show-forecasts
nmdefries Nov 5, 2021
8c1c056
move legend title setting to plotly::layout
nmdefries Dec 1, 2021
efaf9dc
move height setting back to layout
nmdefries Dec 1, 2021
8c51760
styling
nmdefries Dec 1, 2021
2af3a3c
Merge pull request #213 from cmu-delphi/fix-legend-labels
nmdefries Dec 2, 2021
bf965b3
Merge pull request #205 from cmu-delphi/add-template-refactor-back-pl…
nmdefries Dec 2, 2021
6340c6c
extend as-of dates
nmdefries Dec 2, 2021
6932c69
Merge pull request #214 from cmu-delphi/extend-asof-date-selection
nmdefries Dec 13, 2021
8024a48
force scoring pipeline to use old stable covidcast image
nmdefries Dec 14, 2021
34988d0
Merge pull request #216 from cmu-delphi/use-previous-docker-container
korlaxxalrok Dec 16, 2021
12af7f6
Revert "Force scoring pipeline to use old stable covidcast image"
nmdefries Dec 16, 2021
6bb6537
increase workflow timeout to 12 hours
nmdefries Jan 10, 2022
580e47f
actually just make that 24 hours
nmdefries Jan 10, 2022
91f484d
Merge pull request #219 from cmu-delphi/increase-timeout
korlaxxalrok Jan 13, 2022
a77be45
display warnings as they happen
nmdefries Jan 14, 2022
af9cbe3
Merge pull request #220 from cmu-delphi/instantaneous-display-warnings
nmdefries Jan 21, 2022
5b75aec
Merge pull request #218 from cmu-delphi/revert-216-use-previous-docke…
nmdefries Jan 26, 2022
a03c227
note CDDEP-ABM omission
nmdefries Jan 28, 2022
c9f7ac2
turn standard warn setting back on after pulling data
nmdefries Jan 31, 2022
31ba2d4
Merge pull request #222 from cmu-delphi/fewer-warnings
nmdefries Jan 31, 2022
53a365e
check if expected or previous forecasters are missing
nmdefries Jan 28, 2022
eacc27b
Merge branch 'dev' into ndefries/warn-if-missing-expected-models
nmdefries Feb 2, 2022
44b1a8a
styler
nmdefries Feb 2, 2022
ad7fe2c
correct score objects in checks
nmdefries Jan 28, 2022
182f791
styler
nmdefries Feb 2, 2022
ff4d234
typo
nmdefries Feb 2, 2022
55eeb35
add geo, signal to error; drop warning
nmdefries Feb 2, 2022
a904181
Merge pull request #221 from cmu-delphi/ndefries/warn-if-missing-expe…
nmdefries Feb 4, 2022
2acbaaf
bundle score obj erros
nmdefries Feb 17, 2022
57f65dc
styler
nmdefries Feb 17, 2022
a25dd79
Merge pull request #223 from cmu-delphi/ndefries/deduplicate-score-sa…
nmdefries Feb 17, 2022
844400d
document why particular forecasters aren't included
nmdefries Feb 18, 2022
9f0501a
styler
nmdefries Feb 18, 2022
19e0fdf
add brackets so signal col is returned as char not df
nmdefries Feb 20, 2022
afb7034
Merge pull request #227 from cmu-delphi/ndefries/check-signal-name-col
nmdefries Feb 21, 2022
d2e216e
Merge pull request #224 from cmu-delphi/ndefries/note-missing-models
nmdefries Feb 21, 2022
c855375
stop pipeline from removing future forecasts
nmdefries Feb 23, 2022
a9d28f3
dashboard to keep future predictions and always enable showForecasts …
nmdefries Feb 24, 2022
558caa6
allow truthPlot to show predictions for most recent as-of
nmdefries Feb 24, 2022
8f60b15
make sure score and truth plots have same x scale
nmdefries Feb 24, 2022
aa98690
styler
nmdefries Feb 24, 2022
b814c8c
save ts to S3 and have dashboard fetch it
nmdefries Feb 24, 2022
af51e54
pipeline to save data_pull ts to S3 bucket
nmdefries Feb 24, 2022
1380645
keep predictions for future dates
nmdefries Feb 24, 2022
4518a4f
styler
nmdefries Feb 24, 2022
e7726b5
styler
nmdefries Feb 24, 2022
0d2dbca
pull datetime file in makefile
nmdefries Feb 25, 2022
87e5daa
use current week end date to set plot axis range
nmdefries Feb 25, 2022
1b005b1
remove duplicate forecaster legend entries in truth plot
nmdefries Feb 25, 2022
aedfae6
Merge pull request #228 from cmu-delphi/ndefries/pipeline-save-ts
nmdefries Feb 28, 2022
8402fcf
if predictions aren't in the future, leave truth plot autoscaling on
nmdefries Mar 1, 2022
a5233f6
correct exclusion logic
nmdefries Mar 1, 2022
2c71344
generalize showing-predictions logic since some forecasters upload ea…
nmdefries Mar 1, 2022
873b236
revert truthplot legend formatting
nmdefries Mar 2, 2022
8bcda8f
Merge branch 'dev' into ndefries/display-future-predictions
nmdefries Mar 2, 2022
9eed7d7
styler
nmdefries Mar 2, 2022
40ac618
Switch to keep logic for 50/80/95
nmdefries Mar 4, 2022
0c2c211
switch to keep logic for all score/date filters
nmdefries Mar 4, 2022
6326cf3
styler
nmdefries Mar 4, 2022
1d50018
Merge pull request #229 from cmu-delphi/ndefries/display-future-predi…
nmdefries Mar 7, 2022
0ae89b2
set description, bumpversion, and app/global.R versions all to 4.2.0
nmdefries Mar 30, 2022
e33cb85
Merge pull request #230 from cmu-delphi/ndefries/match-description-bu…
nmdefries Mar 30, 2022
ea9fc00
chore: release 5.0.0
nmdefries Apr 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[bumpversion]
current_version = 5.0.0
commit = False
tag = False

[bumpversion:file:DESCRIPTION]

[bumpversion:file:app/global.R]
127 changes: 127 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# These settings are for any web project

# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto eol=lf

#
# The above will handle all files NOT found below
#

#
## These files are text and should be normalized (Convert crlf => lf)
#

# source code
*.php text
*.css text
*.sass text
*.scss text
*.less text
*.styl text
*.js text
*.ts text
*.coffee text
*.json text
*.htm text
*.html text
*.xml text
*.txt text
*.ini text
*.inc text
*.pl text
*.rb text
*.py text
*.scm text
*.sql text
*.sh text eof=LF
*.bat text

# templates
*.hbt text
*.jade text
*.haml text
*.hbs text
*.dot text
*.tmpl text
*.phtml text

# server config
.htaccess text

# git config
.gitattributes text
.gitignore text

# code analysis config
.jshintrc text
.jscsrc text
.jshintignore text
.csslintrc text

# misc config
*.yaml text
*.yml text
.editorconfig text

# build config
*.npmignore text
*.bowerrc text
Dockerfile text eof=LF

# Heroku
Procfile text
.slugignore text

# Documentation
*.md text
LICENSE text
AUTHORS text


#
## These files are binary and should be left untouched
#

# (binary is a macro for -text -diff)
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.mov binary
*.mp4 binary
*.mp3 binary
*.flv binary
*.fla binary
*.swf binary
*.gz binary
*.zip binary
*.7z binary
*.ttf binary
*.pyc binary
*.pdf binary

# Source files
# ============
*.pxd text
*.py text
*.py3 text
*.pyw text
*.pyx text
*.sh text eol=lf
*.json text

# Binary files
# ============
*.db binary
*.p binary
*.pkl binary
*.pyc binary
*.pyd binary
*.pyo binary

# Note: .db, .p, and .pkl files are associated
# with the python modules ``pickle``, ``dbm.*``,
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
# (among others).
28 changes: 28 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name-template: "v$RESOLVED_VERSION"
tag-template: "v$RESOLVED_VERSION"
categories:
- title: "📚 Content Changes"
labels:
- "blog"
- "content"
- title: "🚀 Features"
labels:
- "enhancement"
- "feature"
- title: "🐛 Bugs Fixes"
labels:
- "bug"
- title: "📕 Documentation"
labels:
- "documentation"
- title: "🧰 Development"
labels:
- "chore"
- "documentation"
- "dependencies"
change-template: "- #$NUMBER $TITLE"
change-title-escapes: '\<*_&`#@'
template: |
$CHANGES

Thanks to $CONTRIBUTORS
80 changes: 80 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: ci

on: push

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: r-lib/actions/setup-r@v1
with:
use-public-rspm: true
- uses: r-lib/actions/setup-r-dependencies@v1
- name: Style / Format
shell: Rscript {0}
run: styler::style_dir(dry="fail")
- name: Lint
shell: Rscript {0}
run: |
lintr::lint_dir('.')

image:
needs: build
# only on main and dev branch
if: startsWith(github.ref, 'refs/heads/main') || github.ref == 'refs/heads/dev'
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Pull Image Data
run: make pull_data
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: cmu-delphi-deploy-machine
password: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
- name: Build Image
env:
DEVOPS_DOCKER_FILE: ./devops/Dockerfile
run: |
docker build -t repo --file ${DEVOPS_DOCKER_FILE} .
- name: Resolve Tag
id: tagname
run: |
baseRef="${GITHUB_REF#*/}"
imageTag="${baseRef#*/}"
if [ "$imageTag" = "main" ] ; then
imageTag="latest"
fi
echo "::set-output name=tag::$imageTag"
echo "::set-output name=repo::ghcr.io/${{ github.repository }}"
- name: Push Dev Tag
run: |
docker tag repo ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }}
docker push ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }}
- name: Set up Python 3.8
if: startsWith(github.ref, 'refs/heads/main')
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Extract version
if: startsWith(github.ref, 'refs/heads/main')
id: extract_version
run: |
python -m pip install bump2version
echo -n "::set-output name=version::"
bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",,
- name: Trigger Webhook
run: |
# trigger a webhook update
curl -H "Authorization: Bearer ${{ secrets.DELPHI_DEPLOY_WEBHOOK_TOKEN }}" \
-X POST ${{ secrets.DELPHI_DEPLOY_WEBHOOK_URL }} \
-H "Content-Type: application/x-www-form-urlencoded" \
-d "repository=${{ steps.tagname.outputs.repo }}&tag=${{ steps.tagname.outputs.tag }}"
- name: Push Version Tag Tag
if: startsWith(github.ref, 'refs/heads/main')
run: |
docker tag repo ${{ steps.tagname.outputs.repo }}:v${{ steps.extract_version.outputs.version }}
docker push ${{ steps.tagname.outputs.repo }}:v${{ steps.extract_version.outputs.version }}
43 changes: 43 additions & 0 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Create Release
on:
workflow_dispatch:
inputs:
versionName:
description: "Semantic Version Number (i.e., 5.5.0 or patch, minor, major, prepatch, preminor, premajor, prerelease)"
required: true
default: patch
jobs:
create_release:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
with:
ref: main
ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
- name: Reset main branch
run: |
git fetch origin dev:dev
git reset --hard dev
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Change version number
id: version
run: |
python -m pip install bump2version
echo -n "::set-output name=next_tag::"
bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",,
- name: Create pull request into main
uses: peter-evans/create-pull-request@v3
with:
branch: release/${{ steps.version.outputs.next_tag }}
commit-message: "chore: release ${{ steps.version.outputs.next_tag }}"
base: main
title: Release ${{ steps.version.outputs.next_tag }}
labels: chore
reviewers: krivard
assignees: krivard
body: |
Releasing ${{ steps.version.outputs.next_tag }}.
54 changes: 0 additions & 54 deletions .github/workflows/main.yml

This file was deleted.

Loading