Skip to content

Release Delphi Epidata 4.1.4 #1216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 49 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
daabcfc
Merge pull request #1198 from cmu-delphi/bot/sync-main-dev
melange396 Jun 13, 2023
900cd3f
Switch CSV file for perftests and add Redis step (#1199)
rzats Jun 14, 2023
f5051d3
feat(acquisition): remove and deactivate norostat
dshemetov Jun 23, 2023
9600dbc
docs(norostat): note that updates stopped November 2020
dshemetov Jun 23, 2023
32b05e9
docs(norostat): correct wording
dshemetov Jun 23, 2023
13fcfe3
Merge pull request #1207 from cmu-delphi/ds/del-norostat-acquisition
dshemetov Jun 23, 2023
c7e45c1
feat(afhsb): remove afhsb acquisition code
dshemetov Jun 23, 2023
cdf3832
feat(afhsb): remove afhsb from Epidata Python client
dshemetov Jun 23, 2023
7a8ee39
feat(afhsb): remove afhsb from Epidata R client
dshemetov Jun 23, 2023
9ce6635
feat(afhsb): remove afhsb endpoint from server
dshemetov Jun 23, 2023
2878980
feat(afhsb): remove afhsb from deploy.json
dshemetov Jun 24, 2023
d554566
feat(afhsb): remove afhsb from setup.cfg
dshemetov Jun 24, 2023
316ecd1
feat(afhsb): remove norostat from setup.cfg
dshemetov Jun 24, 2023
5a6cefc
docs(afhsb): remove afhsb and its meta
dshemetov Jun 24, 2023
7a2fc7b
docs(afhsb): remove afhsb from README
dshemetov Jun 24, 2023
92b546f
feat(afhsb): remove afhsb from the js client
dshemetov Jun 24, 2023
6fe6e7a
use second db handle for only for user admin and writes (#1184)
melange396 Jun 26, 2023
fa0bd53
feat(afhsb): remove afhsb from .ts file
dshemetov Jun 26, 2023
7fd6a90
Merge pull request #1208 from cmu-delphi/ds/del-afhsb
dshemetov Jun 26, 2023
60cdbb1
ci(black): set line-length 100
dshemetov Jun 21, 2023
980b0b7
style(black): format cdc acquisition
dshemetov Jun 21, 2023
9e6ff16
style(black): format covidcast_nowcast acquisition
dshemetov Jun 21, 2023
d1141d9
style(black): format ecdc acquisition
dshemetov Jun 21, 2023
08af0f6
style(black): format flusurv acquisition
dshemetov Jun 21, 2023
0133ef2
style(black): format fluview acquisition
dshemetov Jun 21, 2023
b8900a0
style(black): format ght acquisition
dshemetov Jun 21, 2023
a849384
style(black): format kcdc acquisition
dshemetov Jun 21, 2023
d04af3c
style(black): format nidss acquisition
dshemetov Jun 21, 2023
7f60fbb
style(black): format paho acquisition
dshemetov Jun 21, 2023
b9ceb40
style(black): format quidel acquisition
dshemetov Jun 21, 2023
07ed83e
style(black): format twitter acquisition
dshemetov Jun 21, 2023
923852e
style(black): format wiki acquisition
dshemetov Jun 21, 2023
c827e54
ci(sonar): tempfiles for security warnings
dshemetov Jun 21, 2023
76ddfbf
style: add .editorconfig
dshemetov May 27, 2023
145dd42
style(pylint): add pylint config
dshemetov Jun 5, 2023
1e7319e
Update src/acquisition/cdcp/cdc_extract.py
dshemetov Jun 21, 2023
b00f11b
style(black): add fmt off tags around parser.add_argument calls
dshemetov Jun 21, 2023
dd1b089
style: update .editorconfig
dshemetov Jun 21, 2023
7a27a3a
style(flynt): convert .format and % strings to f-strings
dshemetov Jun 23, 2023
8459cc2
gh: add .git-blame-ignore-revs
dshemetov Jun 26, 2023
f93f020
style(acquisition): minor formatting fixes
dshemetov Jun 26, 2023
0609700
Merge pull request #1189 from cmu-delphi/ds/format100
dshemetov Jun 26, 2023
27ea881
Resolved conflicts
dmytrotsko Jun 26, 2023
dc4d74a
re-enable tracking of last time an api key was used (#1213)
melange396 Jun 26, 2023
5657dee
Bump requests from 2.28.1 to 2.31.0 (#1173)
dependabot[bot] Jun 27, 2023
e0a0940
Added new constraint fluview_clinical. Added migration file to remove…
dmytrotsko Jun 27, 2023
866ff00
Merge pull request #1211 from cmu-delphi/EPID-65-fluview-fluview-clin…
dmytrotsko Jun 27, 2023
ef14041
Merge pull request #1215 from cmu-delphi/EPID-61-fluview-clinical-que…
dmytrotsko Jun 27, 2023
7cfc97d
chore: release delphi-epidata 4.1.4
nolangormley Jun 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.3
current_version = 4.1.4
commit = False
tag = False

Expand Down
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true


[*.py]
# Change these settings to your own preference
indent_style = space
indent_size = 4


[*.md]
trim_trailing_whitespace = false
24 changes: 24 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# style(black): format cdc acquisition
980b0b7e80c7923b79e14fee620645e680785703
# style(black): format covidcast_nowcast acquisition
9e6ff16f599e8feec34a08dd1bddbc5eae347b55
# style(black): format ecdc acquisition
d1141d904da4e62992b97c92d5caebd8fadffd42
# style(black): format flusurv acquisition
08af0f6b7bff85bbc2b193b63b5abf6a16ba03e4
# style(black): format fluview acquisition
0133ef2042c4df8867e91595eb1f64873edb4632
# style(black): format ght acquisition
b8900a0bc846888885310911efd6e26459effa99
# style(black): format kcdc acquisition
a849384c884934b3b7c3c67b68aa6240277d6b6d
# style(black): format nidss acquisition
d04af3c02fda7708a16bec0952b1aa7475acaec7
# style(black): format paho acquisition
7f60fbba572c1b6e5153a9ef216895bdc2f7f5b3
# style(black): format quidel acquisition
b9ceb400d9248c8271e8342275664ac5524e335d
# style(black): format twitter acquisition
07ed83e5768f717ab0f9a62a9209e4e2cffa058d
# style(black): format wiki acquisition
923852eafa86b8f8b182d499489249ba8f815843
3 changes: 2 additions & 1 deletion .github/workflows/performance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
run: |
cd ../driver
sudo make web sql="${{ secrets.DB_CONN_STRING }}"
sudo make redis
- name: Check out delphi-admin
uses: actions/checkout@v3
with:
Expand All @@ -71,7 +72,7 @@ jobs:
run: |
cd delphi-admin/load-testing/locust
docker build -t locust .
export CSV=v4-requests-as_of.csv
export CSV=v4-requests-small.csv
touch output_stats.csv && chmod 666 output_stats.csv
touch output_stats_history.csv && chmod 666 output_stats_history.csv
touch output_failures.csv && chmod 666 output_failures.csv
Expand Down
18 changes: 0 additions & 18 deletions deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,6 @@
"add-header-comment": true
},

"// acquisition - norostat",
{
"type": "move",
"src": "src/acquisition/norostat/",
"dst": "[[package]]/acquisition/norostat/",
"match": "^.*\\.(py)$",
"add-header-comment": true
},

"// acquisition - paho",
{
"type": "move",
Expand Down Expand Up @@ -174,15 +165,6 @@
"add-header-comment": true
},

"// acquisition - afhsb",
{
"type": "move",
"src": "src/acquisition/afhsb/",
"dst": "[[package]]/acquisition/afhsb/",
"match": "^.*\\.(py)$",
"add-header-comment": true
},

"// acquisition - covidcast",
{
"type": "move",
Expand Down
4 changes: 1 addition & 3 deletions dev/local/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[metadata]
name = Delphi Development
version = 4.1.3
version = 4.1.4

[options]
packages =
delphi.epidata
delphi.epidata.acquisition
delphi.epidata.acquisition.afhsb
delphi.epidata.acquisition.cdcp
delphi.epidata.acquisition.covid_hosp
delphi.epidata.acquisition.covid_hosp.common
Expand All @@ -21,7 +20,6 @@ packages =
delphi.epidata.acquisition.ght
delphi.epidata.acquisition.kcdc
delphi.epidata.acquisition.nidss
delphi.epidata.acquisition.norostat
delphi.epidata.acquisition.paho
delphi.epidata.acquisition.quidel
delphi.epidata.acquisition.twtr
Expand Down
2 changes: 0 additions & 2 deletions docs/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ The parameters available for each source are documented in each linked source-sp

| Endpoint | Name | Description | Restricted? |
| --- | --- | --- | --- |
| [`afhsb`](ahfsb.md) | AFHSB | ... <!-- TODO --> | yes |
| [`cdc`](cdc.md) | CDC Page Hits | ... <!-- TODO --> | yes |
| [`delphi`](delphi.md) | Delphi's Forecast | ... <!-- TODO --> | no |
| [`ecdc_ili`](ecdc_ili.md) | ECDC ILI | ECDC ILI data from the ECDC website. | no |
Expand All @@ -122,7 +121,6 @@ The parameters available for each source are documented in each linked source-sp
| [`ght`](ght.md) | Google Health Trends | Estimate of influenza activity based on volume of certain search queries. | yes |
| [`kcdc_ili`](kcdc_ili.md) | KCDC ILI | KCDC ILI data from KCDC website. | no |
| [`meta`](meta.md) | API Metadata | Metadata for `fluview`, `twitter`, `wiki`, and `delphi`. | no |
| [`meta_afhsb`](meta_afhsb.md) | AFHSB Metadata | ... <!-- TODO --> | yes |
| [`nidss_flu`](nidss_flu.md) | NIDSS Flu | Outpatient ILI from Taiwan's National Infectious Disease Statistics System (NIDSS). | no |
| [`nowcast`](nowcast.md) | ILI Nearby | A nowcast of U.S. national, regional, and state-level (weighted) percent ILI, available seven days (regionally) or five days (state-level) before the first ILINet report for the corresponding week. | no |
| [`quidel`](quidel.md) | Quidel | Data provided by Quidel Corp., which contains flu lab test results. | yes |
Expand Down
52 changes: 0 additions & 52 deletions docs/api/afhsb.md

This file was deleted.

49 changes: 0 additions & 49 deletions docs/api/meta_afhsb.md

This file was deleted.

2 changes: 2 additions & 0 deletions docs/api/norostat.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ General topics not specific to any particular endpoint are discussed in the
[contributing](README.md#contributing), [citing](README.md#citing), and
[data licensing](README.md#data-licensing).

**NOTE**: Delphi stopped stopped acquiring data from this data source in November 2020.

## NoroSTAT Data

... <!-- TODO -->
Expand Down
25 changes: 23 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@

[tool.black]
line-length = 200
line-length = 100
target-version = ['py38']
include = 'server,tests/server'

[tool.pylint]
[tool.pylint.'MESSAGES CONTROL']
max-line-length = 100
disable = [
'logging-format-interpolation',
# Allow pytest functions to be part of a class
'no-self-use',
'too-many-locals',
'too-many-arguments',
# Allow pytest classes to have one test
'too-few-public-methods',
]

[tool.pylint.'BASIC']
# Allow arbitrarily short-named variables.
variable-rgx = ['[a-z_][a-z0-9_]*']
argument-rgx = [ '[a-z_][a-z0-9_]*' ]
attr-rgx = ['[a-z_][a-z0-9_]*']

[tool.pylint.'DESIGN']
ignored-argument-names = ['(_.*|run_as_module)']
2 changes: 1 addition & 1 deletion requirements.api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pandas==1.2.3
python-dotenv==0.15.0
pyyaml
redis==3.5.3
requests==2.28.1
requests==2.31.0
scipy==1.6.2
SQLAlchemy==1.4.40
structlog==22.1.0
Expand Down
Loading