edq-utils 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

edq/__init__.py

@@ -2,4 +2,4 @@
 General Python tools used by several EduLinq projects.
 """
 
-__version__ = '0.1.0'
+__version__ = '0.1.2'

edq/testing/cli.py

@@ -35,6 +35,7 @@ import edq.util.json
 import edq.util.pyimport
 
 TEST_CASE_SEP: str = '---'
+OUTPUT_SEP: str = '+++'
 DATA_DIR_ID: str = '__DATA_DIR__'
 ABS_DATA_DIR_ID: str = '__ABS_DATA_DIR__'
 TEMP_DIR_ID: str = '__TEMP_DIR__'
@@ -149,7 +150,7 @@ class CLITestInfo:
         """
         Split stdout and stderr into different strings for testing.
         By default, these two will be combined.
-        If both are non-empty, then they will be joined like: f"{stdout}\n{TEST_CASE_SEP}\n{stderr}".
+        If both are non-empty, then they will be joined like: f"{stdout}\n{OUTPUT_SEP}\n{stderr}".
         Otherwise, only the non-empty one will be present with no separator.
         Any stdout assertions will be applied to the combined text.
         """
@@ -293,7 +294,7 @@ def _get_test_method(test_name: str, path: str, data_dir: str) -> typing.Callabl
 
         if (not test_info.split_stdout_stderr):
             if ((len(stdout_text) > 0) and (len(stderr_text) > 0)):
-                stdout_text = f"{stdout_text}\n{TEST_CASE_SEP}\n{stderr_text}"
+                stdout_text = f"{stdout_text}\n{OUTPUT_SEP}\n{stderr_text}"
             elif (len(stderr_text) > 0):
                 stdout_text = stderr_text
 

edq/testing/testdata/cli/tests/help_base.txt

@@ -0,0 +1,9 @@
+{
+    "cli": "edq.cli.version",
+    "arguments": [
+        '--help'
+    ],
+    "error": true
+}
+---
+builtins.SystemExit: 0

edq/testing/unittest.py

@@ -14,6 +14,20 @@ class BaseTest(unittest.TestCase):
     maxDiff = None
     """ Don't limit the size of diffs. """
 
+    def assertJSONEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
+        """
+        Like unittest.TestCase.assertEqual(),
+        but uses a default assertion message containing the full JSON representation of the arguments.
+        """
+
+        a_json = edq.util.json.dumps(a, indent = 4)
+        b_json = edq.util.json.dumps(b, indent = 4)
+
+        if (message is None):
+            message = FORMAT_STR % (a_json, b_json)
+
+        super().assertEqual(a, b, msg = message)
+
     def assertJSONDictEqual(self, a: typing.Any, b: typing.Any, message: typing.Union[str, None] = None) -> None:  # pylint: disable=invalid-name
         """
         Like unittest.TestCase.assertDictEqual(),

edq/util/net.py

@@ -666,6 +666,7 @@ def make_request(method: str, url: str,
         params_to_skip: typing.Union[typing.List[str], None] = None,
         http_exchange_extension: str = DEFAULT_HTTP_EXCHANGE_EXTENSION,
         add_http_prefix: bool = True,
+        additional_requests_options: typing.Union[typing.Dict[str, typing.Any], None] = None,
         **kwargs: typing.Any) -> typing.Tuple[requests.Response, str]:
     """
     Make an HTTP request and return the response object and text body.
