lockss-pybasic 0.3.0.dev5__tar.gz → 0.3.0.dev6__tar.gz

{lockss_pybasic-0.3.0.dev5 → lockss_pybasic-0.3.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockss-pybasic
-Version: 0.3.0.dev5
+Version: 0.3.0.dev6
 Summary: Basic Python utilities
 License: BSD-3-Clause
 License-File: LICENSE
@@ -26,7 +26,7 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev5
+.. |RELEASE| replace:: 0.3.0-dev6
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
@@ -68,3 +68,9 @@ Release Notes
 
 See `<CHANGELOG.rst>`_.
 
+----------
+Unit Tests
+----------
+
+Run ``python -m unittest discover tests`` at the root of the project tree (where there is a directory called ``tests``).
+

{lockss_pybasic-0.3.0.dev5 → lockss_pybasic-0.3.0.dev6}/README.rst

@@ -2,7 +2,7 @@
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev5
+.. |RELEASE| replace:: 0.3.0-dev6
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
@@ -43,3 +43,9 @@ Release Notes
 -------------
 
 See `<CHANGELOG.rst>`_.
+
+----------
+Unit Tests
+----------
+
+Run ``python -m unittest discover tests`` at the root of the project tree (where there is a directory called ``tests``).

{lockss_pybasic-0.3.0.dev5 → lockss_pybasic-0.3.0.dev6}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-pybasic"
-version = "0.3.0-dev5" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.3.0-dev6" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
 description = "Basic Python utilities"
 license = { text = "BSD-3-Clause" }
 readme = "README.rst"

{lockss_pybasic-0.3.0.dev5 → lockss_pybasic-0.3.0.dev6}/src/lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.3.0-dev5'
+__version__ = '0.3.0-dev6'

{lockss_pybasic-0.3.0.dev5 → lockss_pybasic-0.3.0.dev6}/src/lockss/pybasic/nodeutil.py

@@ -128,17 +128,17 @@ class NodeSpec2(BaseNodeSpec):
                              description="The node's SOAP Compatibility Service REST API Port")
 
 
-_RE_NODE_REFERENCE: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
+_RE_COMPACT_NODE_SPEC: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
 
 
 #: A type for LOCKSS node specification strings.
-NodeSpecStr = str
+CompactNodeSpec = str
 
 
-def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
-    mat: Optional[Match[str]] = _RE_NODE_REFERENCE.fullmatch(node_spec_string)
+def _parse_compact_node_spec(compact_node_spec: CompactNodeSpec) -> dict[str, str]:
+    mat: Optional[Match[str]] = _RE_COMPACT_NODE_SPEC.fullmatch(compact_node_spec)
     if mat is None:
-        raise ValueError(f'Invalid node specification string: {node_spec_string}')
+        raise ValueError(f'Invalid compact node specification: {compact_node_spec}')
     d = dict(host=mat.group('host'))
     if prot := mat.group('protocol'):
         d['protocol'] = prot
@@ -153,7 +153,7 @@ def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
             d['type'] = NodeTypeEnum.V1.value
             d['ui'] = repo_or_ui
         else:
-            raise ValueError(f'Invalid repository/UI port in node specification string: {repo_or_ui}')
+            raise ValueError(f'Invalid repository/UI port in compact node specification: {repo_or_ui}')
     else:
         # Assume V2
         d['type'] = NodeTypeEnum.V2.value
@@ -163,17 +163,17 @@ def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
     return d
 
 
-def _maybe_deserialize_node_spec_string(value: Any) -> Any:
-    if isinstance(value, NodeSpecStr) and not value.startswith('{'):
-        return _parse_node_spec_string(value)
+def _maybe_deserialize_compact_node_spec(value: Any) -> Any:
+    if isinstance(value, CompactNodeSpec) and not value.startswith('{'):
+        return _parse_compact_node_spec(value)
     return value
 
 
 #: A type for LOCKSS node specifications, that also accepts a compact LOCKSS
-#: node specification string.
+#: node specification.
 NodeSpec = Annotated[
     Annotated[Union[NodeSpec1, NodeSpec2], Field(discriminator='type')],
-    BeforeValidator(_maybe_deserialize_node_spec_string)
+    BeforeValidator(_maybe_deserialize_compact_node_spec)
 ]