reyk-cli 0.0.1__tar.gz → 0.0.2__tar.gz

reyk_cli-0.0.2/.gitignore

@@ -0,0 +1,36 @@
+# Byte-compiled
+__pycache__/
+
+# Distribution / packaging
+build/
+dist/
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+coverage/
+coverage.lcov
+
+# Environments
+.venv/
+
+# PyPI configuration file
+.pypirc
+
+# Tests
+tests/blackbox/locked_files_pending_deletion/
+tests/blackbox/specific_libraries/test_libs
+tests/blackbox/specific_libraries/vendor.lock
+
+# Docs
+.vercel

reyk_cli-0.0.2/PKG-INFO

@@ -0,0 +1,8 @@
+Metadata-Version: 2.5
+Name: reyk-cli
+Version: 0.0.2
+Summary: Manage isolated environment dependencies.
+License-Expression: MIT
+Requires-Python: >=3.9
+Requires-Dist: tomli>=2.4.0; python_version < '3.11'
+Requires-Dist: typer>=0.20.0

{reyk_cli-0.0.1 → reyk_cli-0.0.2}/pyproject.toml

@@ -1,17 +1,22 @@
 [project]
 name = "reyk-cli"
-version = "0.0.1"
+dynamic = ["version"]
 description = "Manage isolated environment dependencies."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = ["typer>=0.20.0", "tomli>=2.4.0; python_version < '3.11'"]
+license = 'MIT'
+license-files = ['LICENSE']
 
 [dependency-groups]
 dev = ["pytest>=8.4.2", "tomli-w>=1.2.0"]
 
 [build-system]
-requires = ["uv_build>=0.8.3,<0.9.0"]
-build-backend = "uv_build"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "src/reyk_cli/version.py"
 
 [project.scripts]
 reyk-cli = "reyk_cli.cli:app"

{reyk_cli-0.0.1 → reyk_cli-0.0.2}/src/reyk_cli/cli.py

@@ -35,6 +35,7 @@ def main(
     ctx.obj = UVBasedVendorizer(
         project_root=config.parent,
         vendor_groups=reyk_config.vendor_groups,
+        vendor_exclusions=reyk_config.vendor_exclusions,
         libraries_target_path=Path(reyk_config.libraries_path),
     )
 

{reyk_cli-0.0.1 → reyk_cli-0.0.2}/src/reyk_cli/configuration_reader.py

@@ -20,6 +20,7 @@ DEFAULT_VENDOR_GROUPS = {DEFAULT_VENDOR_GROUP}
 class ReykConfiguration:
     libraries_path: str
     vendor_groups: set[str]
+    vendor_exclusions: set[str]
 
 
 def read_reyk_configuration(toml_path: Path) -> ReykConfiguration:
@@ -30,4 +31,5 @@ def read_reyk_configuration(toml_path: Path) -> ReykConfiguration:
     )
     configuration["libraries_path"] = configuration.pop("libraries-path", DEFAULT_LIBRARIES_TARGET_PATH)
     configuration["vendor_groups"] = set(configuration.pop("vendor-groups", DEFAULT_VENDOR_GROUPS))
+    configuration["vendor_exclusions"] = set(configuration.pop("vendor-exclusions", set()))
     return ReykConfiguration(**configuration)

{reyk_cli-0.0.1 → reyk_cli-0.0.2}/src/reyk_cli/uv_vendorizer.py

@@ -10,9 +10,16 @@ LOCK_FILE_NAME = "vendor.lock"
 
 
 class UVBasedVendorizer:
-    def __init__(self, project_root: Path, vendor_groups: set[str], libraries_target_path: Path) -> None:
+    def __init__(
+        self,
+        project_root: Path,
+        vendor_groups: set[str],
+        vendor_exclusions: set[str],
+        libraries_target_path: Path,
+    ) -> None:
         self._project_root = project_root
         self._vendor_groups = vendor_groups
+        self._vendor_exclusions = vendor_exclusions
         self._libraries_target_path = libraries_target_path
 
     def add_new_requirement_to_pyproject(self, vendor_group: str, command_args: Sequence[str]) -> None:
@@ -44,6 +51,7 @@ class UVBasedVendorizer:
                 "uv",
                 "export",
                 *itertools.chain.from_iterable([("--only-group", group) for group in self._vendor_groups]),
+                *itertools.chain.from_iterable([("--no-emit-package", package) for package in self._vendor_exclusions]),
                 "--no-header",
                 "--quiet",
                 "--no-emit-project",

reyk_cli-0.0.2/src/reyk_cli/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.2"

reyk_cli-0.0.2/tests/conftest.py

@@ -0,0 +1,21 @@
+from collections.abc import Iterable
+from pathlib import Path
+import os
+import pytest
+from typer.testing import CliRunner
+from tests.example_project import ExampleProject
+
+
+@pytest.fixture(scope="session")
+def runner() -> CliRunner:
+    return CliRunner()
+
+
+@pytest.fixture
+def example_project(request: pytest.FixtureRequest, tmpdir: Path) -> Iterable[ExampleProject]:
+    example_project = ExampleProject(Path(tmpdir), getattr(request, "param", None))
+    example_project.write_pyproject_toml()
+    previous_cwd = Path.cwd()
+    os.chdir(tmpdir)
+    yield example_project
+    os.chdir(previous_cwd)

reyk_cli-0.0.2/tests/example_project.py

@@ -0,0 +1,67 @@
+from pathlib import Path
+from typing import Any, Optional
+
+import tomli_w
+from reyk_cli.configuration_reader import (
+    DEFAULT_LIBRARIES_TARGET_PATH,
+    DEFAULT_VENDOR_GROUPS,
+    ReykConfiguration,
+)
+
+PYPROJECT_TOML_NAME = "pyproject.toml"
+DIST_INFO_SUBSTRING = "dist-info"
+IGNORED_DIRECTORIES_IN_LIBS = {"bin"}  # Directories which aren't packages
+
+PYPROJECT_EXAMPLE: dict[str, Any] = {
+    "project": {
+        "name": "project-example",
+        "version": "0.0.1",
+        "description": "Example Pyproject",
+        "readme": "README.md",
+        "requires-python": ">=3.8",
+        "dependencies": [],
+    }
+}
+
+
+class ExampleProject:
+    def __init__(self, project_path: Path, configuration: Optional[ReykConfiguration]) -> None:
+        self._project_path = project_path
+        self._configuration = (
+            ReykConfiguration(DEFAULT_LIBRARIES_TARGET_PATH, DEFAULT_VENDOR_GROUPS, set())
+            if configuration is None
+            else configuration
+        )
+
+    def write_pyproject_toml(self) -> None:
+        pyproject = PYPROJECT_EXAMPLE.copy()
+        # Only add values if any are not the default:
+        if (
+            self._configuration.libraries_path != DEFAULT_LIBRARIES_TARGET_PATH
+            or self._configuration.vendor_groups != DEFAULT_VENDOR_GROUPS
+            or len(self._configuration.vendor_exclusions) > 0
+        ):
+            pyproject["tool"] = {
+                "reyk": {
+                    "libraries-path": self._configuration.libraries_path,
+                    "vendor-groups": list(self._configuration.vendor_groups),
+                    "vendor-exclusions": list(self._configuration.vendor_exclusions),
+                },
+            }
+
+        with (self._project_path / PYPROJECT_TOML_NAME).open("wb") as fp:
+            tomli_w.dump(pyproject, fp)
+
+    def get_existing_libraries(self) -> set[str]:
+        return {
+            library_path.name
+            for library_path in (self._project_path / self._configuration.libraries_path).iterdir()
+            if (
+                library_path.is_dir()
+                and library_path.name not in IGNORED_DIRECTORIES_IN_LIBS
+                and DIST_INFO_SUBSTRING not in library_path.name
+            )
+        }
+
+    def has_libs_directory(self) -> bool:
+        return (self._project_path / self._configuration.libraries_path).exists()

reyk_cli-0.0.2/tests/test_cli.py

