Skip to content

Commit df8c38d

Browse files
authored
Merge branch 'dev' into add_rvdss_indicator
2 parents cf6c95a + 1778150 commit df8c38d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1961
-1335
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 4.1.26
2+
current_version = 4.1.35
33
commit = False
44
tag = False
55

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
with:
104104
node-version: '16.x'
105105
- name: Cache Node.js modules
106-
uses: actions/cache@v2
106+
uses: actions/cache@v4
107107
with:
108108
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
109109
key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}

.github/workflows/missing_signals.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: python scripts/report_missing_covidcast_meta.py
2222
- name: Upload Missing Artifact
2323
if: failure()
24-
uses: actions/upload-artifact@v2
24+
uses: actions/upload-artifact@v4
2525
with:
2626
name: missing_db_signals.csv
2727
path: missing_db_signals.csv

.github/workflows/performance-tests-one-time.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

.github/workflows/performance-tests.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ jobs:
2525
max_time: ${{ steps.output.outputs.max_time }}
2626
requests_per_sec: ${{ steps.output.outputs.requests_per_sec }}
2727
steps:
28-
- name: Set up WireGuard
29-
uses: egor-tensin/setup-wireguard@v1.2.0
30-
with:
31-
endpoint: '${{ secrets.WG_PERF_ENDPOINT }}'
32-
endpoint_public_key: '${{ secrets.WG_PERF_ENDPOINT_PUBLIC_KEY }}'
33-
ips: '${{ secrets.WG_PERF_IPS }}'
34-
allowed_ips: '${{ secrets.WG_PERF_ALLOWED_IPS }}'
35-
private_key: '${{ secrets.WG_PERF_PRIVATE_KEY }}'
3628
- name: Clean files from previous runs
3729
uses: AutoModality/action-clean@v1
3830
- name: Check out repository
@@ -109,7 +101,7 @@ jobs:
109101
write_float('requests_per_sec', final_line[9])
110102
111103
- name: Archive results as artifacts
112-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
113105
with:
114106
name: locust-output
115107
path: |

.github/workflows/release-helper.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
working-directory: src/client/packaging/pypi
9090
run: |
9191
python -m build --sdist --wheel
92-
- uses: actions/upload-artifact@v2
92+
- uses: actions/upload-artifact@v4
9393
with:
9494
name: delphi_epidata_py
9595
path: src/client/packaging/pypi/dist/*.tar.gz
@@ -121,7 +121,7 @@ jobs:
121121
with:
122122
node-version: "16.x"
123123
- name: Cache Node.js modules
124-
uses: actions/cache@v2
124+
uses: actions/cache@v4
125125
with:
126126
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
127127
key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
@@ -132,7 +132,7 @@ jobs:
132132
- run: npm pack
133133
- name: Rename to a different name
134134
run: for f in *.tgz; do mv "$f" "$(echo "$f" | sed s/delphi_epidata-/delphi_epidata_js-/)"; done
135-
- uses: actions/upload-artifact@v2
135+
- uses: actions/upload-artifact@v4
136136
with:
137137
name: delphi_epidata_js
138138
path: src/client/packaging/npm/*.tgz

.github/workflows/update_gdocs_data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/setup-python@v2
1515
with:
1616
python-version: 3.8
17-
- uses: actions/cache@v2
17+
- uses: actions/cache@v4
1818
with:
1919
path: ~/.cache/pip
2020
key: ${{ runner.os }}-pipd-${{ hashFiles('requirements.dev.txt') }}

dev/docker/python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8-buster
1+
FROM python:3.8-bookworm
22

33
RUN apt-get update && apt-get install -y r-base && Rscript -e "install.packages(c('httr','xml2'))"
44

dev/local/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = Delphi Development
3-
version = 4.1.26
3+
version = 4.1.35
44

55
[options]
66
packages =

0 commit comments

Comments
 (0)