cmdkit 2.7.5__tar.gz → 2.7.7__tar.gz

{cmdkit-2.7.5 → cmdkit-2.7.7}/PKG-INFO

@@ -1,25 +1,27 @@
 Metadata-Version: 2.1
 Name: cmdkit
-Version: 2.7.5
+Version: 2.7.7
 Summary: A command-line utility toolkit for Python.
 Home-page: https://cmdkit.readthedocs.io
 License: Apache-2.0
 Keywords: command-line,utility,toolkit
 Author: Geoffrey Lentner
 Author-email: glentner@purdue.edu
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
-Requires-Dist: toml (>=0.10.2,<0.11.0)
+Provides-Extra: toml
+Provides-Extra: yaml
+Requires-Dist: pyyaml (>=6.0.1,<7.0.0) ; extra == "yaml"
+Requires-Dist: tomli (>=2.1.0,<3.0.0) ; extra == "toml"
+Requires-Dist: tomli-w (>=1.1.0,<2.0.0) ; extra == "toml"
 Project-URL: Documentation, https://cmdkit.readthedocs.io
 Project-URL: Repository, https://github.com/glentner/cmdkit
 Description-Content-Type: text/x-rst
@@ -29,7 +31,7 @@ CmdKit
 
 A library for developing command-line applications in Python.
 
-.. image:: https://img.shields.io/badge/license-Apache-blue.svg?style=flat
+.. image:: https://img.shields.io/badge/license-Apache-yellow.svg?style=flat
     :target: https://www.apache.org/licenses/LICENSE-2.0
     :alt: License
 
@@ -45,6 +47,10 @@ A library for developing command-line applications in Python.
     :target: https://cmdkit.readthedocs.io
     :alt: Documentation
 
+.. image:: https://github.com/glentner/cmdkit/actions/workflows/tests.yml/badge.svg
+    :target: https://github.com/glentner/cmdkit/actions/workflows/tests.yml
+    :alt: Tests
+
 .. image:: https://pepy.tech/badge/cmdkit
     :target: https://pepy.tech/badge/cmdkit
     :alt: Downloads
@@ -62,7 +68,7 @@ understand.
 Installation
 ------------
 
-*CmdKit* is tested on Python 3.7+ for `Windows`, `macOS`, and `Linux`, and can be installed
+*CmdKit* is tested for `Windows`, `macOS`, and `Linux`, and can be installed
 from the `Python Package Index` using `Pip`.
 
 ::

{cmdkit-2.7.5 → cmdkit-2.7.7}/README.rst

@@ -3,7 +3,7 @@ CmdKit
 
 A library for developing command-line applications in Python.
 
-.. image:: https://img.shields.io/badge/license-Apache-blue.svg?style=flat
+.. image:: https://img.shields.io/badge/license-Apache-yellow.svg?style=flat
     :target: https://www.apache.org/licenses/LICENSE-2.0
     :alt: License
 
@@ -19,6 +19,10 @@ A library for developing command-line applications in Python.
     :target: https://cmdkit.readthedocs.io
     :alt: Documentation
 
+.. image:: https://github.com/glentner/cmdkit/actions/workflows/tests.yml/badge.svg
+    :target: https://github.com/glentner/cmdkit/actions/workflows/tests.yml
+    :alt: Tests
+
 .. image:: https://pepy.tech/badge/cmdkit
     :target: https://pepy.tech/badge/cmdkit
     :alt: Downloads
@@ -36,7 +40,7 @@ understand.
 Installation
 ------------
 
-*CmdKit* is tested on Python 3.7+ for `Windows`, `macOS`, and `Linux`, and can be installed
+*CmdKit* is tested for `Windows`, `macOS`, and `Linux`, and can be installed
 from the `Python Package Index` using `Pip`.
 
 ::

