py client version check fixes and cleanup

integrations/client/test_delphi_epidata.py

@@ -317,7 +317,16 @@ def raise_for_status(self): pass
       def json(self): return json.loads(self.content)
     get.reset_mock()
     get.return_value = MockJson(b'{"info": {"version": "0.0.1"}}', 200)
+
+    # "back up" the value of this private class var and replace w/ default
+    # so the ._version_check() method runs unencumbered:
+    e_vdc__save = Epidata._version_checked
+    Epidata._version_checked = False
+    # run version check:
     Epidata._version_check()
+    # "restore" class var:
+    Epidata._version_checked = e_vdc__save
+
     captured = self.capsys.readouterr()
     output = captured.err.splitlines()
     self.assertEqual(len(output), 1)

src/client/delphi_epidata.py

@@ -46,29 +46,38 @@ class Epidata:
     debug = False # if True, prints extra logging statements
     sandbox = False # if True, will not execute any queries
 
+    _version_checked = False
+
     @staticmethod
     def log(evt, **kwargs):
         kwargs['event'] = evt
         kwargs['timestamp'] = time.strftime("%Y-%m-%d %H:%M:%S %z")
         return sys.stderr.write(str(kwargs) + "\n")
 
-    # Check that this client's version matches the most recent available, runs just once per program execution (on initial module load).
+    # Check that this client's version matches the most recent available.
+    # This is indended to run just once per program execution, on initial module load.
+    # See the bottom of this file for the ultimate call to this method.
     @staticmethod
     def _version_check():
+        if Epidata._version_checked:
+            # already done; nothing to do!
+            return
+
+        Epidata._version_checked = True
+
         try:
-            latest_version = requests.get('https://pypi.org/pypi/delphi-epidata/json').json()['info']['version']
-            if latest_version != __version__:
-                Epidata.log(
-                    "Client version not up to date",
-                    client_version=__version__,
-                    latest_version=latest_version
-                )
+            request = requests.get('https://pypi.org/pypi/delphi-epidata/json', timeout=5)
+            latest_version = request.json()['info']['version']
         except Exception as e:
             Epidata.log("Error getting latest client version", exception=str(e))
+            return
 
-    # Run this once on module load. Use dunder method for Python <= 3.9 compatibility 
-    # https://stackoverflow.com/a/12718272
-    _version_check.__func__()
+        if latest_version != __version__:
+            Epidata.log(
+                "Client version not up to date",
+                client_version=__version__,
+                latest_version=latest_version
+            )
 
     # Helper function to cast values and/or ranges to strings
     @staticmethod
@@ -708,3 +717,7 @@ async def async_make_calls(param_combos):
         future = asyncio.ensure_future(async_make_calls(param_list))
         responses = loop.run_until_complete(future)
         return responses
+
+
+
+Epidata._version_check()