diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..3825fce8a --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# default owners for anything not listed below +* @rlunde @melange396 @carlynvandyke diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 5fed9c2ed..8f532af8a 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -14,7 +14,7 @@ jobs: run: shell: bash -l {0} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 3 - uses: mamba-org/provision-with-micromamba@v16 @@ -37,7 +37,7 @@ jobs: run: | Rscript ./dependencies.R - name: Restore Blogdown Cache - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: | ./blogdown @@ -55,4 +55,4 @@ jobs: name: blog path: | ./content/blog - ./static/blog \ No newline at end of file + ./static/blog diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 59025f3aa..7333eaacb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,15 +6,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 3 # Fetch all history for .GitInfo and .Lastmod - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 - - uses: actions/cache@v3.3.1 + - uses: actions/cache@v3.3.2 with: path: ~/.npm key: ${{ runner.os }}-node3-${{ hashFiles('**/package-lock.json') }} @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index a94368bb6..cea473299 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: main ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }} @@ -32,7 +32,7 @@ jobs: base: main title: Release ${{ steps.version.outputs.next_tag }} labels: chore - # reviewers: + # reviewers: assignees: melange396 body: | Releasing ${{ steps.version.outputs.next_tag }}. diff --git a/.github/workflows/dependabot-assignments.yml b/.github/workflows/dependabot-assignments.yml index 97bbd061e..b511425f2 100644 --- a/.github/workflows/dependabot-assignments.yml +++ b/.github/workflows/dependabot-assignments.yml @@ -7,11 +7,11 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - env: - GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }} + env: + GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }} if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Assign team to PR run: gh pr edit "$PR_URL" --add-reviewer "cmu-delphi/code-reviewers" env: - PR_URL: ${{github.event.pull_request.html_url}} \ No newline at end of file + PR_URL: ${{github.event.pull_request.html_url}} diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index 25f9828f9..3adc85c3f 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -17,8 +17,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Extract version @@ -42,12 +42,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Cache Node.js modules - uses: actions/cache@v3.3.1 + uses: actions/cache@v3.3.2 with: path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }} @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: dev ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }} diff --git a/.prettierrc.js b/.prettierrc.js index 1b522730e..c96ff17a7 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -2,7 +2,7 @@ module.exports = { printWidth: 120, semi: true, trailingComma: "es5", - + plugins: ["prettier-plugin-go-template"], overrides: [ { files: ["*.html"], diff --git a/content/about/_index.md b/content/about/_index.md index 0c5d93290..fa260b7b5 100644 --- a/content/about/_index.md +++ b/content/about/_index.md @@ -34,35 +34,3 @@ We're a research group based out of Carnegie Mellon University dedicated to deve ### Who is our audience? Public health authorities (federal, state, local), the healthcare industry, the public and private sectors, fellow researchers working on epidemic tracking and forecasting, data journalists, and the general public. - -### Delphi's milestones - -In reverse chronological order. - -- **April 2020.** We began supporting and advising the U.S. CDC's - community-driven COVID-19 forecasting effort, including creating and - maintaining an ensemble forecast from the models submitted to the - [COVID-19 Forecast Hub](https://covid19forecasthub.org), and a [forecast - evaluation dashboard](https://delphi.cmu.edu/forecast-eval/). - -- **March 2020.** We launched [COVIDcast]({{< relref "covidcast" >}}), the - nation's largest public repository of diverse, real-time indicators of - COVID-19 activity, freely accessible through the [Epidata API]({{< apiref - "api/covidcast.html" >}}), which is updated daily with the latest data. - -- **2019.** We became a CDC National Center of Excellence for Influenza - Forecasting, one of two nationally (and a 5-year designation). - -- **2016.** We developed and deployed - [influenza nowcasts](https://delphi.cmu.edu/nowcast/) for the CDC, state - departments of public health, and the public. - -- **2016.** We developed and deployed the [Epidata API]({{< apiref "/" >}}), - which provides real-time access to epidemiological surveillance data. - -- **2013.** We began supporting the U.S. CDC's Influenza Division in advancing - and growing a [scientific community around influenza - forecasting](https://www.cdc.gov/flu/weekly/flusight/index.html). We've been - [perennial leaders in forecasting - accuracy](https://www.cs.cmu.edu/~roni/CDC%20Flu%20Challenge%202014-2018%20Results.pdf) - ever since. diff --git a/content/people/headshots/richa.png b/content/people/headshots/richa.png new file mode 100644 index 000000000..8979992b5 Binary files /dev/null and b/content/people/headshots/richa.png differ diff --git a/content/people/headshots/tina.png b/content/people/headshots/tina.png new file mode 100644 index 000000000..4c314f8d9 Binary files /dev/null and b/content/people/headshots/tina.png differ diff --git a/content/people/index.md b/content/people/index.md index f9b7d78c7..6e90a1d0f 100644 --- a/content/people/index.md +++ b/content/people/index.md @@ -216,6 +216,12 @@ people: affiliation: Girls of Steel Robotics team: - contributors +- firstName: Richa + lastName: Gadgil + image: richa.png + affiliation: CMU/MLD + team: + - core - key: agarcia firstName: Andy lastName: Garcia @@ -865,6 +871,12 @@ people: - center-of-excellence description: is a Principal Investigator in the Delphi group, and a Professor in the Department of Statistics & Data Science and the Machine Learning Department at CMU. He is also an Amazon Scholar. leaderOrder: 1 +- firstName: Tina + lastName: Townes + image: tina.png + affiliation: CMU + team: + - core - firstName: Will lastName: Townes image: will-townes.jpg diff --git a/package-lock.json b/package-lock.json index 0443b83d8..0a250556e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "3.2.7", + "version": "3.2.8", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -560,9 +560,9 @@ }, "dependencies": { "signal-exit": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", - "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true } } @@ -640,9 +640,9 @@ } }, "highlight.js": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz", - "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==" + "version": "11.9.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz", + "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==" }, "http-cache-semantics": { "version": "4.1.1", @@ -759,9 +759,9 @@ "dev": true }, "jackspeak": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz", - "integrity": "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "dev": true, "requires": { "@isaacs/cliui": "^8.0.2", @@ -775,9 +775,9 @@ "dev": true }, "katex": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.8.tgz", - "integrity": "sha512-ftuDnJbcbOckGY11OO+zg3OofESlbR5DRl2cmN8HeWeeFIV7wTXvAOx8kEjZjobhA+9wh2fbKeO6cdcA9Mnovg==", + "version": "0.16.9", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz", + "integrity": "sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==", "requires": { "commander": "^8.3.0" } @@ -1013,9 +1013,9 @@ "dev": true }, "minipass": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", - "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true }, "ms": { @@ -1130,19 +1130,19 @@ "dev": true }, "path-scurry": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz", - "integrity": "sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "requires": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0 || ^6.0.2" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "dependencies": { "lru-cache": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz", - "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", "dev": true } } @@ -1182,15 +1182,15 @@ } }, "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.13.tgz", - "integrity": "sha512-gG/xT5kd+kCzoMaTchXvdfBdsunyRCV6G8cgdPGPd2V5JGGKXUG7SjzBKU7jaGh2RTeblcAdBb/E+S/duOAMsA==", + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.15.tgz", + "integrity": "sha512-WqU92E1NokWYNZ9mLE6ijoRg6LtIGdLMePt2C7UBDjXeDH9okcRI3zRqtnWR4s5AloiqyvZ66jNBAa9tmRY5EQ==", "dev": true, "requires": { "ulid": "^2.3.0" @@ -1280,12 +1280,12 @@ "dev": true }, "rimraf": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.1.tgz", - "integrity": "sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", + "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", "dev": true, "requires": { - "glob": "^10.2.5" + "glob": "^10.3.7" }, "dependencies": { "brace-expansion": { @@ -1298,22 +1298,22 @@ } }, "glob": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.6.tgz", - "integrity": "sha512-U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "requires": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -1646,9 +1646,9 @@ "dev": true }, "uikit": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.17.0.tgz", - "integrity": "sha512-/xgmse0IWIVSLihQh61LAfzHMTkM13Y2n7Esgg2B0iojrGMFXXVuGgxuzN+zJTvUK0rTcrk/WiWO1VY0Xc1KGg==" + "version": "3.17.8", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.17.8.tgz", + "integrity": "sha512-zs7oFYlW2JFVZ1Rz70qnrHRfWqRvKIzSobVhQDVeIPOOZXKiyad/r1oveiWvHQSlb7wKaW6T8Z6/FefBi3Sm5w==" }, "ulid": { "version": "2.3.0", diff --git a/package.json b/package.json index 083516998..53cd69d03 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "www-main", - "version": "3.2.7", + "version": "3.2.8", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.4.2", - "highlight.js": "^11.8.0", - "katex": "^0.16.8", - "uikit": "^3.17.0", + "highlight.js": "^11.9.0", + "katex": "^0.16.9", + "uikit": "^3.17.8", "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v3.2.9/www-covidcast-3.2.9.tgz", "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.6.7/www-covidcast-classic-2.6.7.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.3/www-epivis-2.0.3.tgz" @@ -15,9 +15,9 @@ "hugo-bin": "^0.115.0", "husky": "^8.0.3", "lint-staged": "^15.0.2", - "prettier": "^2.8.8", - "prettier-plugin-go-template": "^0.0.13", - "rimraf": "^5.0.1", + "prettier": "^3.0.3", + "prettier-plugin-go-template": "^0.0.15", + "rimraf": "^5.0.5", "shx": "^0.3.4" }, "files": [ diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index 1d5a9a1eb..5f3ff173b 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -1,4 +1,4 @@ - +