Skip to content

Commit 31e1303

Browse files
authored
Merge pull request #1234 from cmu-delphi/release/delphi-epidata-4.1.6
Release Delphi Epidata 4.1.6
2 parents 8e1d95e + 322188b commit 31e1303

File tree

16 files changed

+787
-857
lines changed

16 files changed

+787
-857
lines changed

.bumpversion.cfg

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

dev/local/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = Delphi Development
3-
version = 4.1.5
3+
version = 4.1.6
44

55
[options]
66
packages =

requirements.api.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ python-dotenv==0.15.0
1313
pyyaml
1414
redis==3.5.3
1515
requests==2.31.0
16-
scipy==1.6.2
16+
scipy==1.10.0
1717
SQLAlchemy==1.4.40
1818
structlog==22.1.0
1919
tenacity==7.0.0

src/acquisition/covidcast/test_utils.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44
import unittest
55

66
import pandas as pd
7+
from redis import Redis
78

89
from delphi_utils import Nans
910
from delphi.epidata.common.covidcast_row import CovidcastRow
1011
from delphi.epidata.acquisition.covidcast.database import Database
12+
from delphi.epidata.server._config import REDIS_HOST, REDIS_PASSWORD
1113
from delphi.epidata.server.utils.dates import day_to_time_value, time_value_to_day
1214
import delphi.operations.secrets as secrets
1315

1416
# all the Nans we use here are just one value, so this is a shortcut to it:
1517
nmv = Nans.NOT_MISSING.value
1618

17-
# TODO replace these real geo_values with fake values, and use patch and mock to mock the return values of
19+
# TODO replace these real geo_values with fake values, and use patch and mock to mock the return values of
1820
# delphi_utils.geomap.GeoMapper().get_geo_values(geo_type) in parse_geo_sets() of _params.py
1921

2022
FIPS = ['04019', '19143', '29063', '36083'] # Example list of valid FIPS codes as strings
@@ -166,19 +168,25 @@ def setUp(self):
166168
self.localSetUp()
167169
self._db._connection.commit()
168170

171+
# clear all rate-limiting info from redis
172+
r = Redis(host=REDIS_HOST, password=REDIS_PASSWORD)
173+
for k in r.keys("LIMITER/*"):
174+
r.delete(k)
175+
176+
169177
def tearDown(self):
170178
# close and destroy conenction to the database
171179
self.localTearDown()
172180
self._db.disconnect(False)
173181
del self._db
174182

175183
def localSetUp(self):
176-
# stub; override in subclasses to perform custom setup.
184+
# stub; override in subclasses to perform custom setup.
177185
# runs after tables have been truncated but before database changes have been committed
178186
pass
179187

180188
def localTearDown(self):
181-
# stub; override in subclasses to perform custom teardown.
189+
# stub; override in subclasses to perform custom teardown.
182190
# runs after database changes have been committed
183191
pass
184192

@@ -198,4 +206,4 @@ def params_from_row(self, row: CovidcastTestRow, **kwargs):
198206
'geo_value': row.geo_value,
199207
}
200208
ret.update(kwargs)
201-
return ret
209+
return ret

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 <- getOption('epidata.url', default = 'https://api.delphi.cmu.edu/epidata/')
1717

18-
client_version <- '4.1.5'
18+
client_version <- '4.1.6'
1919

2020
auth <- getOption("epidata.auth", default = NA)
2121

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://api.delphi.cmu.edu/epidata/";
25-
const client_version = "4.1.5";
25+
const client_version = "4.1.6";
2626

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

0 commit comments

Comments
 (0)