diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ebb2e8f0d..ea32675f2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.16 +current_version = 4.1.17 commit = False tag = False diff --git a/dev/local/setup.cfg b/dev/local/setup.cfg index a907e8307..6172302be 100644 --- a/dev/local/setup.cfg +++ b/dev/local/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = Delphi Development -version = 4.1.16 +version = 4.1.17 [options] packages = diff --git a/requirements.dev.txt b/requirements.dev.txt index c071f208d..818a21553 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.0 +aiohttp==3.9.2 black>=20.8b1 bump2version==1.0.1 covidcast==0.1.5 diff --git a/src/client/delphi_epidata.R b/src/client/delphi_epidata.R index d953b39be..37d94401b 100644 --- a/src/client/delphi_epidata.R +++ b/src/client/delphi_epidata.R @@ -15,7 +15,7 @@ Epidata <- (function() { # API base url BASE_URL <- getOption('epidata.url', default = 'https://api.delphi.cmu.edu/epidata/') - client_version <- '4.1.16' + client_version <- '4.1.17' auth <- getOption("epidata.auth", default = NA) diff --git a/src/client/delphi_epidata.js b/src/client/delphi_epidata.js index 4619f2de4..d8f6b7f4d 100644 --- a/src/client/delphi_epidata.js +++ b/src/client/delphi_epidata.js @@ -22,7 +22,7 @@ } })(this, function (exports, fetchImpl, jQuery) { const BASE_URL = "https://api.delphi.cmu.edu/epidata/"; - const client_version = "4.1.16"; + const client_version = "4.1.17"; // Helper function to cast values and/or ranges to strings function _listitem(value) { diff --git a/src/client/delphi_epidata.py b/src/client/delphi_epidata.py index 22052657a..22fd4d4e2 100644 --- a/src/client/delphi_epidata.py +++ b/src/client/delphi_epidata.py @@ -14,14 +14,14 @@ from tenacity import retry, stop_after_attempt from aiohttp import ClientSession, TCPConnector, BasicAuth -from pkg_resources import get_distribution, DistributionNotFound +from importlib.metadata import version, PackageNotFoundError # Obtain package version for the user-agent. Uses the installed version by # preference, even if you've installed it and then use this script independently # by accident. try: - _version = get_distribution("delphi-epidata").version -except DistributionNotFound: + _version = version("delphi-epidata") +except PackageNotFoundError: _version = "0.script" _HEADERS = {"user-agent": "delphi_epidata/" + _version + " (Python)"} diff --git a/src/client/packaging/npm/package.json b/src/client/packaging/npm/package.json index eaad50cb7..7370338ed 100644 --- a/src/client/packaging/npm/package.json +++ b/src/client/packaging/npm/package.json @@ -2,7 +2,7 @@ "name": "delphi_epidata", "description": "Delphi Epidata API Client", "authors": "Delphi Group", - "version": "4.1.16", + "version": "4.1.17", "license": "MIT", "homepage": "https://github.com/cmu-delphi/delphi-epidata", "bugs": { diff --git a/src/client/packaging/pypi/delphi_epidata/__init__.py b/src/client/packaging/pypi/delphi_epidata/__init__.py index bbe42121e..73c12d04b 100644 --- a/src/client/packaging/pypi/delphi_epidata/__init__.py +++ b/src/client/packaging/pypi/delphi_epidata/__init__.py @@ -1,4 +1,4 @@ from .delphi_epidata import Epidata name = "delphi_epidata" -__version__ = "4.1.16" +__version__ = "4.1.17" diff --git a/src/client/packaging/pypi/setup.py b/src/client/packaging/pypi/setup.py index 8505510fe..4e9344b83 100644 --- a/src/client/packaging/pypi/setup.py +++ b/src/client/packaging/pypi/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="delphi_epidata", - version="4.1.16", + version="4.1.17", author="David Farrow", author_email="dfarrow0@gmail.com", description="A programmatic interface to Delphi's Epidata API.", diff --git a/src/server/_config.py b/src/server/_config.py index a054ece6f..086b306e2 100644 --- a/src/server/_config.py +++ b/src/server/_config.py @@ -7,7 +7,7 @@ load_dotenv() -VERSION = "4.1.16" +VERSION = "4.1.17" MAX_RESULTS = int(10e6) MAX_COMPATIBILITY_RESULTS = int(3650)