From 01c882366a1df71031f1fa01f8b2a8d2cea47bc1 Mon Sep 17 00:00:00 2001 From: Rostyslav Zatserkovnyi Date: Fri, 17 May 2024 23:15:16 +0300 Subject: [PATCH 1/3] Use bumpversion for epidata client --- .bumpversion.cfg | 2 ++ src/client/delphi_epidata.py | 9 +-------- src/client/packaging/pypi/CHANGELOG.md | 2 ++ src/client/packaging/pypi/delphi_epidata/__init__.py | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 234774926..933c3a4f2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -9,6 +9,8 @@ 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] diff --git a/src/client/delphi_epidata.py b/src/client/delphi_epidata.py index bc8a2441c..162da28db 100644 --- a/src/client/delphi_epidata.py +++ b/src/client/delphi_epidata.py @@ -15,17 +15,10 @@ 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)"} diff --git a/src/client/packaging/pypi/CHANGELOG.md b/src/client/packaging/pypi/CHANGELOG.md index 56af46125..aca1e0155 100644 --- a/src/client/packaging/pypi/CHANGELOG.md +++ b/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 diff --git a/src/client/packaging/pypi/delphi_epidata/__init__.py b/src/client/packaging/pypi/delphi_epidata/__init__.py index c50efd740..2c92252a6 100644 --- a/src/client/packaging/pypi/delphi_epidata/__init__.py +++ b/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" From 7ce2f7c24e7decb7120fd421751c64b5a32017d9 Mon Sep 17 00:00:00 2001 From: Rostyslav Zatserkovnyi Date: Fri, 17 May 2024 23:23:50 +0300 Subject: [PATCH 2/3] Update _version_ filename --- .bumpversion.cfg | 2 -- src/client/delphi_epidata.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 933c3a4f2..21bf3dbb2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -15,6 +15,4 @@ tag = False [bumpversion:file:src/client/packaging/pypi/setup.py] -[bumpversion:file:src/client/packaging/pypi/delphi_epidata/__init__.py] - [bumpversion:file:dev/local/setup.cfg] diff --git a/src/client/delphi_epidata.py b/src/client/delphi_epidata.py index 162da28db..90a8d1689 100644 --- a/src/client/delphi_epidata.py +++ b/src/client/delphi_epidata.py @@ -18,9 +18,9 @@ from delphi.epidata.common.logger import get_structured_logger -_version = "4.1.20" +_version_ = "4.1.20" -_HEADERS = {"user-agent": "delphi_epidata/" + _version + " (Python)"} +_HEADERS = {"user-agent": "delphi_epidata/" + _version_ + " (Python)"} class EpidataException(Exception): @@ -43,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 From 7fc9518ef34485234f35e47a349287389f0d2276 Mon Sep 17 00:00:00 2001 From: Rostyslav Zatserkovnyi Date: Sat, 18 May 2024 00:00:32 +0300 Subject: [PATCH 3/3] _version_ to __version__ --- src/client/delphi_epidata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/delphi_epidata.py b/src/client/delphi_epidata.py index 90a8d1689..8c4d54308 100644 --- a/src/client/delphi_epidata.py +++ b/src/client/delphi_epidata.py @@ -18,9 +18,9 @@ from delphi.epidata.common.logger import get_structured_logger -_version_ = "4.1.20" +__version__ = "4.1.20" -_HEADERS = {"user-agent": "delphi_epidata/" + _version_ + " (Python)"} +_HEADERS = {"user-agent": "delphi_epidata/" + __version__ + " (Python)"} class EpidataException(Exception): @@ -43,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