Merge branch 'develop' into main

Author: mhucka

CHANGES.md

@@ -1,6 +1,15 @@
 Change log for CommonPy
 =======================
 
+Version 1.3.0
+-------------
+
+* Fixed issue #2: httpx Timeout needs a default value.
+* Bump the required version of [httpx](https://www.python-httpx.org) to 0.16.
+* Changed name `filter_by_extension(...)` to `filtered_by_extension(...)` to follow the style of other functions that return values.
+* Made trivial changes to the Makefile
+
+
 Version 1.2.0
 -------------
 

README.md

@@ -92,7 +92,7 @@ The `file_utils` module provides a number of miscellaneous simple functions for
 | `copy_file(src, dst)` | Copies file from `src` to `dst` |
 | `open_file(file)` | Opens the `file` by calling the equivalent of "open" on this system |
 | `open_url(url)` | Opens the `url` in the user's default web browser |
-| `filter_by_extensions(list, endings)` | |
+| `filtered_by_extensions(list, endings)` | |
 | `files_in_directory(dir, ext, recursive)` | |
 
 

commonpy/file_utils.py

@@ -105,7 +105,7 @@ def alt_extension(filepath, ext):
     return path.splitext(filepath)[0] + '.' + ext
 
 
-def filter_by_extensions(item_list, endings):
+def filtered_by_extensions(item_list, endings):
     if not item_list:
         return []
     if not endings:

commonpy/interrupt.py

@@ -112,7 +112,7 @@ def interrupted():
 
 
 def raise_for_interrupts():
-    '''Check whether an interrupt occurred; if so, raise UserCancelled.'''
+    '''Check whether an interrupt occurred; if so, raise an exception.'''
     if interrupted():
         if __debug__: log(f'raising {__exception}')
         raise __exception

commonpy/network_utils.py

@@ -114,7 +114,7 @@ def addurl(text):
         return f'{text} for {url}'
 
     if client is None:
-        timeout = httpx.Timeout(connect = 15, read = 15, write = 15)
+        timeout = httpx.Timeout(15, connect = 15, read = 15, write = 15)
         client = httpx.Client(timeout = timeout, http2 = True, verify = False)
 
     failures = 0

requirements.txt

@@ -2,7 +2,7 @@ PyYAML          >= 5.3.1
 boltons         >= 20.2.1
 dateparser      >= 1.0.0
 h2              >= 3.2.0
-httpx           >= 0.14.2
+httpx           >= 0.16.1
 humanize        >= 3.0.0
 pytest          >= 6.1.2
 python_dateutil >= 2.8.1

setup.cfg

@@ -8,7 +8,7 @@
 
 [metadata]
 name          = commonpy
-version       = 1.2.0
+version       = 1.3.0
 description   = Assortment of Python helper functions and utility classes
 author        = Michael Hucka
 author_email  = mhucka@caltech.edu

tests/test_network_utils.py

@@ -0,0 +1,18 @@
+import os
+import pytest
+import sys
+from   time import time
+
+try:
+    thisdir = os.path.dirname(os.path.abspath(__file__))
+    sys.path.append(os.path.join(thisdir, '..'))
+except:
+    sys.path.append('..')
+
+from commonpy.network_utils import *
+
+
+def test_net():
+    (response, error) = net('get', 'https://www.google.com')
+    assert error == None
+    assert response.status_code == 200