Merge pull request #1216 from cmu-delphi/release/delphi-epidata-4.1.4

Release Delphi Epidata 4.1.4

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.1.3
+current_version = 4.1.4
 commit = False
 tag = False
 

.editorconfig

@@ -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

.git-blame-ignore-revs

@@ -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

.github/workflows/performance-tests.yml

@@ -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:
@@ -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

deploy.json

@@ -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",
@@ -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",

dev/local/setup.cfg

@@ -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
@@ -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

docs/api/README.md

@@ -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 |
@@ -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 |

docs/api/norostat.md

@@ -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 -->

pyproject.toml

@@ -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)']

requirements.api.txt

@@ -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