python-simpleconf 0.5.9__tar.gz → 0.6.1__tar.gz

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/PKG-INFO

@@ -1,29 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: python-simpleconf
-Version: 0.5.9
+Version: 0.6.1
 Summary: Simple configuration management with python.
-Home-page: https://github.com/pwwang/simpleconf
 License: MIT
 Author: pwwang
 Author-email: pwwang@pwwang.com
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-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
 Provides-Extra: all
 Provides-Extra: env
 Provides-Extra: ini
 Provides-Extra: toml
 Provides-Extra: yaml
-Requires-Dist: diot (>=0.2.1,<0.3.0)
+Requires-Dist: diot (>=0.3.1,<0.4.0)
 Requires-Dist: iniconfig (>=2.0,<3.0) ; extra == "ini" or extra == "all"
-Requires-Dist: python-dotenv (>=0.21,<0.22) ; extra == "env" or extra == "all"
+Requires-Dist: python-dotenv (>=1.0,<2.0) ; extra == "env" or extra == "all"
 Requires-Dist: pyyaml (>=6,<7) ; extra == "yaml" or extra == "all"
-Requires-Dist: rtoml (>=0.8,<0.9) ; extra == "toml" or extra == "all"
+Requires-Dist: rtoml (>=0.12,<0.13) ; (sys_platform == "linux") and (extra == "toml" or extra == "all")
+Requires-Dist: tomli (>=2.0,<3.0) ; (sys_platform != "linux") and (extra == "toml" or extra == "all")
+Project-URL: Homepage, https://github.com/pwwang/simpleconf
 Project-URL: Repository, https://github.com/pwwang/simpleconf
 Description-Content-Type: text/markdown
 

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "python-simpleconf"
-version = "0.5.9"
+version = "0.6.1"
 description = "Simple configuration management with python."
 authors = [ "pwwang <pwwang@pwwang.com>",]
 license = "MIT"
@@ -16,23 +16,25 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
-diot = "^0.2.1"
-python-dotenv = { version="^0.21", optional = true}
+python = "^3.9"
+diot = "^0.3.1"
+python-dotenv = { version="^1.0", optional = true}
 pyyaml = { version="^6", optional = true}
-rtoml = {version = "^0.8", optional = true}
+# Use rtoml only when the wheel is available (linux)
+rtoml = {version = "^0.12", optional = true, platform = "linux"}
+tomli = {version = "^2.0", optional = true, markers = 'sys_platform != "linux"'}
 iniconfig = {version = "^2.0", optional = true}
 
 [tool.poetry.extras]
 ini = [ "iniconfig" ]
 env = [ "python-dotenv"]
 yaml = [ "pyyaml"]
-toml = [ "rtoml"]
-all = [ "iniconfig", "python-dotenv", "pyyaml", "rtoml"]
+toml = [ "rtoml", "tomli"]
+all = [ "iniconfig", "python-dotenv", "pyyaml", "rtoml", "tomli"]
 
 [tool.poetry.dev-dependencies]
-pytest = "^7"
-pytest-cov = "^4"
+pytest = "^8"
+pytest-cov = "^6"
 
 [tool.pytest.ini_options]
 addopts = "-vv -p no:asyncio --cov=simpleconf --cov-report xml:cov.xml --cov-report term-missing"
@@ -43,6 +45,6 @@ console_output_style = "progress"
 junit_family = "xunit1"
 
 [tool.black]
-line-length = 80
+line-length = 88
 target-version = ['py37', 'py38', 'py39', 'py310']
 include = '\.pyi?$'

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/__init__.py

@@ -1,3 +1,3 @@
 from .config import Config, ProfileConfig
 
-__version__ = "0.5.9"
+__version__ = "0.6.1"

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/caster.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import json
-from typing import TYPE_CHECKING, Any, Callable, Sequence
+from typing import Any, Callable, Sequence, TYPE_CHECKING
 from ast import literal_eval
 
-from simpleconf.utils import require_package
 
 if TYPE_CHECKING:
     from diot import Diot
@@ -47,8 +48,10 @@ def _cast_bool(value: str) -> bool:
 
 def _cast_toml(value: str) -> Any:
     """Cast toml string"""
