scmrepo 3.3.5__tar.gz → 3.5.3__tar.gz

{scmrepo-3.3.5 → scmrepo-3.5.3}/.github/workflows/release.yaml

@@ -17,14 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v6
       with:
-        python-version: '3.10'
+        python-version: '3.13'
 
     - name: Upgrade pip and nox
       run: |

{scmrepo-3.3.5 → scmrepo-3.5.3}/.github/workflows/tests.yaml

@@ -20,19 +20,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-latest]
-        pyv: ['3.9', '3.10', '3.11', '3.12']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        pyv: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
     - name: Set up Python ${{ matrix.pyv }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.pyv }}
+        allow-prereleases: true
 
     - name: Upgrade pip and nox
       run: |
@@ -40,15 +41,23 @@ jobs:
         pip --version
         nox --version
 
-    - name: Lint code and check dependencies
-      continue-on-error: ${{ matrix.nox_pyv == '3.11' }}
-      run: nox -s lint safety --verbose
+    - name: Lint code
+      run: nox -s lint
 
     - name: Run tests
-      run: nox -s tests-${{ matrix.nox_pyv || matrix.pyv }} -- --slow --cov-report=xml
+      run: nox -s tests-${{ matrix.pyv }} -- --slow --cov-report=xml
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v3.1.0
+      uses: codecov/codecov-action@v5
 
     - 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.3.5 → scmrepo-3.5.3}/.github/workflows/update-template.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Update template via cruft
       uses: iterative/py-template@main

{scmrepo-3.3.5 → scmrepo-3.5.3}/.gitignore

@@ -138,3 +138,4 @@ dmypy.json
 cython_debug/
 
 .DS_Store
+.vscode/

{scmrepo-3.3.5 → scmrepo-3.5.3}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -20,13 +20,13 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.4.4'
+    rev: 'v0.14.3'
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]

{scmrepo-3.3.5/src/scmrepo.egg-info → scmrepo-3.5.3}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scmrepo
-Version: 3.3.5
+Version: 3.5.3
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Issues, https://github.com/iterative/scmrepo/issues
 Project-URL: Source, https://github.com/iterative/scmrepo
 Classifier: Programming Language :: Python :: 3
@@ -11,12 +11,14 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: gitpython>3
-Requires-Dist: dulwich>=0.22.1
+Requires-Dist: dulwich>=0.24.0
 Requires-Dist: pygit2>=1.14.0
 Requires-Dist: pygtrie>=2.3.2
 Requires-Dist: fsspec[tqdm]>=2024.2.0
@@ -27,21 +29,23 @@ 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<1,>=0.23.2; extra == "tests"
+Requires-Dist: pytest-asyncio<2,>=0.23.2; extra == "tests"
 Requires-Dist: pytest-cov>=4.1.0; extra == "tests"
 Requires-Dist: pytest-docker<4,>=1; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 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.10.0; extra == "dev"
+Requires-Dist: mypy==1.18.2; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-paramiko; extra == "dev"
 Requires-Dist: types-tqdm; extra == "dev"
+Dynamic: license-file
 
 scmrepo
 =======

{scmrepo-3.3.5 → scmrepo-3.5.3}/noxfile.py

@@ -10,7 +10,11 @@ nox.options.sessions = "lint", "tests"
 locations = "src", "tests"
 
 
