From 9628f3209c16b425e9d92e52a6b7a466ce993520 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 16 May 2023 22:06:41 -0400 Subject: [PATCH 01/14] micromamba to blog.yaml --- .github/workflows/blog.yaml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 351d4bcbb..55a777fd9 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -22,30 +22,16 @@ jobs: with: # submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 3 - - uses: conda-incubator/setup-miniconda@v2 + - uses: mamba-org/provision-with-micromamba@v15 with: - python-version: 3.9 - activate-environment: www-main - miniforge-variant: Mambaforge - miniforge-version: latest - use-mamba: true - use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly! + environment-file: environment.yml + micromamba-version: latest - name: Get Date id: get-date run: echo "name=today::$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - - name: Cache Conda env - uses: actions/cache@v3 - with: - path: ${{ env.CONDA }}/envs - key: conda-${{ runner.os }}--${{ runner.arch }}--${{ steps.get-date.outputs.today }}-${{ hashFiles('environment.yml') }}-${{ env.CACHE_NUMBER }} - env: - # Increase this value to reset cache if etc/example-environment.yml has not changed - CACHE_NUMBER: 0 - id: cache - - name: Update environment - run: mamba env update -n www-main -f environment.yml - if: steps.cache.outputs.cache-hit != 'true' + - name: Create environment + run: micromamba env create -n www-main -f environment.yml - name: Conda info run: | conda info From 017198f32016899f067bb84d0554158068460410 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 16 May 2023 22:23:47 -0400 Subject: [PATCH 02/14] add force flag to create new env --- .github/workflows/blog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 55a777fd9..21eaccfe4 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -31,7 +31,7 @@ jobs: run: echo "name=today::$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - name: Create environment - run: micromamba env create -n www-main -f environment.yml + run: micromamba env create -n www-main -f environment.yml --force - name: Conda info run: | conda info From f65cb0996602f836b6e8f79174a401dec5232a97 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 16 May 2023 23:09:38 -0400 Subject: [PATCH 03/14] update instead of add env --- .github/workflows/blog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 21eaccfe4..1b165973e 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -31,7 +31,7 @@ jobs: run: echo "name=today::$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - name: Create environment - run: micromamba env create -n www-main -f environment.yml --force + run: micromamba env update -n www-main -f environment.yml - name: Conda info run: | conda info From 2b2fb6360893efa553a7a92ef04baea7ad667993 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 16 May 2023 23:41:20 -0400 Subject: [PATCH 04/14] separate env www-main-micromamba --- .github/workflows/blog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 1b165973e..73c1d15e8 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -31,7 +31,7 @@ jobs: run: echo "name=today::$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - name: Create environment - run: micromamba env update -n www-main -f environment.yml + run: micromamba env create -n www-main-micromamba -f environment.yml - name: Conda info run: | conda info From 64ff0f81e4613d4b6279b20e0a0f2bdbb38b641b Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 17 May 2023 14:26:36 -0400 Subject: [PATCH 05/14] remove env --- .github/workflows/blog.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 73c1d15e8..6ccf585be 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -15,8 +15,6 @@ jobs: defaults: run: shell: bash -l {0} - env: - RETICULATE_PYTHON: /usr/share/miniconda3/envs/www-main/bin/python steps: - uses: actions/checkout@v3 with: From 355d6753d0887a52d0e69678b09d69ee7f02b25e Mon Sep 17 00:00:00 2001 From: minhkhul Date: Sun, 21 May 2023 21:33:13 -0400 Subject: [PATCH 06/14] cleanup --- .github/workflows/blog.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 6ccf585be..302f40939 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -18,7 +18,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - # submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 3 - uses: mamba-org/provision-with-micromamba@v15 with: @@ -30,10 +29,10 @@ jobs: shell: bash - name: Create environment run: micromamba env create -n www-main-micromamba -f environment.yml - - name: Conda info + - name: micromamba info run: | - conda info - conda list + micromamba info + micromamba list - name: Install R dependencies env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} From 14e170e2d26ac2caca5abd4c0338831bc85192d9 Mon Sep 17 00:00:00 2001 From: Kathryn M Mazaitis Date: Mon, 5 Jun 2023 13:09:06 -0400 Subject: [PATCH 07/14] Add default reviewers to dependabot PRs --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 58eeb413b..03347bde2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,9 +6,11 @@ updates: target-branch: dev schedule: interval: "monthly" + reviewers: "cmu-delphi/code-reviewers" # Maintain dependencies for npm - package-ecosystem: "npm" directory: "/" target-branch: dev schedule: interval: "monthly" + reviewers: "cmu-delphi/code-reviewers" From 677f953843068b99ba5c94ac61c6f958ff4e624e Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Fri, 9 Jun 2023 14:26:16 -0700 Subject: [PATCH 08/14] feat(leader order): reorder leader page --- content/people/index.md | 3 +++ themes/delphi/layouts/partials/get-persons.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/content/people/index.md b/content/people/index.md index 597e196fd..3e9fdd604 100644 --- a/content/people/index.md +++ b/content/people/index.md @@ -335,6 +335,7 @@ people: affiliation: CMU/MLD and OVPR team: - leadership + leaderOrder: 3 - firstName: Jaemin lastName: Jo image: jaemin-jo-500x500-min.jpg @@ -677,6 +678,7 @@ people: - blog - center-of-excellence description: is a Principal Investigator in the Delphi group and a Professor and Head of the Machine Learning Department at CMU. He is also a Google Fellow. + leaderOrder: 2 - firstName: Patti lastName: Rote image: patti-rote.jpg @@ -843,6 +845,7 @@ people: - blog - 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: Will lastName: Townes image: will-townes.jpg diff --git a/themes/delphi/layouts/partials/get-persons.html b/themes/delphi/layouts/partials/get-persons.html index d7b8d019e..926c23c71 100644 --- a/themes/delphi/layouts/partials/get-persons.html +++ b/themes/delphi/layouts/partials/get-persons.html @@ -8,4 +8,4 @@ {{- $fullPerson := (merge (dict "name" (printf "%s %s" .firstName .lastName) "img" $img "key" (.firstName | lower)) . ) -}} {{- $full = $full | append $fullPerson -}} {{- end -}} -{{- return (sort $full "lastName" "asc" "firstName" "asc") -}} +{{- return (sort $full "leaderOrder" "asc" "lastName" "asc" "firstName" "asc") -}} From 872674a31d8ea79b8949e56df10c26e4d8bfd7ca Mon Sep 17 00:00:00 2001 From: Brian Clark Date: Wed, 14 Jun 2023 16:19:30 -0400 Subject: [PATCH 09/14] Add engineering lead job posting --- .../headless/2023_06_software_engineering_manager.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 content/about/careers/headless/2023_06_software_engineering_manager.md diff --git a/content/about/careers/headless/2023_06_software_engineering_manager.md b/content/about/careers/headless/2023_06_software_engineering_manager.md new file mode 100644 index 000000000..6b8330f40 --- /dev/null +++ b/content/about/careers/headless/2023_06_software_engineering_manager.md @@ -0,0 +1,8 @@ +--- +date: 2023-06-14 +title: Software Engineering Manager +--- + +We seek a talented manager and engineer that is capable of translating organizational goals between the executive and the engineering teams, support and mentor technical staff, and provide strong, lightly-held opinions for technical guidance. + +[Apply to the Data Pipeline Developer position at CMU Careers](https://cmu.wd5.myworkdayjobs.com/en-US/CMU/job/Software-Engineering-Manager---School-of-Computer-Science---MLD_2020065-1). From dfdbc2dc53effda0143da70a8b1682f91fb25994 Mon Sep 17 00:00:00 2001 From: Brian Clark Date: Wed, 14 Jun 2023 16:23:54 -0400 Subject: [PATCH 10/14] Update link text --- .../careers/headless/2023_06_software_engineering_manager.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/careers/headless/2023_06_software_engineering_manager.md b/content/about/careers/headless/2023_06_software_engineering_manager.md index 6b8330f40..86404056d 100644 --- a/content/about/careers/headless/2023_06_software_engineering_manager.md +++ b/content/about/careers/headless/2023_06_software_engineering_manager.md @@ -5,4 +5,4 @@ title: Software Engineering Manager We seek a talented manager and engineer that is capable of translating organizational goals between the executive and the engineering teams, support and mentor technical staff, and provide strong, lightly-held opinions for technical guidance. -[Apply to the Data Pipeline Developer position at CMU Careers](https://cmu.wd5.myworkdayjobs.com/en-US/CMU/job/Software-Engineering-Manager---School-of-Computer-Science---MLD_2020065-1). +[Apply to the Software Engineering Manager position at CMU Careers](https://cmu.wd5.myworkdayjobs.com/en-US/CMU/job/Software-Engineering-Manager---School-of-Computer-Science---MLD_2020065-1). From 0a27766a3946bd15fb12d85bf5ae582cebe0707c Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 15 Jun 2023 09:35:41 -0400 Subject: [PATCH 11/14] fix from before --- .github/workflows/blog.yaml | 56 ++++++------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index 351d4bcbb..8c26950b5 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -1,5 +1,4 @@ name: blog - on: push: paths: # run only when an Rmd file changes @@ -8,48 +7,30 @@ on: - "dependencies.R" - ".github/workflows/blog.yaml" workflow_dispatch: - jobs: blog: runs-on: ubuntu-latest defaults: run: shell: bash -l {0} - env: - RETICULATE_PYTHON: /usr/share/miniconda3/envs/www-main/bin/python steps: - uses: actions/checkout@v3 with: - # submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 3 - - uses: conda-incubator/setup-miniconda@v2 + - uses: mamba-org/provision-with-micromamba@v15 with: - python-version: 3.9 - activate-environment: www-main - miniforge-variant: Mambaforge - miniforge-version: latest - use-mamba: true - use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly! + environment-file: environment.yml + micromamba-version: latest - name: Get Date id: get-date run: echo "name=today::$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT shell: bash - - name: Cache Conda env - uses: actions/cache@v3 - with: - path: ${{ env.CONDA }}/envs - key: conda-${{ runner.os }}--${{ runner.arch }}--${{ steps.get-date.outputs.today }}-${{ hashFiles('environment.yml') }}-${{ env.CACHE_NUMBER }} - env: - # Increase this value to reset cache if etc/example-environment.yml has not changed - CACHE_NUMBER: 0 - id: cache - - name: Update environment - run: mamba env update -n www-main -f environment.yml - if: steps.cache.outputs.cache-hit != 'true' - - name: Conda info + - name: Create environment + run: micromamba env create -n www-main-micromamba -f environment.yml + - name: micromamba info run: | - conda info - conda list + micromamba info + micromamba list - name: Install R dependencies env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} @@ -72,23 +53,4 @@ jobs: name: blog path: | ./content/blog - ./static/blog - - - uses: actions/setup-node@v3 - with: - node-version: 16 - - uses: actions/cache@v3.0.2 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - run: npm ci - - name: Lint - run: npm run lint - - name: Build - run: npm run build - - uses: actions/upload-artifact@v3 - with: - name: website - path: ./public + ./static/blog \ No newline at end of file From bdfce3d6464b44747552deac8d27e7d06864e5b1 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 15 Jun 2023 10:31:28 -0400 Subject: [PATCH 12/14] add api key --- content/blog/2020-10-14-dv-signal.Rmd | 1 + 1 file changed, 1 insertion(+) diff --git a/content/blog/2020-10-14-dv-signal.Rmd b/content/blog/2020-10-14-dv-signal.Rmd index ac2cd4e89..50681d896 100644 --- a/content/blog/2020-10-14-dv-signal.Rmd +++ b/content/blog/2020-10-14-dv-signal.Rmd @@ -75,6 +75,7 @@ library(covidcast) library(dplyr) library(ggplot2) library(gridExtra) +options(covidcast.auth = "9328d11cfe46d") # Minh's key # Fetch DV % CLI signal and USAFacts confirmed case incidence proportion at # the state level From 09e19009e3158a61dcf6ab3e6314d000844d85a5 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 15 Jun 2023 11:11:32 -0400 Subject: [PATCH 13/14] add api key to all R covidcast use --- content/blog/2020-08-26-fb-survey.Rmd | 4 ++++ content/blog/2020-10-06-survey-wave-4.Rmd | 4 +++- content/blog/2020-12-10-masks-public.Rmd | 4 ++++ content/blog/2021-01-15-causal-effect-mobility.Rmd | 4 ++++ content/blog/2021-01-22-holiday-surveys.Rmd | 4 +++- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/content/blog/2020-08-26-fb-survey.Rmd b/content/blog/2020-08-26-fb-survey.Rmd index 678ece683..eab3f82d5 100644 --- a/content/blog/2020-08-26-fb-survey.Rmd +++ b/content/blog/2020-08-26-fb-survey.Rmd @@ -47,6 +47,10 @@ output: toc: true --- +```{r, echo=FALSE} +options(covidcast.auth = "9328d11cfe46d") # Minh's key +``` + Since April 2020, in collaboration with Facebook, partner universities, and public health officials, we've been conducting a massive daily survey to monitor diff --git a/content/blog/2020-10-06-survey-wave-4.Rmd b/content/blog/2020-10-06-survey-wave-4.Rmd index bc7c1c56d..5243dc136 100644 --- a/content/blog/2020-10-06-survey-wave-4.Rmd +++ b/content/blog/2020-10-06-survey-wave-4.Rmd @@ -30,7 +30,9 @@ output: blogdown::html_page: toc: true --- - +```{r, echo=FALSE} +options(covidcast.auth = "9328d11cfe46d") # Minh's key +``` Beginning in early April 2020, the `r blogdown::shortcode_html("reflink", "/", "Delphi group")` has conducted a major survey to track COVID-19 across the United States. With the support of Facebook Data for Good, we have been able to recruit tens of diff --git a/content/blog/2020-12-10-masks-public.Rmd b/content/blog/2020-12-10-masks-public.Rmd index ec4480ab8..eb51e4d26 100644 --- a/content/blog/2020-12-10-masks-public.Rmd +++ b/content/blog/2020-12-10-masks-public.Rmd @@ -21,6 +21,10 @@ output: toc: true --- +```{r, echo=FALSE} +options(covidcast.auth = "9328d11cfe46d") # Minh's key +``` + As COVID cases and deaths continue to rise in the United States, we are repeatedly reminded that unless we take the appropriate precautions---by wearing masks when around other people, working from home whenever possible, and diff --git a/content/blog/2021-01-15-causal-effect-mobility.Rmd b/content/blog/2021-01-15-causal-effect-mobility.Rmd index d6e4ae090..4b13265ac 100644 --- a/content/blog/2021-01-15-causal-effect-mobility.Rmd +++ b/content/blog/2021-01-15-causal-effect-mobility.Rmd @@ -27,6 +27,10 @@ output: toc: true --- +```{r, echo=FALSE} +options(covidcast.auth = "9328d11cfe46d") # Minh's key +``` + ```{r setup, include=FALSE} knitr::opts_chunk$set(collapse = TRUE) ``` diff --git a/content/blog/2021-01-22-holiday-surveys.Rmd b/content/blog/2021-01-22-holiday-surveys.Rmd index 87952ef1e..e6d44a4bc 100644 --- a/content/blog/2021-01-22-holiday-surveys.Rmd +++ b/content/blog/2021-01-22-holiday-surveys.Rmd @@ -29,7 +29,9 @@ output: blogdown::html_page: toc: true --- - +```{r, echo=FALSE} +options(covidcast.auth = "9328d11cfe46d") # Minh's key +``` With pandemic fatigue setting in across the United States after a long year filled with uncertainty, many felt the temptation to celebrate a “normal” Thanksgiving and Christmas. However, with cases steeply rising across the US, From 40a412219c41d6a0da81c1d74937ba413ec2e247 Mon Sep 17 00:00:00 2001 From: korlaxxalrok Date: Thu, 15 Jun 2023 18:39:00 +0000 Subject: [PATCH 14/14] chore: release v3.2.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ff298a26..eebea2763 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "www-main", - "version": "3.2.3", + "version": "3.2.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "www-main", - "version": "3.2.3", + "version": "3.2.4", "hasInstallScript": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.4.0", diff --git a/package.json b/package.json index a324ff073..180b25f97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "3.2.3", + "version": "3.2.4", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.4.0",