corio 2.2.6__tar.gz → 2.2.7__tar.gz

{corio-2.2.6 → corio-2.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.2.6
+Version: 2.2.7
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0
@@ -44,6 +44,9 @@ Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Provides-Extra: yml
+Requires-Dist: yamlscript; extra == "yml"
+Requires-Dist: pyyaml; extra == "yml"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"

{corio-2.2.6 → corio-2.2.7}/corio/infra/incrementor_pyproject.py

@@ -12,16 +12,12 @@ from corio.path import Path, PackagePaths
 from corio.path.path import Metadata
 from corio.toml import ensure_table
 
-
 class IncrementorPyproject(Incrementor):
     AUTHOR_EMAIL = "innovative.fowler@mask.pro.fmtr.dev"
     ENTRYPOINT_COMMAND_SEP = "-"
     ENTRYPOINT_FUNCTION_SEP = "_"
     ENTRYPOINT_FUNC_NAME = "main"
     DEPENDENCIES_SECTION_PATH = ("tool", "corio", "dependencies")
-    TEST_FILENAME_PREFIX = "test_"
-    TEST_FILENAME_SUFFIX = ".py"
-    TOX_REQUIRES = ["tox>=4.22", "tox-uv>=1"]
 
     @cached_property
     def path(self) -> Path:
@@ -86,7 +82,7 @@ class IncrementorPyproject(Incrementor):
 
         if requirement.specifier:
             operators = {specifier.operator for specifier in requirement.specifier}
-            if not operators.issubset({"==", "==="}):
+            if operators != {"~="}:
                 return dep
 
         extras = ""
@@ -97,23 +93,22 @@ class IncrementorPyproject(Incrementor):
         if requirement.marker:
             marker = f"; {requirement.marker}"
 
-        pinned = f"{requirement.name}{extras}=={metadata.version}{marker}"
+        pinned = f"{requirement.name}{extras}~={metadata.version}{marker}"
         logger.info(f'Pinning editable dependency "{dep}" -> "{pinned}".')
         return pinned
 
-    def _process_deps(self, deps: str|list[str]) -> str|list[str]:
+    def _process_deps(self, deps: str | list[str]) -> str | list[str]:
 
         if isinstance(deps, list):
-            deps=[self._process_deps(dep) for dep in deps]
-            deps=dedupe(deps)
+            deps = [self._process_deps(dep) for dep in deps]
+            deps = dedupe(deps)
             return deps
 
-        dep=deps
-        dep=self._pin_editable(dep)
+        dep = deps
+        dep = self._pin_editable(dep)
 
         return dep
 
-
     def apply(self) -> Path | list[Path] | None:
         if not self.path.exists():
             logger.info(f'pyproject.toml not found: "{self.path}". Skipping.')
@@ -132,7 +127,6 @@ class IncrementorPyproject(Incrementor):
         self.path.write_toml(data)
         return self.path
 
-
     @property
     def _author(self) -> str:
         if self.paths.metadata.is_client:
@@ -196,13 +190,11 @@ class IncrementorPyproject(Incrementor):
                     values_resolved += resolve_values(value)
             return values_resolved
 
-
         extras = {key: dedupe(resolve_values(key)) for key in dependencies}
         install = extras.pop("install", [])
         extras["all"] = dedupe(list(chain.from_iterable(extras.values())))
         return install, extras
 
-
     def _enrich_toml(self, data):
         version = str(self.version)
         logger.info(f'Applying release version "{version}" to "{self.path}"...')
@@ -223,7 +215,6 @@ class IncrementorPyproject(Incrementor):
         elif "license-files" in project:
             del project["license-files"]
 
-
         deps_corio = data.get("tool", {}).get("corio", {}).get("dependencies", None)
         if deps_corio is not None:
             install, extras = self._flatten_dependencies(deps_corio)
@@ -232,7 +223,6 @@ class IncrementorPyproject(Incrementor):
         else:
             logger.info(f'No dependencies section found in "{self.path}". Skipping dependency enrichment.')
 
-
         deps = project.get("dependencies")
         if deps is not None:
             project["dependencies"] = self._process_deps(deps)
@@ -278,89 +268,93 @@ class IncrementorPyproject(Incrementor):
             del setuptools["script-files"]
 
         dependencies = project.get("optional-dependencies", {})
-        envs = self._tox_envs(dependencies=dependencies)
+        gen = GeneratorTestEnvs(paths=self.paths, optionals=dependencies)
+
         tox = ensure_table(data, ("tool", "tox"))
-        tox["requires"] = list(self.TOX_REQUIRES)
-        tox["env_list"] = list(envs.keys())
-        tox["env"] = envs
+        tox["requires"] = gen.TOX_REQUIRES
+        tox["env_list"] = list(gen.envs.keys())
+        tox["env"] = gen.envs
 
         return data
 
+class GeneratorTestEnvs:
+    TEST_FILENAME_PREFIX = "test_"
+    TEST_FILENAME_SUFFIX = ".py"
+    TOX_REQUIRES = ["tox>=4.22", "tox-uv>=1"]
+
+    def __init__(self, *, paths, optionals: dict[str, list[str]]):
+        self.paths = paths
+        self.optionals = optionals
+
     @cached_property
     def _tests_modules(self) -> list[str]:
-        if not self.paths.tests.exists():
-            return []
-
         modules = []
-        for path in sorted(self.paths.tests.glob(f"{self.TEST_FILENAME_PREFIX}*{self.TEST_FILENAME_SUFFIX}")):
-            module = path.stem.removeprefix(self.TEST_FILENAME_PREFIX)
-            if module:
-                modules.append(module)
-        return modules
-
-    def _tox_get_extras_module(self, module: str, dependencies: dict[str, list[str]]) -> list[str]:
-        extras = ["test"]
-        extras_available = set(dependencies.keys())
-        module_canonical = canonicalize_name(module)
-
-        extras_exact = [extra for extra in extras_available if canonicalize_name(extra) == module_canonical]
-        if extras_exact:
-            extras = sorted(extras_exact) + extras
-
-        extras_children = sorted(
-            extra
-            for extra in extras_available
-            if canonicalize_name(extra).startswith(f"{module_canonical}-")
-        )
-        return extras_children + extras
-
-    def _tox_get_deps_extras(self, extras: list[str], dependencies: dict[str, list[str]]) -> list[str]:
+        for path in self.paths.path.iterdir():
+            if path.is_dir():
+                if path.name in {"tests", "__pycache__"}:
+                    continue
+                module = path.name
+            else:
+                if path.suffix != self.TEST_FILENAME_SUFFIX:
+                    continue
+                if path.stem.startswith("_"):
+                    continue
+                module = path.stem
+
+            path_test = self.get_path_test(module)
+            if not path_test.exists():
+                continue
+            modules.append(module)
+
+        return dedupe(sorted(modules))
+
+    @property
+    def deps_test(self):
+        return sorted(self.optionals['test'])
+
+    def get_deps(self, name):
+
         deps = []
-        for extra in extras:
-            deps += dependencies.get(extra, [])
-        deps = dedupe(deps)
+        keys = [key for key in self.optionals.keys() if key == name or key.startswith(f"{name}.")]
+        for key in keys:
+            deps += self.optionals[key]
+
+        deps += self.deps_test
+
+        deps = sorted(dedupe(deps))
+
         return deps
 
-    def _tox_get_env(
-        self,
-        *,
-        name: str,
-        path_tests: Path,
-        extras: list[str],
-        dependencies: dict[str, list[str]],
-    ) -> dict:
-        if path_tests.is_relative_to(self.paths.repo):
-            path_tests = path_tests.relative_to(self.paths.repo)
-        deps = self._tox_get_deps_extras(extras=extras, dependencies=dependencies)
-        env = {
-            "description": f"Run {name} tests.",
-            "deps": deps,
-            "commands": [["python", "-m", "pytest", "-q", str(path_tests)]],
+    def get_path_test(self, module: str) -> Path:
+        return self.paths.tests / f"{self.TEST_FILENAME_PREFIX}{module}{self.TEST_FILENAME_SUFFIX}"
+
+    def get_env(self, name, deps, path):
+        path=path.relative_to(self.paths.repo)
+        return {
+            name: dict(
+                description=f"Run {name} tests.",
+                deps=deps,
+                commands=[["python", "-m", "pytest", "-q", str(path)]],
+            )
         }
-        return env
 
-    def _tox_envs(self, dependencies: dict[str, list[str]]) -> dict[str, dict]:
+    @cached_property
+    def env(self):
+        name = self.paths.name_ns
+        path_tests = self.paths.tests
+        return self.get_env(name, self.deps_test, path_tests)
+
+    @cached_property
+    def envs(self) -> dict[str, dict]:
+
+        if not self._tests_modules:
+            return {}
+
         if not self.paths.metadata.test_envs:
-            if not self._tests_modules:
-                return {}
-            return {
-                self.paths.name_ns: self._tox_get_env(
-                    name=self.paths.name_ns,
-                    path_tests=self.paths.tests,
-                    extras=["test"],
-                    dependencies=dependencies,
-                )
-            }
+            return self.env
 
         envs = {}
         for module in self._tests_modules:
-            extras = self._tox_get_extras_module(module=module, dependencies=dependencies)
-            path_test = self.paths.tests / f"{self.TEST_FILENAME_PREFIX}{module}{self.TEST_FILENAME_SUFFIX}"
-            name = module
-            envs[name] = self._tox_get_env(
-                name=name,
-                path_tests=path_test,
-                extras=extras,
-                dependencies=dependencies,
-            )
-        return envs
+            path_test = self.get_path_test(module)
+            envs |= self.get_env(module, self.get_deps(module), path_test)
+        return envs

{corio-2.2.6 → corio-2.2.7}/corio/pyproject.package.toml

@@ -1,6 +1,6 @@
 [project]
 name = "corio"
-version = "2.2.6"
+version = "2.2.7"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
 readme = "README.md"
 dependencies = []
@@ -11,6 +11,7 @@ keywords = []
 [project.optional-dependencies]
 dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov"]
 test = ["pytest", "pytest-cov"]
+yml = ["yamlscript", "pyyaml"]
 yaml = ["yamlscript", "pyyaml"]
 logging = ["logfire"]
 parallel = ["dask[bag]", "distributed", "bokeh"]
@@ -82,7 +83,7 @@ Homepage = "https://github.com/fmtr/corio"
 corio = "corio.entrypoint:main"
 
 [tool.corio.metadata]
-version = "2.2.6"
+version = "2.2.7"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
@@ -103,7 +104,8 @@ test_envs = true
 dev = ["logging", "version.dev", "debug", "sets", "yaml", "db.document", "infra"]
 install = []
 test = ["pytest", "pytest-cov"]
-yaml = ["yamlscript", "pyyaml"]
+yml = ["yamlscript", "pyyaml"]
+yaml = ["yml"]
 logging = ["logfire", "version"]
 parallel = ["dask[bag]", "distributed", "bokeh"]
 tokenization = ["tokenizers"]
@@ -163,7 +165,7 @@ secrets = ["encrypt", "env.io", "yaml", "logging", "sets", "vcs"]
 cli = ["sets", "logging"]
 
 [tool.setuptools]
-script-files = ["scripts/opt-dev-init", "scripts/docker-prune", "scripts/vlc-tn", "scripts/ha-addon-launch", "scripts/install-ys", "scripts/tasmota-config", "scripts/download", "scripts/run-script", "scripts/ssh-auth", "scripts/cru", "scripts/ssh-serve", "scripts/set-secure-path", "scripts/vm-launch", "scripts/auth-token", "scripts/set-user-sudo", "scripts/docker-build-bases", "scripts/fmtr-test-script", "scripts/compose-update", "scripts/add-ve-shell", "scripts/apt-headless", "scripts/snips-install", "scripts/install-ts", "scripts/tasmota-flash", "scripts/docs-deploy", "scripts/infra-sync", "scripts/parse-args", "scripts/docker-install-deps", "scripts/run-tests", "scripts/pypi-reserve", "scripts/install-docker", "scripts/set-password", "scripts/tasmota-terminal", "scripts/mirror-dir", "scripts/compress-dir", "scripts/pypi-check", "scripts/git-clone", "scripts/docker-sandbox", "scripts/docker-install-prod", "scripts/docker-sandbox-init", "scripts/install-browser", "scripts/docker-build-bases-dev", "scripts/apt-essentials", "scripts/encrypt-secrets", "scripts/add-user-path", "scripts/infra", "scripts/add-service"]
+script-files = ["scripts/opt-dev-init", "scripts/docker-prune", "scripts/vlc-tn", "scripts/ha-addon-launch", "scripts/install-ys", "scripts/tasmota-config", "scripts/download", "scripts/run-script", "scripts/ssh-auth", "scripts/cru", "scripts/ssh-serve", "scripts/set-secure-path", "scripts/vm-launch", "scripts/auth-token", "scripts/set-user-sudo", "scripts/docker-build-bases", "scripts/fmtr-test-script", "scripts/compose-update", "scripts/add-ve-shell", "scripts/apt-headless", "scripts/snips-install", "scripts/install-ts", "scripts/tasmota-flash", "scripts/docs-deploy", "scripts/parse-args", "scripts/docker-install-deps", "scripts/run-tests", "scripts/pypi-reserve", "scripts/install-docker", "scripts/set-password", "scripts/tasmota-terminal", "scripts/mirror-dir", "scripts/compress-dir", "scripts/pypi-check", "scripts/git-clone", "scripts/docker-sandbox", "scripts/docker-install-prod", "scripts/docker-sandbox-init", "scripts/install-browser", "scripts/docker-build-bases-dev", "scripts/apt-essentials", "scripts/encrypt-secrets", "scripts/add-user-path", "scripts/infra", "scripts/add-service"]
 
 [tool.setuptools.packages.find]
 where = ["."]
@@ -175,11 +177,11 @@ corio = ["pyproject.package.toml"]
 
 [tool.tox]
 requires = ["tox>=4.22", "tox-uv>=1"]
-env_list = ["caching", "datatype", "dns", "dt", "encrypt", "env", "hash", "hook", "infra", "iterator", "jsn", "name", "path", "patterns", "rand", "strings", "toml", "tools", "yaml"]
+env_list = ["caching", "datatype", "dns", "dt", "encrypt", "env", "hash", "hook", "infra", "iterator", "jsn", "name", "path", "patterns", "rand", "strings", "toml", "tools"]
 
 [tool.tox.env.caching]
 description = "Run caching tests."
-deps = ["diskcache", "cachetools", "pytest", "pytest-cov"]
+deps = ["cachetools", "diskcache", "pytest", "pytest-cov"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_caching.py"]]
 
 [tool.tox.env.datatype]
@@ -189,7 +191,7 @@ commands = [["python", "-m", "pytest", "-q", "corio/tests/test_datatype.py"]]
 
 [tool.tox.env.dns]
 description = "Run dns tests."
-deps = ["dnspython[doh]", "httpx", "httpx_retries", "logfire", "logfire[httpx]", "diskcache", "cachetools", "pytest", "pytest-cov"]
+deps = ["cachetools", "diskcache", "dnspython[doh]", "httpx", "httpx_retries", "logfire", "logfire[httpx]", "pytest", "pytest-cov"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_dns.py"]]
 
 [tool.tox.env.dt]
@@ -219,7 +221,7 @@ commands = [["python", "-m", "pytest", "-q", "corio/tests/test_hook.py"]]
 
 [tool.tox.env.infra]
 description = "Run infra tests."
-deps = ["semver", "logfire", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov"]
+deps = ["build", "deepmerge", "dotenv", "fastapi", "httpx", "httpx_retries", "logfire", "logfire[fastapi]", "logfire[httpx]", "mike", "mkdocs", "mkdocs-include-dir-to-nav", "mkdocs-material", "mkdocstrings[python]", "packaging", "pycountry", "pydantic", "pydantic-extra-types", "pydantic-settings", "pygit2", "pyrage", "pytest", "pytest-cov", "python-on-whales", "pyyaml", "semver", "setuptools", "tomlkit", "twine", "uvicorn[standard]", "yamlscript"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_infra.py"]]
 
 [tool.tox.env.iterator]
@@ -244,7 +246,7 @@ commands = [["python", "-m", "pytest", "-q", "corio/tests/test_path.py"]]
 
 [tool.tox.env.patterns]
 description = "Run patterns tests."
-deps = ["regex", "pytest", "pytest-cov"]
+deps = ["pytest", "pytest-cov", "regex"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_patterns.py"]]
 
 [tool.tox.env.rand]
@@ -259,7 +261,7 @@ commands = [["python", "-m", "pytest", "-q", "corio/tests/test_strings.py"]]
 
 [tool.tox.env.toml]
 description = "Run toml tests."
-deps = ["tomlkit", "pytest", "pytest-cov"]
+deps = ["pytest", "pytest-cov", "tomlkit"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_toml.py"]]
 
 [tool.tox.env.tools]
@@ -267,11 +269,6 @@ description = "Run tools tests."
 deps = ["pytest", "pytest-cov"]
 commands = [["python", "-m", "pytest", "-q", "corio/tests/test_tools.py"]]
 
-[tool.tox.env.yaml]
-description = "Run yaml tests."
-deps = ["yamlscript", "pyyaml", "pytest", "pytest-cov"]
-commands = [["python", "-m", "pytest", "-q", "corio/tests/test_yaml.py"]]
-
 [build-system]
 requires = ["setuptools>=82", "wheel"]
 build-backend = "setuptools.build_meta"

{corio-2.2.6 → corio-2.2.7}/corio/tests/test_infra.py

@@ -2,7 +2,7 @@ from types import SimpleNamespace
 
 from packaging.requirements import Requirement
 
-from corio.infra.incrementor_pyproject import IncrementorPyproject
+from corio.infra.incrementor_pyproject import IncrementorPyproject, GeneratorTestEnvs
 from corio.infra.releaser import Tester as ReleaserTester
 from corio.path import Path
 
@@ -18,6 +18,8 @@ def _write_editable_repo(path_repo: Path, name: str, version: str) -> None:
 
 
 def _make_incrementor(path_repo: Path, is_pre: bool = False, test_envs: bool = True) -> IncrementorPyproject:
+    path_package = path_repo / "corio"
+    path_package.mkdir(parents=True, exist_ok=True)
     path_tests = path_repo / "corio" / "tests"
     path_tests.mkdir(parents=True, exist_ok=True)
     parent = SimpleNamespace(
@@ -25,6 +27,7 @@ def _make_incrementor(path_repo: Path, is_pre: bool = False, test_envs: bool = T
             repo=path_repo,
             pyproject_repo=path_repo / "pyproject.toml",
             name_ns="corio",
+            path=path_package,
             tests=path_tests,
             metadata=SimpleNamespace(test_envs=test_envs),
         ),
@@ -48,7 +51,7 @@ def test_pin_editables_and_flatten_dependencies(tmp_path):
 
     incrementor = _make_incrementor(path_main_repo)
 
-    assert incrementor._pin_editable("haco") == "haco==1.2.3"
+    assert incrementor._pin_editable("haco") == "haco~=1.2.3"
     assert incrementor._pin_editable("requests") == "requests"
 
     install, extras = incrementor._flatten_dependencies(
@@ -76,7 +79,7 @@ def test_pin_editables_resolves_uv_source_path(tmp_path):
     )
 
     incrementor = _make_incrementor(path_main_repo)
-    assert incrementor._pin_editable("corio") == "corio==1.2.3"
+    assert incrementor._pin_editable("corio") == "corio~=1.2.3"
 
 
 def test_pin_editables_preserves_extras_and_skips_existing_specifiers(tmp_path):
@@ -98,9 +101,10 @@ def test_pin_editables_preserves_extras_and_skips_existing_specifiers(tmp_path):
     req = Requirement(dep)
     assert req.name == "haco"
     assert req.extras == {"version.dev", "logging", "sets", "yaml", "debug", "caching", "api", "mqtt"}
-    assert str(req.specifier) == "==1.2.3"
+    assert str(req.specifier) == "~=1.2.3"
 
-    assert incrementor._pin_editable("haco==1.0.0") == "haco==1.2.3"
+    assert incrementor._pin_editable("haco==1.0.0") == "haco==1.0.0"
+    assert incrementor._pin_editable("haco~=1.0.0") == "haco~=1.2.3"
     assert incrementor._pin_editable("haco>=1.0.0") == "haco>=1.0.0"
 
 
@@ -142,7 +146,7 @@ def test_pin_editables_allows_prerelease_when_current_is_prerelease(tmp_path):
 
     incrementor = _make_incrementor(path_main_repo, is_pre=True)
 
-    assert incrementor._pin_editable("haco") == "haco==1.2.3-rc.1"
+    assert incrementor._pin_editable("haco") == "haco~=1.2.3-rc.1"
 
 
 def test_process_deps_pins_project_dependencies(tmp_path):
@@ -163,8 +167,13 @@ def test_process_deps_pins_project_dependencies(tmp_path):
     dependencies = ["haco", "requests>=2"]
     optional_dev = ["haco[logging]", "pytest"]
 
-    assert incrementor._process_deps(dependencies) == ["haco==1.2.3", "requests>=2"]
-    assert incrementor._process_deps(optional_dev) == ["haco[logging]==1.2.3", "pytest"]
+    assert incrementor._process_deps(dependencies) == ["haco~=1.2.3", "requests>=2"]
+    assert incrementor._process_deps(optional_dev) == ["haco[logging]~=1.2.3", "pytest"]
+
+
+def _make_test_env_generator(path_repo: Path, *, test_envs: bool, dependencies: dict[str, list[str]]) -> GeneratorTestEnvs:
+    incrementor = _make_incrementor(path_repo, test_envs=test_envs)
+    return GeneratorTestEnvs(paths=incrementor.paths, optionals=dependencies)
 
 
 def _make_tester(path_repo: Path, *, env_list: list[str] | None = None) -> ReleaserTester:
@@ -200,45 +209,40 @@ def _make_tester(path_repo: Path, *, env_list: list[str] | None = None) -> Relea
     return ReleaserTester(parent)
 
 
-def test_incrementor_tox_get_extras_module_merges_module_and_dotted_children(tmp_path):
+def test_generator_test_envs_get_deps_merges_module_and_dotted_children(tmp_path):
     path_repo = Path(tmp_path / "corio")
     path_repo.mkdir(parents=True)
-    incrementor = _make_incrementor(path_repo, test_envs=True)
-    dependencies = {
+    generator = _make_test_env_generator(path_repo, test_envs=True, dependencies={
         "test": ["pytest", "pytest-cov"],
         "path": [],
         "path.app": ["appdirs"],
         "path.type": ["filetype"],
         "strings": [],
-    }
-
-    assert incrementor._tox_get_extras_module("path", dependencies) == ["path.app", "path.type", "path", "test"]
-    assert incrementor._tox_get_extras_module("strings", dependencies) == ["strings", "test"]
-    assert incrementor._tox_get_extras_module("missing", dependencies) == ["test"]
+    })
+    assert generator.get_deps("path") == ["appdirs", "filetype", "pytest", "pytest-cov"]
+    assert generator.get_deps("strings") == ["pytest", "pytest-cov"]
+    assert generator.get_deps("missing") == ["pytest", "pytest-cov"]
 
 
-def test_incrementor_tox_get_deps_extras_resolves_superset(tmp_path):
+def test_generator_test_envs_deps_resolves_superset(tmp_path):
     path_repo = Path(tmp_path / "corio")
     path_repo.mkdir(parents=True)
-    incrementor = _make_incrementor(path_repo, test_envs=True)
     dependencies = {
         "test": ["pytest", "pytest-cov"],
         "path": [],
         "path.app": ["appdirs"],
         "path.type": ["filetype"],
     }
+    generator = _make_test_env_generator(path_repo, test_envs=True, dependencies=dependencies)
+    (generator.paths.path / "path.py").write_text("", encoding="utf-8")
+    (generator.paths.tests / "test_path.py").write_text("", encoding="utf-8")
 
-    deps = incrementor._tox_get_deps_extras(["path.app", "path.type", "path", "test"], dependencies)
-    assert deps == ["appdirs", "filetype", "pytest", "pytest-cov"]
+    assert generator.get_deps("path") == ["appdirs", "filetype", "pytest", "pytest-cov"]
 
 
-def test_incrementor_tox_envs_use_file_module_name_with_test_envs(tmp_path):
+def test_generator_test_envs_use_file_module_name_with_test_envs(tmp_path):
     path_repo = Path(tmp_path / "corio")
     path_repo.mkdir(parents=True)
-    incrementor = _make_incrementor(path_repo, test_envs=True)
-    (incrementor.paths.tests / "test_path.py").write_text("", encoding="utf-8")
-    (incrementor.paths.tests / "test_strings.py").write_text("", encoding="utf-8")
-
     dependencies = {
         "test": ["pytest", "pytest-cov"],
         "path": [],
@@ -246,38 +250,45 @@ def test_incrementor_tox_envs_use_file_module_name_with_test_envs(tmp_path):
         "path.type": ["filetype"],
         "strings": [],
     }
-    envs = incrementor._tox_envs(dependencies=dependencies)
+    generator = _make_test_env_generator(path_repo, test_envs=True, dependencies=dependencies)
+    (generator.paths.path / "path.py").write_text("", encoding="utf-8")
+    (generator.paths.path / "strings.py").write_text("", encoding="utf-8")
+    (generator.paths.tests / "test_path.py").write_text("", encoding="utf-8")
+    (generator.paths.tests / "test_strings.py").write_text("", encoding="utf-8")
+    envs = generator.envs
 
     assert set(envs) == {"path", "strings"}
     assert envs["path"]["deps"] == ["appdirs", "filetype", "pytest", "pytest-cov"]
     assert envs["strings"]["deps"] == ["pytest", "pytest-cov"]
 
 
-def test_incrementor_tox_envs_fall_back_to_single_env_when_test_envs_disabled(tmp_path):
+def test_generator_test_envs_fall_back_to_single_env_when_test_envs_disabled(tmp_path):
     path_repo = Path(tmp_path / "corio")
     path_repo.mkdir(parents=True)
-    incrementor = _make_incrementor(path_repo, test_envs=False)
-    (incrementor.paths.tests / "test_path.py").write_text("", encoding="utf-8")
-
-    envs = incrementor._tox_envs(dependencies={"test": ["pytest", "pytest-cov"]})
+    generator = _make_test_env_generator(path_repo, test_envs=False, dependencies={"test": ["pytest", "pytest-cov"]})
+    (generator.paths.path / "path.py").write_text("", encoding="utf-8")
+    (generator.paths.tests / "test_path.py").write_text("", encoding="utf-8")
+    envs = generator.envs
 
     assert set(envs) == {"corio"}
     assert envs["corio"]["deps"] == ["pytest", "pytest-cov"]
 
 
-def test_incrementor_tox_envs_canonicalizes_dotted_extras(tmp_path):
+def test_generator_test_envs_resolves_dotted_extras(tmp_path):
     path_repo = Path(tmp_path / "corio")
     path_repo.mkdir(parents=True)
-    incrementor = _make_incrementor(path_repo, test_envs=True)
-    (incrementor.paths.tests / "test_env.py").write_text("", encoding="utf-8")
-
-    envs = incrementor._tox_envs(
+    generator = _make_test_env_generator(
+        path_repo,
+        test_envs=True,
         dependencies={
             "test": ["pytest", "pytest-cov"],
             "env": [],
             "env.io": ["dotenv"],
-        }
+        },
     )
+    (generator.paths.path / "env.py").write_text("", encoding="utf-8")
+    (generator.paths.tests / "test_env.py").write_text("", encoding="utf-8")
+    envs = generator.envs
 
     assert envs["env"]["deps"] == ["dotenv", "pytest", "pytest-cov"]
 

{corio-2.2.6 → corio-2.2.7}/corio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.2.6
+Version: 2.2.7
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0
@@ -44,6 +44,9 @@ Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Provides-Extra: yml
+Requires-Dist: yamlscript; extra == "yml"
+Requires-Dist: pyyaml; extra == "yml"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"

{corio-2.2.6 → corio-2.2.7}/corio.egg-info/SOURCES.txt

@@ -144,7 +144,6 @@ scripts/fmtr-test-script
 scripts/git-clone
 scripts/ha-addon-launch
 scripts/infra
-scripts/infra-sync
 scripts/install-browser
 scripts/install-docker
 scripts/install-ts

{corio-2.2.6 → corio-2.2.7}/corio.egg-info/requires.txt

@@ -443,5 +443,9 @@ logfire[httpx]
 yamlscript
 pyyaml
 
+[yml]
+yamlscript
+pyyaml
+
 [youtube]
 pytubefix