@@ -686,6 +687,9 @@ def make_request(method: str, url: str,
     if (files is None):
         files = []
 
+    if (additional_requests_options is None):
+        additional_requests_options = {}
+
     # Add in the anchor as a header (since it is not traditionally sent in an HTTP request).
     if (send_anchor_header):
         headers = headers.copy()
@@ -693,11 +697,12 @@ def make_request(method: str, url: str,
         parts = urllib.parse.urlparse(url)
         headers[ANCHOR_HEADER_KEY] = parts.fragment.lstrip('#')
 
-    options = {
+    options = additional_requests_options.copy()
+    options.update({
         'headers': headers,
         'files': files,
         'timeout': timeout_secs,
-    }
+    })
 
     if (method == 'GET'):
         options['params'] = data

{edq_utils-0.1.0.dist-info → edq_utils-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edq-utils
-Version: 0.1.0
+Version: 0.1.2
 Summary: Common utilities used by EduLinq Python projects.
 Author-email: Eriq Augustine <eriq@edulinq.org>
 License: MIT License
@@ -50,6 +50,12 @@ Dynamic: license-file
 
 Common utilities used by EduLinq Python projects.
 
+Links:
+ - [API Reference](https://edulinq.github.io/python-utils)
+ - [Installation / Requirements](#installation--requirements)
+ - [Configuration System](#configuration-system)
+   - [Configuration Sources](#configuration-sources)
+
 ## Installation / Requirements
 
 This project requires [Python](https://www.python.org/) >= 3.8.

{edq_utils-0.1.0.dist-info → edq_utils-0.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-edq/__init__.py,sha256=s4h6UXPoPuTu7cqINYLADDsjMb02vK__kSlb8OHADA0,86
+edq/__init__.py,sha256=VAgZ9kvZ2qpXBYL-SEmjPCrwVnAvgGTObRn8sfZjbvw,86
 edq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edq/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edq/cli/version.py,sha256=SxarRVD_AVA-nD4pLVMe6ZjSJpMr7h_r3DgYYs42vjE,591
@@ -21,16 +21,17 @@ edq/procedure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edq/procedure/verify_exchanges.py,sha256=Bv-wscTaSx5bbQfD6tZutCtG_pyHuFIBhk_RB5ZMJEQ,2765
 edq/testing/__init__.py,sha256=IKd3fPU_8d_jP19HxG-zKwxFwn7nqFGGtXOY5slY41c,32
 edq/testing/asserts.py,sha256=BxWTH9aQFwmzb0tf5hx3V4aeJzmiBOO-QajaMM6zklI,2523
-edq/testing/cli.py,sha256=L3ar6Q6ZQ5ZTH9TFpMIen4tRXjSwYJlBVEL9WQXc_lU,12898
+edq/testing/cli.py,sha256=Pzb1-6nrC6kYRBTI4R-pCfwDQ7reQUzH68xLn2ZSdME,12916
 edq/testing/cli_test.py,sha256=IqzdK1fEit_3HagSU-nNI4EjkoQp6-I88JGZ1_x_uQk,525
 edq/testing/httpserver.py,sha256=r2xSFkHTEzO92vW9XV5g43kC3vOcyQD-RVedXke1IZI,20311
 edq/testing/httpserver_test.py,sha256=tjBgBbKTHeqE1ugHyao4HpW7FNPTkBGpWK3vuqJgNQg,12123
 edq/testing/run.py,sha256=Axv0t6yZRUS39xmf5PWR5b54Rg21Nz0ip8G4UyJm1Ik,4814
-edq/testing/unittest.py,sha256=ynVZSA0y9lYPrUqj38rgH_AvwHDF0nRF2VCe2JUP9_4,2426
+edq/testing/unittest.py,sha256=7-5ScxXpMBvhhyCvRMPiiUbdfx9FcpMgU6M5A3oHV7c,2980
 edq/testing/testdata/cli/data/configs/empty/edq-config.json,sha256=yj0WO6sFU4GCciYUBWjzvvfqrBh869doeOC2Pp5EI1Y,3
 edq/testing/testdata/cli/data/configs/simple-1/edq-config.json,sha256=uQdt7o7VNjOSQk8ni6UrqZ95QkJTUgHcwaL2TvY30bs,42
 edq/testing/testdata/cli/data/configs/simple-2/edq-config.json,sha256=F3vP5hF1G7rPp2PPUgHemvgA-2AuxTC6Pah8Yr-fRmw,37
 edq/testing/testdata/cli/data/configs/value-number/edq-config.json,sha256=UrB_6Pa_JRZN3NzuM0OugxQgPizUC5RMqP5xv06cuvg,20
+edq/testing/testdata/cli/tests/help_base.txt,sha256=7FWdcKFpICb8lfz-Zj_b8izzGK5ri0FqH0FJrTn5jss,122
 edq/testing/testdata/cli/tests/platform_skip.txt,sha256=J6n7v3LhfTyjR3Ejo-uR-g6Xdxx34Fu_cmyGSii_elc,103
 edq/testing/testdata/cli/tests/version_base.txt,sha256=5e9oSQaivA-0Th7wXpNRhACluyDwvFTL_1xfAkS2Pko,69
 edq/testing/testdata/cli/tests/config/list/config_list_base.txt,sha256=jtHqRPxM-uJfMkmnZaSDilsxMF7y6UXw-iEtHe8XCuw,495
@@ -65,14 +66,14 @@ edq/util/dirent.py,sha256=gvU7I8TPFIjURAOPalfaOf3GSlAA0mXET_bHKC6_e_A,10369
 edq/util/dirent_test.py,sha256=WUx6Ux-13L9YIg2rDyOROv5Kbvgr4xy693ceG1osAP0,33855
 edq/util/json.py,sha256=nl_cxrlP97RX1BFtys8IT_3IfO0-XvBDQBe6YdrblB4,5936
 edq/util/json_test.py,sha256=utUVRbw3z42ke4fpRVI294RrFHcMKms8khVYRkISNk4,8009
-edq/util/net.py,sha256=2RT9UlO9nZ9jx1UfwKhSAG_sb7WgT6trn6MQm-BIKNo,32864
+edq/util/net.py,sha256=KJZph2rj7YzALT46xIx6QBu_7nSyimJsRA2ZvxpM134,33101
 edq/util/pyimport.py,sha256=26OIuCXELyqtwlooMqDEs4GJQrkrAgxnXNYTlqqtsBY,2852
 edq/util/pyimport_test.py,sha256=Xno0MIa3yMTfBfoTgjKCIMpr1ZShU6bvo9rBRdecXQU,4202
 edq/util/reflection.py,sha256=jPcW6h0fwSDYh04O5rUxlgoF7HK6fVQ2mq7DD9qPrEg,972
 edq/util/time.py,sha256=anoNM_KniARLombv2BnsoHuCzDqMKiDdIzV7RUe2ZOk,2648
 edq/util/time_test.py,sha256=iQZwzVTVQQ4TdXrLb9MUMCYlKrIe8qyF-hiC9YLTaMo,4610
-edq_utils-0.1.0.dist-info/licenses/LICENSE,sha256=MS4iYEl4rOxMoprZuc86iYVoyk4YgaVoMt7WmGvVF8w,1064
-edq_utils-0.1.0.dist-info/METADATA,sha256=b3se-mr6ELcGF-YWSQBu-tIFM5OgI4uNI_EsiNhxW0Q,7304
-edq_utils-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-edq_utils-0.1.0.dist-info/top_level.txt,sha256=znBHSj6tgXtcMKrUVtovLli5fIEJCb7d-BMxTLRK4zk,4
-edq_utils-0.1.0.dist-info/RECORD,,
+edq_utils-0.1.2.dist-info/licenses/LICENSE,sha256=MS4iYEl4rOxMoprZuc86iYVoyk4YgaVoMt7WmGvVF8w,1064
+edq_utils-0.1.2.dist-info/METADATA,sha256=D8tZ8ZU7TXBQ6FEmam6zvCerJlc9Gsoj-_4pANJGRlc,7535
+edq_utils-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+edq_utils-0.1.2.dist-info/top_level.txt,sha256=znBHSj6tgXtcMKrUVtovLli5fIEJCb7d-BMxTLRK4zk,4
+edq_utils-0.1.2.dist-info/RECORD,,