Merge pull request #562 from cmu-delphi/sgratzl/bumpclientversions

unify client versions and bump them at once

Author: sgratzl

.bumpversion.cfg

@@ -4,3 +4,13 @@ commit = False
 tag = False
 
 [bumpversion:file:src/server/_config.py]
+
+[bumpversion:file:src/client/delphi_epidata.js]
+
+[bumpversion:file:src/client/delphi_epidata.R]
+
+[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]

src/client/delphi_epidata.R

@@ -15,6 +15,8 @@ Epidata <- (function() {
   # API base url
   BASE_URL <- 'https://delphi.cmu.edu/epidata/api.php'
 
+  client_version <- '0.1.0'
+
   # Helper function to cast values and/or ranges to strings
   .listitem <- function(value) {
     if(is.list(value) && 'from' %in% names(value) && 'to' %in% names(value)) {
@@ -614,6 +616,7 @@ Epidata <- (function() {
   # Export the public methods
   return(list(
     range = range,
+    client_version = client_version,
     fluview = fluview,
     fluview_meta = fluview_meta,
     fluview_clinical = fluview_clinical,

src/client/delphi_epidata.d.ts

@@ -17,6 +17,8 @@ declare module 'delphi_epidata' {
         readonly BASE_URL: string;
         range(this: void, from: string | number, to: string | number): EpiRange;
         withURL(this: void, baseUrl?: string): EpidataFunctions;
+        client_version: string;
+        version(): Promise<{version: string, client_version: string}>;
 
         afhsb(callback: EpiDataCallback, auth: string, locations: StringParam, epiweeks: EpiRangeParam, flu_types: StringParam): Promise<EpiDataResponse>;
         cdc(callback: EpiDataCallback, auth: string, epiweeks: EpiRangeParam, locations: StringParam): Promise<EpiDataResponse>;
@@ -56,6 +58,8 @@ declare module 'delphi_epidata' {
         readonly BASE_URL: string;
         range(this: void, from: string | number, to: string | number): EpiRange;
         withURL(this: void, baseUrl?: string): EpidataAsyncFunctions;
+        client_version: string;
+        version(): Promise<{ version: string, client_version: string }>;
 
         afhsb(auth: string, locations: StringParam, epiweeks: EpiRangeParam, flu_types: StringParam): Promise<EpiDataResponse>;
         cdc(auth: string, epiweeks: EpiRangeParam, locations: StringParam): Promise<EpiDataResponse>;

src/client/delphi_epidata.js

@@ -22,6 +22,7 @@
   }
 })(this, function (exports, fetchImpl, jQuery) {
   const BASE_URL = "https://delphi.cmu.edu/epidata/";
+  const client_version = "0.1.0";
 
   // Helper function to cast values and/or ranges to strings
   function _listitem(value) {
@@ -118,6 +119,10 @@
       BASE_URL: baseUrl || BASE_URL,
       withURL: createEpidataAsync,
       range,
+      client_version,
+      version: () => {
+        return _request('version', {}).then((r) => Object.assign(r, {client_version}));
+      },
       /**
        * Fetch AFHSB data (point data, no min/max)
        */
@@ -552,9 +557,15 @@
       BASE_URL: api.BASE_URL,
       withURL: createEpidata,
       range,
+      client_version,
+      version: () => {
+        return _request('version', {}).then((r) => Object.assign(r, { client_version }));
+      },
     };
+    const knownKeys = Object.keys(r);
     Object.keys(api).forEach((key) => {
-      if (key === "BASE_URL" || key === "withURL" || key === 'range') {
+      if (knownKeys.indexOf(key) >= 0) {
+        // known key ignore
         return;
       }
       r[key] = function (callback) {

src/client/delphi_epidata.py

@@ -35,6 +35,8 @@ class Epidata:
   # API base url
   BASE_URL = 'https://delphi.cmu.edu/epidata/api.php'
 
+  client_version = _version
+
   # Helper function to cast values and/or ranges to strings
   @staticmethod
   def _listitem(value):

src/client/packaging/npm/package-lock.json

@@ -2,7 +2,7 @@
   "name": "delphi_epidata",
   "description": "Delphi Epidata API Client",
   "authors": "Delphi Group",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "main": "delphi_epidata.js",
   "types": "delphi_epidata.d.ts",
   "browser": "delphi_epidata.js",

src/client/packaging/npm/package.json

@@ -1,29 +1,25 @@
 import setuptools
 
-with open('README.md', 'r') as f:
-  long_description = f.read()
+with open("README.md", "r") as f:
+    long_description = f.read()
 
 setuptools.setup(
-  name='delphi_epidata',
-  version='0.0.12',
-  author='David Farrow',
-  author_email='[email protected]',
-  description='A programmatic interface to Delphi\'s Epidata API.',
-  long_description=long_description,
-  long_description_content_type='text/markdown',
-  url='https://github.com/cmu-delphi/delphi-epidata',
-  packages=setuptools.find_packages(),
-  install_requires=[
-    'aiohttp',
-    'requests>=2.7.0',
-    'tenacity'
-  ],
-  classifiers=[
-    'Programming Language :: Python',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: OS Independent',
-    'Intended Audience :: Science/Research',
-    'Natural Language :: English',
-    'Topic :: Scientific/Engineering :: Bio-Informatics',
-  ],
+    name="delphi_epidata",
+    version="0.1.0",
+    author="David Farrow",
+    author_email="[email protected]",
+    description="A programmatic interface to Delphi's Epidata API.",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/cmu-delphi/delphi-epidata",
+    packages=setuptools.find_packages(),
+    install_requires=["aiohttp", "requests>=2.7.0", "tenacity"],
+    classifiers=[
+        "Programming Language :: Python",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Intended Audience :: Science/Research",
+        "Natural Language :: English",
+        "Topic :: Scientific/Engineering :: Bio-Informatics",
+    ],
 )