scmrepo 3.5.1__tar.gz → 3.5.2__tar.gz

{scmrepo-3.5.1 → scmrepo-3.5.2}/.github/workflows/tests.yaml

@@ -52,3 +52,12 @@ jobs:
 
     - name: Build package
       run: nox -s build
+
+  check:
+    if: always()
+    needs: [tests]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

{scmrepo-3.5.1 → scmrepo-3.5.2}/.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.12.5'
+    rev: 'v0.12.7'
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]

{scmrepo-3.5.1/src/scmrepo.egg-info → scmrepo-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scmrepo
-Version: 3.5.1
+Version: 3.5.2
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Requires-Dist: aiohttp-retry>=2.5.0
 Requires-Dist: tqdm
 Provides-Extra: tests
 Requires-Dist: aioresponses<0.8,>=0.7; extra == "tests"
-Requires-Dist: paramiko<4,>=3.4.0; extra == "tests"
+Requires-Dist: paramiko<5,>=3.4.0; extra == "tests"
 Requires-Dist: pytest<9,>=7; extra == "tests"
 Requires-Dist: pytest-asyncio<2,>=0.23.2; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
@@ -38,7 +38,7 @@ Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Requires-Dist: proxy.py; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.17.0; extra == "dev"
+Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.5.1 → scmrepo-3.5.2}/pyproject.toml

@@ -9,7 +9,6 @@ name = "scmrepo"
 description = "scmrepo"
 readme = "README.rst"
 license = "Apache-2.0"
-license-files = ["LICENSE"]
 authors = [{ name = "Iterative", email = "support@dvc.org" }]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -42,7 +41,7 @@ Source = "https://github.com/iterative/scmrepo"
 [project.optional-dependencies]
 tests = [
     "aioresponses>=0.7,<0.8",
-    "paramiko>=3.4.0,<4",
+    "paramiko>=3.4.0,<5",
     "pytest>=7,<9",
     "pytest-asyncio>=0.23.2,<2",
     "pytest-cov>=4.1.0",
@@ -53,7 +52,7 @@ tests = [
     "proxy.py",
 ]
 dev = [
-    "mypy==1.17.0",
+    "mypy==1.17.1",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo/base.py

@@ -103,3 +103,7 @@ class Base(AbstractContextManager):
 
     def _reset(self) -> None:
         pass
+
+    def list_submodules(self) -> list[str]:
+        """Returns a list of submodules in the repo."""
+        return []

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo/git/__init__.py

@@ -412,6 +412,7 @@ class Git(Base):
     check_attr = partialmethod(_backend_func, "check_attr")
 
     get_tree_obj = partialmethod(_backend_func, "get_tree_obj")
+    list_submodules = partialmethod(_backend_func, "list_submodules")
 
     def branch_revs(self, branch: str, end_rev: Optional[str] = None) -> Iterable[str]:
         """Iterate over revisions in a given branch (from newest to oldest).

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo/git/backend/dulwich/__init__.py

@@ -199,6 +199,9 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
         self._submodules: dict[str, str] = self._find_submodules()
         self._stashes: dict = {}
 
+    def list_submodules(self) -> list[str]:
+        raise NotImplementedError
+
     def _find_submodules(self) -> dict[str, str]:
         """Return dict mapping submodule names to submodule paths.
 
@@ -349,21 +352,6 @@ class DulwichBackend(BaseGitBackend):  # pylint:disable=abstract-method
 
     def _expand_paths(self, paths: list[str], force: bool = False) -> Iterator[str]:
         for path in paths:
-            if not os.path.isabs(path) and self._submodules:
-                # NOTE: If path is inside a submodule, Dulwich expects the
-                # staged paths to be relative to the submodule root (not the
-                # parent git repo root). We append path to root_dir here so
-                # that the result of relpath(path, root_dir) is actually the
-                # path relative to the submodule root.
-                fs_path = relpath(path, self.root_dir)
-                for sm_path in self._submodules.values():
-                    assert self.root_dir
-                    if fs_path.startswith(sm_path):
-                        path = os.path.join(
-                            self.root_dir,
-                            relpath(fs_path, sm_path),
-                        )
-                        break
             if os.path.isdir(path):
                 for root, _, fs in os.walk(path):
                     for fpath in fs:

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo/git/backend/gitpython.py

@@ -789,3 +789,6 @@ class GitPythonBackend(BaseGitBackend):  # pylint:disable=abstract-method
         if info == "unset":
             return False
         return info
+
+    def list_submodules(self) -> list[str]:
+        raise NotImplementedError

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -269,6 +269,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         # can be reacquired later as needed.
         self.repo.free()
 
+    def list_submodules(self) -> list[str]:
+        return self.repo.listall_submodules()
+
     @classmethod
     def clone(
         cls,
@@ -865,6 +868,11 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         from pygit2 import IndexEntry
         from pygit2.enums import ResetMode
 
+        if self.list_submodules():
+            raise NotImplementedError(
+                "pygit2 seems to remove files from submodules on reset"
+            )
+
         self.repo.index.read(False)  # type: ignore[attr-defined]
         if paths is not None:
             tree = self.repo.revparse_single("HEAD").tree  # type: ignore[attr-defined]

{scmrepo-3.5.1 → scmrepo-3.5.2/src/scmrepo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scmrepo
-Version: 3.5.1
+Version: 3.5.2
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Requires-Dist: aiohttp-retry>=2.5.0
 Requires-Dist: tqdm
 Provides-Extra: tests
 Requires-Dist: aioresponses<0.8,>=0.7; extra == "tests"
-Requires-Dist: paramiko<4,>=3.4.0; extra == "tests"
+Requires-Dist: paramiko<5,>=3.4.0; extra == "tests"
 Requires-Dist: pytest<9,>=7; extra == "tests"
 Requires-Dist: pytest-asyncio<2,>=0.23.2; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
@@ -38,7 +38,7 @@ Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Requires-Dist: proxy.py; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.17.0; extra == "dev"
+Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.5.1 → scmrepo-3.5.2}/src/scmrepo.egg-info/requires.txt

@@ -10,7 +10,7 @@ aiohttp-retry>=2.5.0
 tqdm
 
 [dev]
-mypy==1.17.0
+mypy==1.17.1
 scmrepo[tests]
 types-certifi
 types-mock
@@ -19,7 +19,7 @@ types-tqdm
 
 [tests]
 aioresponses<0.8,>=0.7
-paramiko<4,>=3.4.0
+paramiko<5,>=3.4.0
 pytest<9,>=7
 pytest-asyncio<2,>=0.23.2
 pytest-cov>=4.1.0