{cmdkit-2.7.5 → cmdkit-2.7.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmdkit"
-version = "2.7.5"
+version = "2.7.7"
 description = "A command-line utility toolkit for Python."
 readme = "README.rst"
 license = "Apache-2.0"
@@ -15,7 +15,6 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -25,10 +24,15 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4.0"
-toml = {version = "^0.10.2", optional = true}
+python = ">=3.9,<4.0"
+tomli = {version = "^2.1.0", optional = true}
+tomli-w = {version = "^1.1.0", optional = true}
 pyyaml = {version = "^6.0.1", optional = true}
 
+[tool.poetry.extras]
+toml = ['tomli', 'tomli-w']
+yaml = ['pyyaml']
+
 [tool.poetry.group.docs.dependencies]
 sphinx = "^7.2.6"
 sphinx-sitemap = "^2.5.1"
@@ -39,17 +43,14 @@ sphinxcontrib-details-directive = "^0.1.0"
 sphinx-toolbox = "^3.5.0"
 pydata-sphinx-theme = "^0.15.1"
 enum-tools = {extras = ["sphinx"], version = "^0.10.0"}
+docutils = "^0.21.1"  # NOTE: https://github.com/python-poetry/poetry/issues/9293
 
 [tool.poetry.group.dev.dependencies]
-toml = "^0.10.2"
+tomli = "^2.1.0"
+tomli-w = "^1.1.0"
 pyyaml = "^6.0.1"
 pytest = "^7.4.4"
-pytest-cov = "^4.1.0"
 hypothesis = "^6.92.6"
-ruff = "^0.1.11"
-pyright = "^1.1.345"
-pynvim = "^0.5.0"
-ipython = "^8.20.0"
 sphinx-autobuild = "^2021.3.14"
 
 [build-system]

{cmdkit-2.7.5 → cmdkit-2.7.7}/src/cmdkit/namespace.py

@@ -10,6 +10,7 @@ from typing import Union, Mapping, Iterable, Any, Dict, Optional, IO, List, Tupl
 
 # standard libs
 import os
+import sys
 import functools
 import subprocess
 from collections import Counter
@@ -135,8 +136,9 @@ class Namespace(NSCoreMixin):
         If `filepath` does not exist an exception is raised as expected,
         unless `ignore_if_missing` is `True` and an empty Namespace is returned instead.
 
-        Supported formats are `yaml`, `toml`, and `json`. You must have the necessary
-        library installed (i.e., `pyyaml` or `toml` respectively).
+        Supported formats currently include `yaml`, `toml`, and `json`.
+        For yaml support include "yaml" extra (adds `pyyaml` dependency).
+        For toml support include "toml" extra when Python < 3.11 (adds `tomli` dependency).
 
         Example:
             >>> Namespace.from_local('config.toml', ignore_if_missing=True)
@@ -174,12 +176,15 @@ class Namespace(NSCoreMixin):
     @classmethod
     def from_toml(cls, path_or_file: Union[str, IO], **options) -> Namespace:
         """Load a namespace from a TOML file."""
-        import toml
+        if sys.version_info >= (3, 11):
+            import tomllib as toml
+        else:
+            import tomli as toml
         if isinstance(path_or_file, str):
-            with open(path_or_file, mode='r', **options) as source:
+            with open(path_or_file, mode='rb', **options) as source:
                 return cls(toml.load(source))
         else:
-            return cls(toml.load(path_or_file))
+            return cls(toml.loads(path_or_file.read()))
 
     @classmethod
     def from_json(cls, path_or_file: Union[str, IO], **options) -> Namespace:
@@ -218,10 +223,10 @@ class Namespace(NSCoreMixin):
 
     def to_toml(self, path_or_file: Union[str, IO], encoding: str = 'utf-8', **kwargs) -> None:
         """Output to TOML file."""
-        import toml
+        import tomli_w as toml
         if isinstance(path_or_file, str):
             with open(path_or_file, mode='w', encoding=encoding) as output:
-                toml.dump(self.to_dict(), output, **kwargs)
+                output.write(toml.dumps(self.to_dict(), **kwargs))
         else:
             toml.dump(self.to_dict(), path_or_file, **kwargs)
 
@@ -322,7 +327,7 @@ def _coerced(var: str) -> _VT:
         pass
     try:
         return float(var)
-    except(ValueError, TypeError):
+    except (ValueError, TypeError):
         return var