Use bumpversion for epidata client (#1436)

Author: rzats

.bumpversion.cfg

@@ -9,10 +9,10 @@ tag = False
 
 [bumpversion:file:src/client/delphi_epidata.R]
 
+[bumpversion:file:src/client/delphi_epidata.py]
+
 [bumpversion:file:src/client/packaging/npm/package.json]
 
 [bumpversion:file:src/client/packaging/pypi/setup.py]
 
-[bumpversion:file:src/client/packaging/pypi/delphi_epidata/__init__.py]
-
 [bumpversion:file:dev/local/setup.cfg]

src/client/delphi_epidata.py

@@ -15,19 +15,12 @@
 from tenacity import retry, stop_after_attempt
 
 from aiohttp import ClientSession, TCPConnector, BasicAuth
-from importlib.metadata import version, PackageNotFoundError
 
 from delphi.epidata.common.logger import get_structured_logger
 
-# 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 = version("delphi-epidata")
-except PackageNotFoundError:
-    _version = "0.script"
+__version__ = "4.1.20"
 
-_HEADERS = {"user-agent": "delphi_epidata/" + _version + " (Python)"}
+_HEADERS = {"user-agent": "delphi_epidata/" + __version__ + " (Python)"}
 
 
 class EpidataException(Exception):
@@ -50,7 +43,7 @@ class Epidata:
     BASE_URL = "https://api.delphi.cmu.edu/epidata"
     auth = None
 
-    client_version = _version
+    client_version = __version__
 
     logger = get_structured_logger('delphi_epidata_client')
     debug = False # if True, prints extra logging statements

src/client/packaging/pypi/CHANGELOG.md

@@ -7,11 +7,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Includes
 - https://github.com/cmu-delphi/delphi-epidata/pull/1418
+- https://github.com/cmu-delphi/delphi-epidata/pull/1436
 
 ### Added
 - Adds two debug flags:
   - `debug` logs info about HTTP requests and responses
   - `sandbox` prevents any HTTP requests from actually executing, allowing for tests that do not incur server load.
+- Fixes the `user-agent` version so that it is correctly set to match the current client release.
 
 ## [4.1.17] - 2024-01-30
 

src/client/packaging/pypi/delphi_epidata/__init__.py

@@ -1,4 +1,3 @@
-from .delphi_epidata import Epidata
+from .delphi_epidata import Epidata, __version__
 
 name = "delphi_epidata"
-__version__ = "4.1.20"