git2svn 0.5.1__tar.gz → 0.5.2__tar.gz

{git2svn-0.5.1 → git2svn-0.5.2}/.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
     branches: [ "main" ]
 
 jobs:
-  lint-and-format:
-    name: Lint & Format (Ruff)
+  lint-format-typecheck:
+    name: Lint, Format & Type Check
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
@@ -19,8 +19,8 @@ jobs:
         with:
           python-version: "3.12"
 
-      - name: Install Ruff
-        run: pip install ruff
+      - name: Install Tooling
+        run: pip install ruff mypy
 
       - name: Run Ruff Lint Checks
         run: ruff check .
@@ -28,6 +28,9 @@ jobs:
       - name: Verify Formatting with Ruff
         run: ruff format --check .
 
+      - name: Type Check with MyPy
+        run: mypy git2svn
+
   test:
     name: Test on Python ${{ matrix.python-version }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}

{git2svn-0.5.1/git2svn.egg-info → git2svn-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0
@@ -26,6 +26,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Provides-Extra: dev
 Requires-Dist: coverage>=7.0.0; extra == "dev"
+Requires-Dist: mypy>=1.9.0; extra == "dev"
 Requires-Dist: ruff>=0.8.0; extra == "dev"
 Requires-Dist: setuptools-scm>=8.0; extra == "dev"
 Dynamic: license-file

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn/__init__.py

@@ -20,7 +20,7 @@ from .state import (
 from .svn import SvnError, SvnLockError, SvnOutOfDateError, SvnWorkspace
 
 try:
-    from ._version import __version__
+    from ._version import __version__  # type: ignore[import-not-found]
 except ImportError:
     __version__ = "0.0.0.dev0"
 
@@ -30,9 +30,9 @@ def get_version() -> str:
     try:
         from importlib.metadata import version
 
-        return version("git2svn")
+        return str(version("git2svn"))
     except Exception:
-        return __version__
+        return str(__version__)
 
 
 __all__ = [

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.5.1'
-__version_tuple__ = version_tuple = (0, 5, 1)
+__version__ = version = '0.5.2'
+__version_tuple__ = version_tuple = (0, 5, 2)
 
 __commit_id__ = commit_id = None

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn/cli.py

@@ -224,7 +224,7 @@ def build_parser() -> argparse.ArgumentParser:
 def handle_setup(git_repo: GitRepo, svn_dir_path: Optional[Path | str]) -> int:
     """Automate repository configuration, branch detection, and productivity aliases."""
     if not git_repo.is_valid_repo():
-        print(f"Error: '{git_repo.root_dir}' is not a valid Git repository.", file=sys.stderr)
+        print(f"Error: '{git_repo.repo_dir}' is not a valid Git repository.", file=sys.stderr)
         return 1
 
     # 1. Resolve SVN working copy path

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn/core.py

@@ -591,7 +591,7 @@ class Synchronizer:
                 is_single, start_ref, end_ref = parse_ref_arguments(default_range)
                 if is_single:
                     commits = [start_ref] if self.git.ref_exists(start_ref) else []
-                    merges = []
+                    merges: List[str] = []
                 else:
                     assert end_ref is not None
                     if not self.git.ref_exists(start_ref):

git2svn-0.5.2/git2svn/py.typed

@@ -0,0 +1 @@
+# Marker file for PEP 561. The git2svn package uses inline type annotations.

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn/state.py

@@ -4,7 +4,7 @@ import json
 import logging
 import os
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, cast
 
 logger = logging.getLogger("git2svn")
 
@@ -28,7 +28,9 @@ def load_replay_state(workspace_dir: Path) -> Optional[Dict[str, Any]]:
     path = get_replay_state_path(workspace_dir)
     if path.is_file():
         try:
-            return json.loads(path.read_text(encoding="utf-8"))
+            val = json.loads(path.read_text(encoding="utf-8"))
+            if isinstance(val, dict):
+                return cast(Dict[str, Any], val)
         except Exception as e:
             logger.error("Failed to parse replay state file: %s", e)
     return None

{git2svn-0.5.1 → git2svn-0.5.2/git2svn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0
@@ -26,6 +26,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Provides-Extra: dev
 Requires-Dist: coverage>=7.0.0; extra == "dev"
+Requires-Dist: mypy>=1.9.0; extra == "dev"
 Requires-Dist: ruff>=0.8.0; extra == "dev"
 Requires-Dist: setuptools-scm>=8.0; extra == "dev"
 Dynamic: license-file

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ git2svn/core.py
 git2svn/eol.py
 git2svn/git.py
 git2svn/patcher.py
+git2svn/py.typed
 git2svn/state.py
 git2svn/svn.py
 git2svn.egg-info/PKG-INFO

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn.egg-info/requires.txt

@@ -1,5 +1,6 @@
 
 [dev]
 coverage>=7.0.0
+mypy>=1.9.0
 ruff>=0.8.0
 setuptools-scm>=8.0

{git2svn-0.5.1 → git2svn-0.5.2}/git2svn.egg-info/scm_file_list.json

@@ -25,6 +25,7 @@
     "git2svn/eol.py",
     "git2svn/git.py",
     "git2svn/patcher.py",
+    "git2svn/py.typed",
     "git2svn/state.py",
     "git2svn/svn.py",
     "pyproject.toml",

{git2svn-0.5.1 → git2svn-0.5.2}/pyproject.toml

@@ -37,6 +37,7 @@ Changelog = "https://github.com/simon123h/git2svn/releases"
 [project.optional-dependencies]
 dev = [
     "coverage>=7.0.0",
+    "mypy>=1.9.0",
     "ruff>=0.8.0",
     "setuptools-scm>=8.0",
 ]
@@ -85,3 +86,20 @@ exclude_lines = [
     "if __name__ == .__main__.:",
 ]
 
+[tool.setuptools.package-data]
+git2svn = ["py.typed"]
+
+[tool.mypy]
+python_version = "3.11"
+strict = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_return_any = true
+show_error_codes = true
+
+