Skip to content

Commit

Permalink
Merge pull request #1509 from cmu-delphi/bot/sync-main-dev
Browse files Browse the repository at this point in the history
chore: sync main->dev
  • Loading branch information
melange396 authored Jul 29, 2024
2 parents d9d024e + f431baf commit 8746ff2
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
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.24
current_version = 4.1.25
commit = False
tag = False

Expand Down
2 changes: 1 addition & 1 deletion dev/local/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = Delphi Development
version = 4.1.24
version = 4.1.25

[options]
packages =
Expand Down
2 changes: 1 addition & 1 deletion src/client/delphi_epidata.R
Original file line number Diff line number Diff line change
Expand Up @@ -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.24'
client_version <- '4.1.25'

auth <- getOption("epidata.auth", default = NA)

Expand Down
2 changes: 1 addition & 1 deletion src/client/delphi_epidata.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
})(this, function (exports, fetchImpl, jQuery) {
const BASE_URL = "https://api.delphi.cmu.edu/epidata/";
const client_version = "4.1.24";
const client_version = "4.1.25";

// Helper function to cast values and/or ranges to strings
function _listitem(value) {
Expand Down
2 changes: 1 addition & 1 deletion src/client/delphi_epidata.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from aiohttp import ClientSession, TCPConnector, BasicAuth

__version__ = "4.1.24"
__version__ = "4.1.25"

_HEADERS = {"user-agent": "delphi_epidata/" + __version__ + " (Python)"}

Expand Down
2 changes: 1 addition & 1 deletion src/client/packaging/npm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "delphi_epidata",
"description": "Delphi Epidata API Client",
"authors": "Delphi Group",
"version": "4.1.24",
"version": "4.1.25",
"license": "MIT",
"homepage": "https://github.com/cmu-delphi/delphi-epidata",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion src/client/packaging/pypi/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.24
current_version = 4.1.25
commit = False
tag = False

Expand Down
3 changes: 2 additions & 1 deletion src/client/packaging/pypi/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
All notable future changes to the `delphi_epidata` python client will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [4.1.25] - 2024-07-18
## [4.1.25] - 2024-07-29

### Includes
- https://github.com/cmu-delphi/delphi-epidata/pull/1456
- https://github.com/cmu-delphi/delphi-epidata/pull/1497

### Changed
- Added a one-time check which logs a warning when the newest client version does not match the client version in use.
Expand Down
2 changes: 1 addition & 1 deletion src/client/packaging/pypi/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build-backend = "setuptools.build_meta" # If not defined, then legacy behavior c

[project]
name = "delphi_epidata" # REQUIRED, is the only field that cannot be marked as dynamic.
version = "4.1.24"
version = "4.1.25"
description = "A programmatic interface to Delphi's Epidata API."
readme = "README.md"
license = { file = "LICENSE" }
Expand Down
2 changes: 1 addition & 1 deletion src/server/_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

load_dotenv()

VERSION = "4.1.24"
VERSION = "4.1.25"

MAX_RESULTS = int(10e6)
MAX_COMPATIBILITY_RESULTS = int(3650)
Expand Down

0 comments on commit 8746ff2

Please sign in to comment.