@@ -0,0 +1,137 @@
+import pytest
+from reyk_cli.cli import app
+from reyk_cli.configuration_reader import (
+    DEFAULT_LIBRARIES_TARGET_PATH,
+    DEFAULT_VENDOR_GROUP,
+    DEFAULT_VENDOR_GROUPS,
+    ReykConfiguration,
+)
+from typer.testing import CliRunner
+
+from tests.example_project import ExampleProject
+
+
+def test_add(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+def test_remove_existing_package(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+
+    result = runner.invoke(app, ["remove", "tomli"])
+    assert result.exit_code == 0
+    assert example_project.get_existing_libraries() == set()
+
+
+def test_remove_non_existing_package(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+
+    result = runner.invoke(app, ["remove", "pytest"])
+    assert result.exit_code != 0
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+def test_add_then_sync_multiple_times(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+
+    for _ in range(10):
+        result = runner.invoke(app, ["sync"])
+        assert result.exit_code == 0
+
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+def test_add_to_unrelated_group(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+    result = runner.invoke(app, ["add", "tomli-w", "--group", "unrelated-group"])
+    assert result.exit_code != 0, (
+        "Adding to a group with reyk-cli that isn't in 'vendor-groups' should result in an error"
+    )
+
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+@pytest.mark.parametrize(
+    "example_project",
+    [
+        ReykConfiguration(
+            libraries_path=DEFAULT_LIBRARIES_TARGET_PATH,
+            vendor_groups={DEFAULT_VENDOR_GROUP, "another-vendored-group"},
+            vendor_exclusions=set(),
+        ),
+    ],
+    indirect=True,
+)
+def test_add_to_new_vendor_groups(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code != 0  # Because another-vendored-group does not exist
+    result = runner.invoke(app, ["add", "tomli-w", "--group", "another-vendored-group"])
+    assert result.exit_code == 0
+
+    assert example_project.get_existing_libraries() == {"tomli", "tomli_w"}
+
+
+@pytest.mark.parametrize(
+    "example_project",
+    [
+        ReykConfiguration(
+            libraries_path=DEFAULT_LIBRARIES_TARGET_PATH,
+            vendor_groups={"different-vendored-group"},
+            vendor_exclusions=set(),
+        ),
+    ],
+    indirect=True,
+)
+def test_change_vendor_libs(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli", "--group", "different-vendored-group"])
+    assert result.exit_code == 0
+
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+def test_sync_no_vendor_groups(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, "sync")
+    assert result.exit_code != 0, "Vendor groups does not exist in pyproject toml but sync works."
+    assert not example_project.has_libs_directory()  # sync did not work
+
+
+@pytest.mark.parametrize(
+    "example_project",
+    [
+        ReykConfiguration(
+            libraries_path="different_libs",
+            vendor_groups=DEFAULT_VENDOR_GROUPS,
+            vendor_exclusions=set(),
+        ),
+    ],
+    indirect=True,
+)
+def test_change_vendor_target(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tomli"])
+    assert result.exit_code == 0
+
+    assert example_project.get_existing_libraries() == {"tomli"}
+
+
+@pytest.mark.parametrize(
+    "example_project",
+    [
+        ReykConfiguration(
+            libraries_path=DEFAULT_LIBRARIES_TARGET_PATH,
+            vendor_groups=DEFAULT_VENDOR_GROUPS,
+            vendor_exclusions={"colorama"},
+        ),
+    ],
+    indirect=True,
+)
+def test_vendor_exclusions(runner: CliRunner, example_project: ExampleProject) -> None:
+    result = runner.invoke(app, ["add", "tqdm"])
+    assert result.exit_code == 0
+
+    assert example_project.get_existing_libraries() == {"tqdm"}

reyk_cli-0.0.1/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.3
-Name: reyk-cli
-Version: 0.0.1
-Summary: Manage isolated environment dependencies.
-Requires-Dist: typer>=0.20.0
-Requires-Dist: tomli>=2.4.0 ; python_full_version < '3.11'
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-