Skip to content

Commit 63e406f

Browse files
authored
Merge pull request #634 from cmu-delphi/release/delphi-epidata-0.2.0
Release Delphi Epidata 0.2.0
2 parents 9e366d0 + 3a061c5 commit 63e406f

File tree

19 files changed

+889
-295
lines changed

19 files changed

+889
-295
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.1.4
2+
current_version = 0.2.0
33
commit = False
44
tag = False
55

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
docker stop delphi_database_epidata delphi_web_epidata
8585
docker network remove delphi-net
8686
87-
build_js_clients:
87+
build_js_client:
8888
runs-on: ubuntu-latest
8989
defaults:
9090
run:
+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Update Google Docs Meta Data
2+
on:
3+
workflow_dispatch:
4+
jobs:
5+
update_gdocs:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Check out code
9+
uses: actions/checkout@v2
10+
with:
11+
branch: dev
12+
ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
13+
- name: Set up Python 3.8
14+
uses: actions/setup-python@v2
15+
with:
16+
python-version: 3.8
17+
- uses: actions/cache@v2
18+
with:
19+
path: ~/.cache/pip
20+
key: ${{ runner.os }}-pipd-${{ hashFiles('requirements-dev.txt') }}
21+
restore-keys: |
22+
${{ runner.os }}-pipd-
23+
- name: Install Dependencies
24+
run: pip install -r requirements-dev.txt
25+
- name: Update Docs
26+
run: inv update-gdoc
27+
- name: Create pull request into dev
28+
uses: peter-evans/create-pull-request@v3
29+
with:
30+
branch: bot/update-docs
31+
commit-message: 'chore: update docs'
32+
title: Update Google Docs Meta Data
33+
labels: chore
34+
reviewers: krivard
35+
assignees: krivard
36+
body: |
37+
Updating Google Docs Meta Data

docs/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GEM
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
addressable (2.7.0)
9+
addressable (2.8.0)
1010
public_suffix (>= 2.0.2, < 5.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source

integrations/server/test_covidcast_endpoints.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def test_meta(self):
339339
"""Request a signal the /meta endpoint."""
340340

341341
num_rows = 10
342-
rows = [CovidcastRow(time_value=20200401 + i, value=i) for i in range(num_rows)]
342+
rows = [CovidcastRow(time_value=20200401 + i, value=i, source="fb-survey", signal="smoothed_cli") for i in range(num_rows)]
343343
self._insert_rows(rows)
344344
first = rows[0]
345345
last = rows[-1]
@@ -349,7 +349,10 @@ def test_meta(self):
349349
with self.subTest("plain"):
350350
out = self._fetch("/meta")
351351
self.assertEqual(len(out), 1)
352-
stats = out[0]
352+
data_source = out[0]
353+
self.assertEqual(data_source["source"], first.source)
354+
self.assertEqual(len(data_source["signals"]), 1)
355+
stats = data_source["signals"][0]
353356
self.assertEqual(stats["source"], first.source)
354357
self.assertEqual(stats["signal"], first.signal)
355358
self.assertEqual(stats["min_time"], first.time_value)
@@ -364,7 +367,11 @@ def test_meta(self):
364367
with self.subTest("filtered"):
365368
out = self._fetch("/meta", signal=f"{first.source}:*")
366369
self.assertEqual(len(out), 1)
367-
self.assertEqual(out[0]["source"], first.source)
370+
data_source = out[0]
371+
self.assertEqual(data_source["source"], first.source)
372+
self.assertEqual(len(data_source["signals"]), 1)
373+
stats = data_source["signals"][0]
374+
self.assertEqual(stats["source"], first.source)
368375
out = self._fetch("/meta", signal=f"{first.source}:X")
369376
self.assertEqual(len(out), 0)
370377

requirements.dev.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ mypy>=0.790
55
pytest
66
tenacity==7.0.0
77
bump2version
8+
requests

src/client/delphi_epidata.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Epidata <- (function() {
1515
# API base url
1616
BASE_URL <- 'https://delphi.cmu.edu/epidata/api.php'
1717

18-
client_version <- '0.1.4'
18+
client_version <- '0.2.0'
1919

2020
# Helper function to cast values and/or ranges to strings
2121
.listitem <- function(value) {

src/client/delphi_epidata.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
})(this, function (exports, fetchImpl, jQuery) {
2424
const BASE_URL = "https://delphi.cmu.edu/epidata/";
25-
const client_version = "0.1.4";
25+
const client_version = "0.2.0";
2626

2727
// Helper function to cast values and/or ranges to strings
2828
function _listitem(value) {

src/client/packaging/npm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "delphi_epidata",
33
"description": "Delphi Epidata API Client",
44
"authors": "Delphi Group",
5-
"version": "0.1.4",
5+
"version": "0.2.0",
66
"license": "MIT",
77
"homepage": "https://github.com/cmu-delphi/delphi-epidata",
88
"bugs": {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from .delphi_epidata import Epidata
22

33
name = 'delphi_epidata'
4-
__version__ = '0.1.4'
4+
__version__ = '0.2.0'

src/client/packaging/pypi/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="delphi_epidata",
8-
version="0.1.4",
8+
version="0.2.0",
99
author="David Farrow",
1010
author_email="[email protected]",
1111
description="A programmatic interface to Delphi's Epidata API.",

src/server/_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load_dotenv()
77

8-
VERSION = "0.1.4"
8+
VERSION = "0.2.0"
99

1010
MAX_RESULTS = int(10e6)
1111
MAX_COMPATIBILITY_RESULTS = int(3650)

0 commit comments

Comments
 (0)