-    rtoml = require_package("rtoml")
-    return rtoml.loads(value)
+    from .utils import require_package
+
+    toml = require_package("rtoml", "tomllib", "tomli")
+    return toml.loads(value)
 
 
 int_caster = type_caster("@int:", lambda x: int(float(x)))
@@ -74,11 +77,11 @@ def cast_value(value: Any, casters: Sequence[Callable]) -> Any:
     return value
 
 
-def cast(conf: "Diot", casters: Sequence[Callable]) -> "Diot":
+def cast(conf: Diot, casters: Sequence[Callable]) -> Diot:
     """Cast the configuration"""
     for key, value in conf.items():
         if isinstance(value, dict):
-            conf[key] = cast(value, casters)
+            conf[key] = cast(value, casters)  # type: ignore[arg-type]
         else:
             conf[key] = cast_value(value, casters)
     return conf

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/config.py

@@ -1,10 +1,15 @@
+from __future__ import annotations
+
 from contextlib import contextmanager
-from typing import Any, List
+from typing import TYPE_CHECKING, Any, List, Generator
 
 from diot import Diot
 
 from .utils import config_to_ext, get_loader, POOL_KEY, META_KEY
 
+if TYPE_CHECKING:
+    from .loaders import Loader
+
 
 class Config:
     """The configuration class"""
@@ -34,7 +39,9 @@ class Config:
 
     @staticmethod
     def load_one(
-        config, loader: str = None, ignore_nonexist: bool = False
+        config,
+        loader: str | Loader | None = None,
+        ignore_nonexist: bool = False,
     ) -> Diot:
         """Load the configuration from the file
 
@@ -90,7 +97,9 @@ class ProfileConfig:
 
     @staticmethod
     def load_one(
-        conf: Any, loader: str = None, ignore_nonexist: bool = False
+        conf: Any,
+        loader: str | Loader | None = None,
+        ignore_nonexist: bool = False,
     ) -> Diot:
         """Load the configuration from the file
 
@@ -167,6 +176,8 @@ class ProfileConfig:
         conf[META_KEY]["current_profile"] = profile
         conf[META_KEY]["base_profile"] = base
 
+        return conf
+
     @staticmethod
     def current_profile(conf: Diot) -> str:
         """Get the current profile"""
@@ -228,7 +239,11 @@ class ProfileConfig:
 
     @staticmethod
     @contextmanager
