tlaplus-cli 0.3.2__tar.gz → 0.3.3__tar.gz

{tlaplus_cli-0.3.2/src/tlaplus_cli.egg-info → tlaplus_cli-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlaplus-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: TLA+ tools: download TLC, compile custom modules, run model checker
 Author-email: Denis Nikolskiy <codeomatics@gmail.com>
 License-Expression: MIT

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tlaplus-cli"
-version = "0.3.2"
+version = "0.3.3"
 description = "TLA+ tools: download TLC, compile custom modules, run model checker"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -45,7 +45,8 @@ where = ["src"]
 include = ["tlaplus_cli*"]
 
 [tool.setuptools.package-data]
-tlaplus_cli = ["resources/default_config.yaml", "py.typed"]
+tlaplus_cli = ["py.typed"]
+"tlaplus_cli.resources" = ["*.yaml"]
 
 [dependency-groups]
 dev = [

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/src/tlaplus_cli/config.py

@@ -1,4 +1,4 @@
-import shutil
+import importlib.resources
 from functools import lru_cache
 from pathlib import Path
 
@@ -37,9 +37,12 @@ def cache_dir() -> Path:
     return Path(platformdirs.user_cache_dir(_APP_NAME))
 
 
-def _default_config_path() -> Path:
-    """Path to the default config shipped with the package."""
-    return Path(__file__).parent / "resources" / "default_config.yaml"
+def _default_config_content() -> str:
+    """Read the default config shipped with the package."""
+    # Safer than __file__, correctly handles zipped wheels and zipapps.
+    return (
+        importlib.resources.files("tlaplus_cli.resources").joinpath("default_config.yaml").read_text(encoding="utf-8")
+    )
 
 
 def _ensure_config() -> Path:
@@ -47,7 +50,8 @@ def _ensure_config() -> Path:
     cp = config_path()
     if not cp.exists():
         cp.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copy2(_default_config_path(), cp)
+        # Write default config to the newly created path
+        cp.write_text(_default_config_content(), encoding="utf-8")
     return cp
 
 

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/src/tlaplus_cli/project.py

@@ -5,11 +5,7 @@ from pathlib import Path
 
 def _is_project_root(directory: Path, modules_dir: Path | str, classes_dir: Path | str, lib_dir: Path | str) -> bool:
     """Return True if directory contains at least one project structure marker."""
-    return (
-        (directory / classes_dir).is_dir()
-        or (directory / modules_dir).is_dir()
-        or (directory / lib_dir).is_dir()
-    )
+    return (directory / classes_dir).is_dir() or (directory / modules_dir).is_dir() or (directory / lib_dir).is_dir()
 
 
 def find_project_root(

tlaplus_cli-0.3.3/src/tlaplus_cli/resources/__init__.py

@@ -0,0 +1 @@
+"""Resources subpackage."""

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/src/tlaplus_cli/run_tlc.py

@@ -69,8 +69,7 @@ def tlc(
 
     # Spec resolution logic
     spec_path = Path(spec)
-    candidates = [spec_path, spec_path.with_suffix(".tla"),
-                  spec_path.parent / "spec" / (spec_path.name + ".tla")]
+    candidates = [spec_path, spec_path.with_suffix(".tla"), spec_path.parent / "spec" / (spec_path.name + ".tla")]
 
     spec_file = next((c for c in candidates if c.is_file()), None)
     if not spec_file:
@@ -97,8 +96,15 @@ def tlc(
         if modules_path.is_dir():
             extra_jvm_opts.append(f"-DTLA-Library={modules_path}")
 
-    cmd = ["java", *config.java.opts, *extra_jvm_opts, "-cp", os.pathsep.join(classpath_parts),
-           config.tlc.java_class, spec_file.name]
+    cmd = [
+        "java",
+        *config.java.opts,
+        *extra_jvm_opts,
+        "-cp",
+        os.pathsep.join(classpath_parts),
+        config.tlc.java_class,
+        spec_file.name,
+    ]
 
     typer.echo(f"Running TLC on {spec_file.name} ...\nCommand: {' '.join(cmd)}")
     result = subprocess.run(cmd, cwd=str(spec_file.parent))

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3/src/tlaplus_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlaplus-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: TLA+ tools: download TLC, compile custom modules, run model checker
 Author-email: Denis Nikolskiy <codeomatics@gmail.com>
 License-Expression: MIT

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/src/tlaplus_cli.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/tlaplus_cli.egg-info/dependency_links.txt
 src/tlaplus_cli.egg-info/entry_points.txt
 src/tlaplus_cli.egg-info/requires.txt
 src/tlaplus_cli.egg-info/top_level.txt
+src/tlaplus_cli/resources/__init__.py
 src/tlaplus_cli/resources/default_config.yaml
 tests/test_build_tlc_module.py
 tests/test_check_java.py

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/tests/test_build_tlc_module.py

@@ -100,8 +100,8 @@ def test_build_with_explicit_path(mocker, tmp_path, base_settings):
     assert result.exit_code == 0
     args, _ = mock_run.call_args
     cmd = args[0]
-    assert str(project_dir / "classes") in cmd   # -d target
-    assert str(modules_dir / "Foo.java") in cmd   # source file
+    assert str(project_dir / "classes") in cmd  # -d target
+    assert str(modules_dir / "Foo.java") in cmd  # source file
 
 
 def test_build_without_path_uses_workspace_root(mocker, tmp_path, base_settings):

{tlaplus_cli-0.3.2 → tlaplus_cli-0.3.3}/tests/test_project.py

@@ -9,6 +9,7 @@ def test_project_root_at_spec_dir(tmp_path):
     root = find_project_root(spec, modules_dir="modules", classes_dir="classes", lib_dir="lib")
     assert root == tmp_path
 
+
 def test_project_root_at_parent_of_spec_dir(tmp_path):
     """Root found one level up when spec is inside a spec/ subdirectory."""
     spec_subdir = tmp_path / "spec"
@@ -19,6 +20,7 @@ def test_project_root_at_parent_of_spec_dir(tmp_path):
     root = find_project_root(spec, modules_dir="modules", classes_dir="classes", lib_dir="lib")
     assert root == tmp_path
 
+
 def test_project_root_none_when_no_structure(tmp_path):
     """Returns None if neither spec dir nor its parent contain project directories."""
     spec = tmp_path / "spec" / "queue.tla"
@@ -27,6 +29,7 @@ def test_project_root_none_when_no_structure(tmp_path):
     root = find_project_root(spec, modules_dir="modules", classes_dir="classes", lib_dir="lib")
     assert root is None
 
+
 def test_project_root_detected_by_lib(tmp_path):
     """Root found based on lib/ directory even without classes/."""
     spec = tmp_path / "tests" / "queue_test.tla"
@@ -36,6 +39,7 @@ def test_project_root_detected_by_lib(tmp_path):
     root = find_project_root(spec, modules_dir="modules", classes_dir="classes", lib_dir="lib")
     assert root == tmp_path
 
+
 def test_project_root_detected_by_modules(tmp_path):
     """Root found based on modules/ directory alone."""
     spec = tmp_path / "spec" / "queue.tla"