-@nox.session(python=["3.9", "3.10", "3.11", "3.12"])
+project = nox.project.load_toml()
+python_versions = nox.project.python_versions(project)
+
+
+@nox.session(python=python_versions)
 def tests(session: nox.Session) -> None:
     session.install(".[tests]")
     session.run(
@@ -32,14 +36,6 @@ def lint(session: nox.Session) -> None:
     session.run("python", "-m", "mypy")
 
 
-@nox.session
-def safety(session: nox.Session) -> None:
-    """Scan dependencies for insecure packages."""
-    session.install(".[dev]")
-    session.install("safety")
-    session.run("safety", "check", "--full-report", "--ignore=67599")
-
-
 @nox.session
 def build(session: nox.Session) -> None:
     session.install("build", "setuptools", "twine")

{scmrepo-3.3.5 → scmrepo-3.5.3}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=48", "setuptools_scm[toml]>=6.3.1"]
+requires = ["setuptools>=77", "setuptools_scm[toml]>=8"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
@@ -8,7 +8,8 @@ build-backend = "setuptools.build_meta"
 name = "scmrepo"
 description = "scmrepo"
 readme = "README.rst"
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
+license-files = ["LICENSE"]
 authors = [{ name = "Iterative", email = "support@dvc.org" }]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -16,13 +17,15 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Development Status :: 4 - Beta",
 ]
 requires-python = ">=3.9"
 dynamic = ["version"]
 dependencies = [
     "gitpython>3",
-    "dulwich>=0.22.1",
+    "dulwich>=0.24.0",
     "pygit2>=1.14.0",
     "pygtrie>=2.3.2",
     "fsspec[tqdm]>=2024.2.0",
@@ -40,17 +43,18 @@ 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,<1",
+    "pytest-asyncio>=0.23.2,<2",
     "pytest-cov>=4.1.0",
     "pytest-docker>=1,<4",
     "pytest-mock",
     "pytest-sugar",
     "pytest-test-utils>=0.1.0,<0.2",
+    "proxy.py",
 ]
 dev = [
-    "mypy==1.10.0",
+    "mypy==1.18.2",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",
@@ -73,6 +77,7 @@ markers = [
 ]
 asyncio_mode = "auto"
 
+
 [tool.coverage.run]
 branch = true
 source = ["scmrepo", "tests"]
@@ -99,7 +104,7 @@ show_error_codes = true
 show_error_context = true
 show_traceback = true
 pretty = true
-check_untyped_defs = false
+check_untyped_defs = true
 # Warnings
 warn_no_return = true
 warn_redundant_casts = true
@@ -123,6 +128,7 @@ ignore_missing_imports = true
 
 [tool.codespell]
 ignore-words-list = "cachable, keypair"
+skip = "CODE_OF_CONDUCT.rst"
 
 [tool.ruff]
 output-format = "full"
@@ -143,6 +149,7 @@ ignore = [
     "RET503", # implicit-return
     "SIM117", # multiple-with-statements
     "N818", # error-suffix-on-exception-name
+    "PLC0415", # import-outside-top-level
 ]
 select = [
     "A", # flake8-buitlins
@@ -187,8 +194,9 @@ select = [
 
 [tool.ruff.lint.per-file-ignores]
 "noxfile.py" = ["D", "PTH"]
-"tests/**" = ["S", "ARG001", "ARG002", "ANN"]
+"tests/**" = ["S", "ARG001", "ARG002", "ANN", "TID251", "TID253"]
 "docs/**" = ["INP"]
+"src/scmrepo/git/backend/gitpython.py" = ["TID251"]
 
 [tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false
@@ -198,6 +206,14 @@ parametrize-names-type = "csv"
 [tool.ruff.lint.flake8-type-checking]
 strict = true
 
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"git".msg = "importing from 'git' is not allowed except inside `gitpython` backend"
+
+[tool.ruff.lint.flake8-tidy-imports]
+# Ban certain modules from being imported at module level, instead requiring
+# that they're imported lazily (e.g., within a function definition).
+banned-module-level-imports = ["git"]
+
 [tool.ruff.lint.isort]
 known-first-party = ["scmrepo"]
 

{scmrepo-3.3.5 → scmrepo-3.5.3}/src/scmrepo/asyn.py

@@ -6,7 +6,6 @@ import threading
 from typing import Any, Optional
 
 from fsspec.asyn import (  # noqa: F401, pylint:disable=unused-import
-    _selector_policy,
     sync,
     sync_wrapper,
 )
@@ -23,8 +22,7 @@ def get_loop() -> asyncio.AbstractEventLoop:
     if default_loop[0] is None:
         with lock:
             if default_loop[0] is None:
-                with _selector_policy():
-                    default_loop[0] = asyncio.new_event_loop()
+                default_loop[0] = asyncio.new_event_loop()
                 loop = default_loop[0]
                 th = threading.Thread(
                     target=loop.run_forever,  # type: ignore[attr-defined]

{scmrepo-3.3.5 → scmrepo-3.5.3}/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.3.5 → scmrepo-3.5.3}/src/scmrepo/fs.py

@@ -3,9 +3,7 @@ import os
 import posixpath
 from typing import TYPE_CHECKING, Any, BinaryIO, Callable, Optional
 
-from fsspec.callbacks import _DEFAULT_CALLBACK
 from fsspec.spec import AbstractFileSystem
-from fsspec.utils import isfilelike
 
 if TYPE_CHECKING:
     from io import BytesIO
@@ -242,32 +240,3 @@ class GitFileSystem(AbstractFileSystem):
             return paths
 
         return [self.info(_path) for _path in paths]
-
-    def get_file(
-        self, rpath, lpath, callback=_DEFAULT_CALLBACK, outfile=None, **kwargs
-    ):
-        # NOTE: temporary workaround while waiting for
-        # https://github.com/fsspec/filesystem_spec/pull/1191
-
-        if isfilelike(lpath):
-            outfile = lpath
-        elif self.isdir(rpath):
-            os.makedirs(lpath, exist_ok=True)
-            return None
-
-        with self.open(rpath, "rb", **kwargs) as f1:
-            if outfile is None:
-                outfile = open(lpath, "wb")  # noqa: SIM115
-
-            try:
-                callback.set_size(getattr(f1, "size", None))
-                data = True
-                while data:
-                    data = f1.read(self.blocksize)
-                    segment_len = outfile.write(data)
-                    if segment_len is None:
-                        segment_len = len(data)
-                    callback.relative_update(segment_len)
-            finally:
-                if not isfilelike(lpath):
-                    outfile.close()

{scmrepo-3.3.5 → scmrepo-3.5.3}/src/scmrepo/git/__init__.py

@@ -10,6 +10,7 @@ from contextlib import contextmanager
 from functools import partialmethod
 from typing import (
     TYPE_CHECKING,
+    Any,
     Callable,
     ClassVar,
     Optional,
@@ -258,7 +259,7 @@ class Git(Base):
         self.hooks_dir.mkdir(exist_ok=True)
         hook = self.hooks_dir / name
 
-        directive = f"#!{shutil.which(interpreter) or '/bin/sh' }"
+        directive = f"#!{shutil.which(interpreter) or '/bin/sh'}"
         hook.write_text(f"{directive}\n{script}\n", encoding="utf-8")
         hook.chmod(0o777)
 
@@ -287,7 +288,7 @@ class Git(Base):
     def no_commits(self):
         return not bool(self.get_ref("HEAD"))
 
-    # Prefer re-using the most recently used backend when possible. When
+    # Prefer reusing the most recently used backend when possible. When
     # changing backends (due to unimplemented calls), we close the previous
     # backend to release any open git files/contexts that may cause conflicts
     # with the new backend.
@@ -295,7 +296,7 @@ class Git(Base):
     # See:
     # https://github.com/iterative/dvc/issues/5641
     # https://github.com/iterative/dvc/issues/7458
-    def _backend_func(self, name, *args, **kwargs):
+    def _backend_func(self, name, *args, **kwargs) -> Any:
         backends: Iterable[str] = kwargs.pop("backends", self.backends)
         for key in backends:
             if self._last_backend is not None and key != self._last_backend:
@@ -411,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.3.5 → scmrepo-3.5.3}/src/scmrepo/git/backend/base.py

@@ -40,7 +40,7 @@ class BaseGitBackend(ABC):
 
     @property
     @abstractmethod
-    def root_dir(self) -> str:
+    def root_dir(self) -> Optional[str]:
         pass
 
     @staticmethod