-    def with_profile(conf: Diot, profile: str, base: str = "default") -> Diot:
+    def with_profile(
+        conf: Diot,
+        profile: str,
+        base: str = "default",
+    ) -> Generator[Diot, None, None]:
         """A context manager to use the given profile
 
         Args:

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/exceptions.py

@@ -1,4 +1,3 @@
-
 class FormatNotSupported(Exception):
     """Raised if format not supported"""
 

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/loaders/__init__.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from os import PathLike
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Callable, List
 
 from ..caster import cast
 
@@ -11,7 +13,7 @@ if TYPE_CHECKING:
 
 class Loader(ABC):
 
-    CASTERS = None
+    CASTERS: List[Callable[[str, bool], Any]] | None = None
 
     @abstractmethod
     def loading(self, conf: Any, ignore_nonexist: bool) -> "Diot":

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/loaders/env.py

@@ -40,7 +40,7 @@ class EnvLoader(Loader):
             return Diot()
         return Diot(dotenv.main.DotEnv(conf).dict())
 
-    def load_with_profiles(
+    def load_with_profiles(  # type: ignore[override]
         self,
         conf: Any,
         ignore_nonexist: bool = False,

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/loaders/ini.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import warnings
 from typing import Any
 from pathlib import Path
@@ -34,13 +36,13 @@ class IniLoader(Loader):
         toml_caster,
     ]
 
-    def loading(self, conf: Any, ignore_nonexist: bool) -> dict:
+    def loading(self, conf: Any, ignore_nonexist: bool) -> Diot:
         """Load the configuration from an ini-like file"""
         if not self._exists(conf, ignore_nonexist):
             return Diot(default={})
         return iniconfig.IniConfig(conf).sections
 
-    def load(self, conf: Any, ignore_nonexist: bool = False) -> "Diot":
+    def load(self, conf: Any, ignore_nonexist: bool = False) -> Diot:
         """Load and cast the configuration from an ini-like file"""
         sections = self.loading(conf, ignore_nonexist)
         keys = list(sections)
@@ -58,13 +60,12 @@ class IniLoader(Loader):
 
         return cast(Diot(sections[keys[0]]), self.__class__.CASTERS)
 
-    def load_with_profiles(
+    def load_with_profiles(  # type: ignore[override]
         self,
         conf: Any,
         ignore_nonexist: bool = False,
     ) -> Diot:
-        """Load and cast the configuration from an ini-like file with profiles
-        """
+        """Load and cast the configuration from an ini-like file with profiles"""
         sections = self.loading(conf, ignore_nonexist)
         out = Diot()
         for k, v in sections.items():

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/loaders/osenv.py

@@ -39,10 +39,10 @@ class OsenvLoader(Loader):
         out = Diot()
         for k, v in environ.items():
             if k.startswith(prefix):
-                out[k[len_prefix :]] = v
+                out[k[len_prefix:]] = v
         return out
 
-    def load_with_profiles(
+    def load_with_profiles(  # type: ignore[override]
         self,
         conf: Any,
         ignore_nonexist: bool = False,

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/loaders/toml.py

@@ -8,7 +8,7 @@ from ..caster import (
 )
 from . import Loader
 
-rtoml = require_package("rtoml")
+toml = require_package("rtoml", "tomllib", "tomli")
 
 
 class TomlLoader(Loader):
@@ -24,5 +24,9 @@ class TomlLoader(Loader):
         if not self._exists(conf, ignore_nonexist):
             return Diot()
 
-        with open(conf) as f:
-            return Diot(rtoml.load(f))
+        if toml.__name__ in ("tomli", "tomllib"):  # pragma: no cover
+            with open(conf, "rb") as f:
+                return Diot(toml.load(f))
+
+        with open(conf, "r") as f:  # rtoml
+            return Diot(toml.load(f))

{python_simpleconf-0.5.9 → python_simpleconf-0.6.1}/simpleconf/utils.py

@@ -1,13 +1,12 @@
+from __future__ import annotations
 
 from pathlib import Path
 from importlib import import_module
 from types import ModuleType
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from .exceptions import FormatNotSupported
-
-if TYPE_CHECKING:
-    from .loaders import Loader
+from .loaders import Loader
 
 POOL_KEY = "_SIMPLECONF_POOL"
 META_KEY = "_SIMPLECONF_META"
@@ -32,36 +31,58 @@ def config_to_ext(conf: Any) -> str:
     return out
 
 
-def get_loader(ext: str) -> "Loader":
+def get_loader(ext: str | Loader) -> Loader:
     """Get the loader for the extension"""
+    if isinstance(ext, Loader):
+        return ext
+
     if ext == "dict":
         from .loaders.dict import DictLoader
+
         return DictLoader()
     if ext == "env":
         from .loaders.env import EnvLoader
+
         return EnvLoader()
     if ext == "ini":
         from .loaders.ini import IniLoader
+
         return IniLoader()
     if ext == "json":
         from .loaders.json import JsonLoader
+
         return JsonLoader()
     if ext == "osenv":
         from .loaders.osenv import OsenvLoader
+
         return OsenvLoader()
     if ext == "toml":
         from .loaders.toml import TomlLoader
+
         return TomlLoader()
     if ext == "yaml":
         from .loaders.yaml import YamlLoader
+
         return YamlLoader()
 
     raise FormatNotSupported(f"{ext} is not supported.")
 
 
-def require_package(package: str) -> "ModuleType":
+def require_package(package: str, *fallbacks: str) -> ModuleType:
     """Require the package and return the module"""
     try:
         return import_module(package)
     except ModuleNotFoundError:
-        raise ImportError(f"{package} is not installed.")
+        for fallback in fallbacks:
+            try:
+                return import_module(fallback)
+            except ModuleNotFoundError:
+                pass
+
+        if fallbacks:
+            raise ImportError(
+                f"Neither '{package}' nor its fallbacks "
+                f"`{', '.join(fallbacks)}` is installed."
+            ) from None
+        else:
+            raise ImportError(f"'{package}' is not installed.") from None