lockss-pybasic 0.1.0.dev23__py3-none-any.whl → 0.1.1__py3-none-any.whl

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.1.0-dev23'
+__version__ = '0.1.1'

lockss/pybasic/cliutil.py

@@ -144,7 +144,7 @@ class BaseCli(Generic[BaseModelT]):
                     self._parser.exit(1, f'internal error: no _{field_name} callable for the {field_name} command')
                 break
         else:
-            self._parser.error(f'unknown command; expected one of {', '.join(field_names)}')
+            self._parser.error(f'unknown command; expected one of {", ".join(field_names)}')
 
     def _initialize_rich_argparse(self) -> None:
         """
@@ -192,7 +192,7 @@ def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[s
     enum_names = [field_name for field_name, model_field in model_cls.__fields__.items() if model_field.field_info.extra.get('enum') == enum_cls]
     ret = [field_name for field_name in enum_names if values.get(field_name)]
     if (length := len(ret)) > 1:
-        raise ValueError(f'at most one of {', '.join([option_name(enum_name) for enum_name in enum_names])} is allowed, got {length} ({', '.join([option_name(enum_name) for enum_name in ret])})')
+        raise ValueError(f'at most one of {", ".join([option_name(enum_name) for enum_name in enum_names])} is allowed, got {length} ({", ".join([option_name(enum_name) for enum_name in ret])})')
     return values
 
 
@@ -218,24 +218,24 @@ def get_from_enum(model_inst, enum_cls, default=None):
 
 def at_most_one(values: Dict[str, Any], *names: str):
     if (length := _matchy_length(values, *names)) > 1:
-        raise ValueError(f'at most one of {', '.join([option_name(name) for name in names])} is allowed, got {length}')
+        raise ValueError(f'at most one of {", ".join([option_name(name) for name in names])} is allowed, got {length}')
     return values
 
 
 def exactly_one(values: Dict[str, Any], *names: str):
     if (length := _matchy_length(values, *names)) != 1:
-        raise ValueError(f'exactly one of {', '.join([option_name(name) for name in names])} is required, got {length}')
+        raise ValueError(f'exactly one of {", ".join([option_name(name) for name in names])} is required, got {length}')
     return values
 
 
 def one_or_more(values: Dict[str, Any], *names: str):
     if _matchy_length(values, *names) == 0:
-        raise ValueError(f'one or more of {', '.join([option_name(name) for name in names])} is required')
+        raise ValueError(f'one or more of {", ".join([option_name(name) for name in names])} is required')
     return values
 
 
 def option_name(name: str) -> str:
-    return f'{('-' if len(name) == 1 else '--')}{name.replace('_', '-')}'
+    return f'{("-" if len(name) == 1 else "--")}{name.replace("_", "-")}'
 
 
 def _matchy_length(values: Dict[str, Any], *names: str) -> int:

lockss/pybasic/outpututil.py

@@ -46,7 +46,7 @@ DEFAULT_OUTPUT_FORMAT = 'simple' # from tabulate
 
 
 class OutputFormatOptions(BaseModel):
-    output_format: Optional[str] = Field(DEFAULT_OUTPUT_FORMAT, description=f'[output] set the output format; choices: {', '.join(OutputFormat.__members__.keys())}')
+    output_format: Optional[str] = Field(DEFAULT_OUTPUT_FORMAT, description=f'[output] set the output format; choices: {", ".join(OutputFormat.__members__.keys())}')
 
     @validator('output_format')
     def _validate_output_format(cls, val: str):
@@ -54,4 +54,4 @@ class OutputFormatOptions(BaseModel):
             _ = OutputFormat[val]
             return val
         except KeyError:
-            raise ValueError(f'must be one of {', '.join(OutputFormat.__members__.keys())}; got {val}')
+            raise ValueError(f'must be one of {", ".join(OutputFormat.__members__.keys())}; got {val}')

{lockss_pybasic-0.1.0.dev23.dist-info → lockss_pybasic-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev23
+Version: 0.1.1
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin
@@ -12,12 +12,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Framework :: Pydantic :: 2
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: System :: Archiving
-Classifier: Topic :: Utilities
 Requires-Dist: pydantic (>=2.11.0,<3.0.0)
 Requires-Dist: pydantic-argparse (>=0.10.0,<0.11.0)
 Requires-Dist: rich-argparse (>=1.7.0,<1.8.0)
@@ -29,8 +26,8 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.1.0-dev23
-.. |RELEASE_DATE| replace:: ?
+.. |RELEASE| replace:: 0.1.1
+.. |RELEASE_DATE| replace:: 2025-10-02
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
 

lockss_pybasic-0.1.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+lockss/pybasic/__init__.py,sha256=5NRdbEb_7GIZas3_wlx8I8qoaWR2HaYAgLF-pKKi_nY,1673
+lockss/pybasic/cliutil.py,sha256=zsIU_GJX31UM4XZbMhUxFMS2zVpA09_1q1GQAMW2HOc,10347
+lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
+lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
+lockss/pybasic/outpututil.py,sha256=8naQEZ1rM6vOFNL-9mWoK4dMBWokHmzQ0FkHaz8dyuM,2345
+lockss_pybasic-0.1.1.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_pybasic-0.1.1.dist-info/METADATA,sha256=1FRG9Ulhphoea8-n_lUCnc8oczgxzzgfOutbttcoMQE,4242
+lockss_pybasic-0.1.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_pybasic-0.1.1.dist-info/RECORD,,

lockss_pybasic-0.1.0.dev23.dist-info/RECORD

@@ -1,9 +0,0 @@
-lockss/pybasic/__init__.py,sha256=jmOhJI5PiH3jLMWLGSCBYvv8hV2yG9PTPUfvYGtP1oU,1679
-lockss/pybasic/cliutil.py,sha256=Q7WNFbtZzMBfEXjhqsUJlYOdsKYQm0Mgerf7aVe5VK8,10347
-lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
-lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
-lockss/pybasic/outpututil.py,sha256=JyXKXlkaCcCGvonUvmDGRdI6PxwN5t7DPVIk64S8-2g,2345
-lockss_pybasic-0.1.0.dev23.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_pybasic-0.1.0.dev23.dist-info/METADATA,sha256=viCY_etc3kouRMBzEAcl44-zfDWo2Fkzk767I91jBKM,4372
-lockss_pybasic-0.1.0.dev23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_pybasic-0.1.0.dev23.dist-info/RECORD,,