package-utils 0.9.0__tar.gz → 0.9.2__tar.gz

{package_utils-0.9.0/src/package_utils.egg-info → package_utils-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: package-utils
-Version: 0.9.0
+Version: 0.9.2
 Summary: Common utilities for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -12,17 +12,17 @@ Requires-Dist: typer<1,>=0.27.1
 Provides-Extra: context
 Requires-Dist: dacite<2,>=1.8.1; extra == "context"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "context"
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "context"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "context"
 Provides-Extra: dataclasses
 Requires-Dist: dacite<2,>=1.8.1; extra == "dataclasses"
 Provides-Extra: storage
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "storage"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "storage"
 Provides-Extra: dev
 Requires-Dist: dacite<2,>=1.8.1; extra == "dev"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "dev"
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "dev"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "dev"
 Requires-Dist: hypothesis<7,>=6.91.0; extra == "dev"
-Requires-Dist: package-dev-tools<1,>=0.8.6; extra == "dev"
+Requires-Dist: package-dev-tools<1,>=0.8.7; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 Requires-Dist: typing-extensions<5,>=4.6.0; extra == "dev"
 Dynamic: license-file

{package_utils-0.9.0 → package_utils-0.9.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "package-utils"
-version = "0.9.0"
+version = "0.9.2"
 description = "Common utilities for Python packages"
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = "MIT"
@@ -14,22 +14,22 @@ dependencies = [
 context = [
     "dacite >=1.8.1, <2",
     "PyYaml >=6.0.1, <7",
-    "superpathlib >=2.0.0, <3",
+    "superpathlib >=2.1.0, <3",
 ]
 dataclasses = [
     "dacite >=1.8.1, <2",
 ]
 storage = [
-    "superpathlib >= 2.0.0, <3",
+    "superpathlib >=2.1.0, <3",
 ]
 dev = [
     # context
     "dacite >=1.8.1, <2",
     "PyYaml >=6.0.1, <7",
-    "superpathlib >=2.0.0, <3",
+    "superpathlib >=2.1.0, <3",
 
     "hypothesis >=6.91.0, <7",
-    "package-dev-tools >=0.8.6, <1",
+    "package-dev-tools >=0.8.7, <1",
     "package-dev-utils >=0.1.6, <1",
     "typing-extensions >=4.6.0, <5",
 ]

{package_utils-0.9.0 → package_utils-0.9.2}/src/package_utils/context/context.py

@@ -41,7 +41,8 @@ class Context(Generic[Options_, Config_, Secrets_]):
         else:
             optional_path = getattr(self.options, "config_path", None)
             path = typing.cast("Path | None", optional_path)
-            config = model() if path is None else load_from_file(model, path)
+            content = None if path is None else path.cached_yaml
+            config = load_from_dict(model, content) if content else model()
         return typing.cast("Config_", config)
 
     @cached_property
@@ -57,10 +58,9 @@ class Context(Generic[Options_, Config_, Secrets_]):
         )
 
 
-def load_from_file(model: type[T], path: Path) -> T:
+def load_from_dict(model: type[T], content: dict[str, Any]) -> T:
     import dacite  # noqa: PLC0415
-    from superpathlib import Path  # noqa: PLC0415
 
-    config = dacite.Config(type_hooks={Path: Path}, strict=True)
-    info = typing.cast("dict[str, Any]", path.yaml)
-    return dacite.from_dict(model, info, config=config)
+    from package_utils.dataclasses.mixins import default_config  # noqa: PLC0415
+
+    return dacite.from_dict(model, content, config=default_config)

{package_utils-0.9.0 → package_utils-0.9.2}/src/package_utils/dataclasses/mixins.py

@@ -2,25 +2,21 @@ from __future__ import annotations
 
 import typing
 from dataclasses import asdict
-from typing import Any, Self, TypeVar
+from pathlib import Path
+from typing import Any, Self
 
 import dacite
+from dacite import Config
 
 if typing.TYPE_CHECKING:
     from _typeshed import DataclassInstance  # pragma: nocover
 
-T = TypeVar("T")
+default_config = Config(strict=True, cast=[Path])
 
 
 class SerializationMixin:
     @classmethod
-    def from_dict(
-        cls,
-        items: dict[str, Any],
-        config: dacite.Config | None = None,
-    ) -> Self:
-        if config is None:
-            config = dacite.Config(strict=True)
+    def from_dict(cls, items: dict[str, Any], config: Config = default_config) -> Self:
         return dacite.from_dict(cls, items, config=config)
 
     def dict(self: DataclassInstance) -> dict[str, Any]:

{package_utils-0.9.0 → package_utils-0.9.2/src/package_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: package-utils
-Version: 0.9.0
+Version: 0.9.2
 Summary: Common utilities for Python packages
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License-Expression: MIT
@@ -12,17 +12,17 @@ Requires-Dist: typer<1,>=0.27.1
 Provides-Extra: context
 Requires-Dist: dacite<2,>=1.8.1; extra == "context"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "context"
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "context"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "context"
 Provides-Extra: dataclasses
 Requires-Dist: dacite<2,>=1.8.1; extra == "dataclasses"
 Provides-Extra: storage
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "storage"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "storage"
 Provides-Extra: dev
 Requires-Dist: dacite<2,>=1.8.1; extra == "dev"
 Requires-Dist: PyYaml<7,>=6.0.1; extra == "dev"
-Requires-Dist: superpathlib<3,>=2.0.0; extra == "dev"
+Requires-Dist: superpathlib<3,>=2.1.0; extra == "dev"
 Requires-Dist: hypothesis<7,>=6.91.0; extra == "dev"
-Requires-Dist: package-dev-tools<1,>=0.8.6; extra == "dev"
+Requires-Dist: package-dev-tools<1,>=0.8.7; extra == "dev"
 Requires-Dist: package-dev-utils<1,>=0.1.6; extra == "dev"
 Requires-Dist: typing-extensions<5,>=4.6.0; extra == "dev"
 Dynamic: license-file

{package_utils-0.9.0 → package_utils-0.9.2}/src/package_utils.egg-info/SOURCES.txt

@@ -23,8 +23,6 @@ src/package_utils/context/models/__init__.py
 src/package_utils/context/models/models.py
 src/package_utils/dataclasses/__init__.py
 src/package_utils/dataclasses/mixins.py
-src/package_utils/jobs/__init__.py
-src/package_utils/jobs/jobs.py
 src/package_utils/storage/__init__.py
 src/package_utils/storage/cached_file_content.py
 tests/test_annotations.py

{package_utils-0.9.0 → package_utils-0.9.2}/src/package_utils.egg-info/requires.txt

@@ -3,7 +3,7 @@ typer<1,>=0.27.1
 [context]
 dacite<2,>=1.8.1
 PyYaml<7,>=6.0.1
-superpathlib<3,>=2.0.0
+superpathlib<3,>=2.1.0
 
 [dataclasses]
 dacite<2,>=1.8.1
@@ -11,11 +11,11 @@ dacite<2,>=1.8.1
 [dev]
 dacite<2,>=1.8.1
 PyYaml<7,>=6.0.1
-superpathlib<3,>=2.0.0
+superpathlib<3,>=2.1.0
 hypothesis<7,>=6.91.0
-package-dev-tools<1,>=0.8.6
+package-dev-tools<1,>=0.8.7
 package-dev-utils<1,>=0.1.6
 typing-extensions<5,>=4.6.0
 
 [storage]
-superpathlib<3,>=2.0.0
+superpathlib<3,>=2.1.0

{package_utils-0.9.0 → package_utils-0.9.2}/tests/test_secrets.py

@@ -5,9 +5,7 @@ import pytest
 from tests.utils import forbid_imports
 
 
-def test_env_secret_loads_without_subprocess_import(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
+def test_loading_without_subprocess(monkeypatch: pytest.MonkeyPatch) -> None:
     name = "package_utils.secrets_"
     forbid_imports(monkeypatch, "shlex", "subprocess", from_module=name)
     monkeypatch.setenv("MY_SECRET", "value")

package_utils-0.9.0/src/package_utils/jobs/__init__.py

@@ -1 +0,0 @@
-from .jobs import run_jobs

package_utils-0.9.0/src/package_utils/jobs/jobs.py

@@ -1,41 +0,0 @@
-from collections.abc import Callable, Iterable, Iterator
-from concurrent.futures import Future, ProcessPoolExecutor, ThreadPoolExecutor
-from queue import Queue
-from threading import Semaphore, Thread
-from typing import TypeVar
-
-T = TypeVar("T")
-
-
-def run_jobs(
-    jobs: Iterable[Callable[..., T]],
-    number_of_workers: int = 0,
-    *,
-    use_multiprocessing: bool = False,
-) -> Iterator[T]:
-    if number_of_workers <= 0:
-        return (job() for job in jobs)
-    executor_class = ProcessPoolExecutor if use_multiprocessing else ThreadPoolExecutor
-    executor = executor_class(max_workers=number_of_workers)
-    futures: Queue[Future[T] | None] = Queue()
-    submission_semaphore = Semaphore(number_of_workers * 2)
-    # large enough to keep all workers busy
-
-    def launch_jobs() -> None:
-        with executor:
-            for job in jobs:
-                submission_semaphore.acquire()
-                future = executor.submit(job)
-                future.add_done_callback(futures.put)
-                future.add_done_callback(lambda _: submission_semaphore.release())
-        futures.put(None)
-
-    Thread(target=launch_jobs).start()
-    return extract_results(futures)
-
-
-def extract_results(futures: Queue[Future[T] | None]) -> Iterator[T]:
-    future = futures.get()
-    while future is not None:
-        yield future.result()
-        future = futures.get()