scmrepo 3.3.4__tar.gz → 3.3.6__tar.gz

{scmrepo-3.3.4 → scmrepo-3.3.6}/.github/workflows/tests.yaml

@@ -40,12 +40,11 @@ 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

{scmrepo-3.3.4 → scmrepo-3.3.6}/.pre-commit-config.yaml

@@ -20,13 +20,13 @@ repos:
       - id: sort-simple-yaml
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.4.3'
+    rev: 'v0.5.0'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies: ["tomli"]

{scmrepo-3.3.4/src/scmrepo.egg-info → scmrepo-3.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.4
+Version: 3.3.6
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -36,7 +36,7 @@ Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.10.0; extra == "dev"
+Requires-Dist: mypy==1.10.1; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.4 → scmrepo-3.3.6}/noxfile.py

@@ -32,14 +32,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.4 → scmrepo-3.3.6}/pyproject.toml

@@ -50,7 +50,7 @@ tests = [
     "pytest-test-utils>=0.1.0,<0.2",
 ]
 dev = [
-    "mypy==1.10.0",
+    "mypy==1.10.1",
     "scmrepo[tests]",
     "types-certifi",
     "types-mock",
@@ -123,8 +123,13 @@ ignore_missing_imports = true
 
 [tool.codespell]
 ignore-words-list = "cachable, keypair"
+skip = "CODE_OF_CONDUCT.rst"
 
 [tool.ruff]
+output-format = "full"
+show-fixes = true
+
+[tool.ruff.lint]
 ignore = [
     "S101", # assert
     "PLR2004", # magic-value-comparison
@@ -180,10 +185,8 @@ select = [
     "W", # pycodestyle - Warning
     "YTT", # flake8-2020
 ]
-show-source = true
-show-fixes = true
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "noxfile.py" = ["D", "PTH"]
 "tests/**" = ["S", "ARG001", "ARG002", "ANN"]
 "docs/**" = ["INP"]
@@ -199,5 +202,5 @@ strict = true
 [tool.ruff.lint.isort]
 known-first-party = ["scmrepo"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-args = 10

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/backend/dulwich/asyncssh_vendor.py

@@ -66,8 +66,8 @@ class _StderrWrapper:
 class AsyncSSHWrapper(BaseAsyncObject):
     def __init__(self, conn: "SSHClientConnection", proc: "SSHClientProcess", **kwargs):
         super().__init__(**kwargs)
-        self.conn: "SSHClientConnection" = conn
-        self.proc: "SSHClientProcess" = proc
+        self.conn: SSHClientConnection = conn
+        self.proc: SSHClientProcess = proc
         self.stderr = _StderrWrapper(proc.stderr, self.loop)
 
     def can_read(self) -> bool:
@@ -152,7 +152,7 @@ class InteractiveSSHClient(SSHClient):
     def connection_lost(self, exc: Optional[Exception]) -> None:
         self._conn = None
 
-    async def public_key_auth_requested(  # noqa: C901, PLR0912
+    async def public_key_auth_requested(  # noqa: C901
         self,
     ) -> Optional["KeyPairListArg"]:
         from asyncssh.public_key import (
@@ -298,7 +298,7 @@ class AsyncSSHVendor(BaseAsyncObject, SSHVendor):
                 host,
                 port=port if port is not None else (),
                 username=username if username is not None else (),
-                password=password if password is not None else (),
+                password=password,
                 client_keys=[key_filename] if key_filename else (),
                 ignore_encrypted=not key_filename,
                 known_hosts=None,
@@ -320,7 +320,7 @@ def get_unsupported_opts(config_paths: "ConfigPaths") -> Iterator[str]:
 
     if config_paths:
         if isinstance(config_paths, (str, PurePath)):
-            paths: Sequence["FilePath"] = [config_paths]
+            paths: Sequence[FilePath] = [config_paths]
         else:
             paths = config_paths
 

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/backend/dulwich/client.py

@@ -22,7 +22,7 @@ class GitCredentialsHTTPClient(Urllib3HttpGitClient):  # pylint: disable=abstrac
             config=config,
             **kwargs,
         )
-        self._store_credentials: Optional["Credential"] = None
+        self._store_credentials: Optional[Credential] = None
 
     def _http_request(
         self,

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/backend/gitpython.py

@@ -468,7 +468,7 @@ class GitPythonBackend(BaseGitBackend):  # pylint:disable=abstract-method
         except GitCommandError as exc:
             raise SCMError(f"Failed to set ref '{name}'") from exc
 
-    def get_ref(self, name: str, follow: bool = True) -> Optional[str]:  # noqa: C901, PLR0911, PLR0912
+    def get_ref(self, name: str, follow: bool = True) -> Optional[str]:  # noqa: C901, PLR0911
         from git.exc import GitCommandError
 
         if name == "HEAD":

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/backend/pygit2/__init__.py

@@ -34,6 +34,7 @@ logger = logging.getLogger(__name__)
 if TYPE_CHECKING:
     from pygit2 import Commit, Oid, Signature
     from pygit2.config import Config as _Pygit2Config
+    from pygit2.enums import CheckoutStrategy
     from pygit2.remotes import Remote
     from pygit2.repository import Repository
 
@@ -246,17 +247,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         )
 
     @staticmethod
-    def _get_checkout_strategy(strategy: Optional[int] = None):
-        from pygit2 import (
-            GIT_CHECKOUT_RECREATE_MISSING,
-            GIT_CHECKOUT_SAFE,
-            GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES,
-        )
+    def _get_checkout_strategy(
+        strategy: Optional["CheckoutStrategy"] = None,
+    ) -> "CheckoutStrategy":
+        from pygit2.enums import CheckoutStrategy
 
         if strategy is None:
-            strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING
+            strategy = CheckoutStrategy.SAFE | CheckoutStrategy.RECREATE_MISSING
         if os.name == "nt":
-            strategy |= GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES
+            strategy |= CheckoutStrategy.SKIP_LOCKED_DIRECTORIES
         return strategy
 
     # Workaround to force git_backend_odb_pack to release open file handles
@@ -343,9 +342,12 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         force: bool = False,
         **kwargs,
     ):
-        from pygit2 import GIT_CHECKOUT_FORCE, GitError
+        from pygit2 import GitError
+        from pygit2.enums import CheckoutStrategy
 
-        strategy = self._get_checkout_strategy(GIT_CHECKOUT_FORCE if force else None)
+        strategy = self._get_checkout_strategy(
+            CheckoutStrategy.FORCE if force else None
+        )
 
         with self.release_odb_handles():
             if create_new:
@@ -613,7 +615,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         force: bool = False,
         on_diverged: Optional[Callable[[str, str], bool]] = None,
     ) -> SyncStatus:
-        import pygit2
+        from pygit2.enums import MergeAnalysis
 
         rh_rev = self.resolve_rev(rh)
 
@@ -627,16 +629,16 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             self.set_ref(lh, rh_rev)
             return SyncStatus.SUCCESS
 
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE:
+        if merge_result & MergeAnalysis.UP_TO_DATE:
             return SyncStatus.UP_TO_DATE
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
+        if merge_result & MergeAnalysis.FASTFORWARD:
             self.set_ref(lh, rh_rev)
             return SyncStatus.SUCCESS
-        if merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
+        if merge_result & MergeAnalysis.NORMAL:
             if on_diverged and on_diverged(lh, rh_rev):
                 return SyncStatus.SUCCESS
             return SyncStatus.DIVERGED
-        logger.debug("Unexpected merge result: %s", pygit2.GIT_MERGE_ANALYSIS_NORMAL)
+        logger.debug("Unexpected merge result: %s", MergeAnalysis.NORMAL)
         raise SCMError("Unknown merge analysis result")
 
     @contextmanager
@@ -696,7 +698,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 SCMError(f"Git failed to fetch ref from '{url}'"),
             ):
                 with RemoteCallbacks(progress=progress) as cb:
-                    remote_refs: dict[str, "Oid"] = (
+                    remote_refs: dict[str, Oid] = (
                         {
                             head["name"]: head["oid"]
                             for head in remote.ls_remotes(callbacks=cb)
@@ -710,7 +712,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                         message="fetch",
                     )
 
-            result: dict[str, "SyncStatus"] = {}
+            result: dict[str, SyncStatus] = {}
             for refspec in refspecs:
                 lh, rh = refspec.split(":")
                 if lh.endswith("*"):
@@ -779,7 +781,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         skip_conflicts: bool = False,
         **kwargs,
     ):
-        from pygit2 import GIT_CHECKOUT_ALLOW_CONFLICTS, GitError
+        from pygit2 import GitError
+        from pygit2.enums import CheckoutStrategy
 
         from scmrepo.git import Stash
 
@@ -788,7 +791,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 self.repo.index.read(False)
                 strategy = self._get_checkout_strategy()
                 if skip_conflicts:
-                    strategy |= GIT_CHECKOUT_ALLOW_CONFLICTS
+                    strategy |= CheckoutStrategy.ALLOW_CONFLICTS
                 self.repo.stash_apply(
                     index, strategy=strategy, reinstate_index=reinstate_index
                 )
@@ -834,7 +837,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         raise NotImplementedError
 
     def reset(self, hard: bool = False, paths: Optional[Iterable[str]] = None):
-        from pygit2 import GIT_RESET_HARD, GIT_RESET_MIXED, IndexEntry
+        from pygit2 import IndexEntry
+        from pygit2.enums import ResetMode
 
         self.repo.index.read(False)
         if paths is not None:
@@ -847,9 +851,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 self.repo.index.add(IndexEntry(rel, obj.id, obj.filemode))
             self.repo.index.write()
         elif hard:
-            self.repo.reset(self.repo.head.target, GIT_RESET_HARD)
+            self.repo.reset(self.repo.head.target, ResetMode.HARD)
         else:
-            self.repo.reset(self.repo.head.target, GIT_RESET_MIXED)
+            self.repo.reset(self.repo.head.target, ResetMode.MIXED)
 
     def checkout_index(
         self,
@@ -858,22 +862,17 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         ours: bool = False,
         theirs: bool = False,
     ):
-        from pygit2 import (
-            GIT_CHECKOUT_ALLOW_CONFLICTS,
-            GIT_CHECKOUT_FORCE,
-            GIT_CHECKOUT_RECREATE_MISSING,
-            GIT_CHECKOUT_SAFE,
-        )
+        from pygit2.enums import CheckoutStrategy
 
         assert not (ours and theirs)
-        strategy = GIT_CHECKOUT_RECREATE_MISSING
+        strategy = CheckoutStrategy.RECREATE_MISSING
         if force or ours or theirs:
-            strategy |= GIT_CHECKOUT_FORCE
+            strategy |= CheckoutStrategy.FORCE
         else:
-            strategy |= GIT_CHECKOUT_SAFE
+            strategy |= CheckoutStrategy.SAFE
 
         if ours or theirs:
-            strategy |= GIT_CHECKOUT_ALLOW_CONFLICTS
+            strategy |= CheckoutStrategy.ALLOW_CONFLICTS
         strategy = self._get_checkout_strategy(strategy)
 
         index = self.repo.index
@@ -910,18 +909,7 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
     def status(
         self, ignored: bool = False, untracked_files: str = "all"
     ) -> tuple[Mapping[str, Iterable[str]], Iterable[str], Iterable[str]]:
-        from pygit2 import (
-            GIT_STATUS_IGNORED,
-            GIT_STATUS_INDEX_DELETED,
-            GIT_STATUS_INDEX_MODIFIED,
-            GIT_STATUS_INDEX_NEW,
-            GIT_STATUS_WT_DELETED,
-            GIT_STATUS_WT_MODIFIED,
-            GIT_STATUS_WT_NEW,
-            GIT_STATUS_WT_RENAMED,
-            GIT_STATUS_WT_TYPECHANGE,
-            GIT_STATUS_WT_UNREADABLE,
-        )
+        from pygit2.enums import FileStatus
 
         staged: Mapping[str, list[str]] = {
             "add": [],
@@ -932,19 +920,19 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         untracked: list[str] = []
 
         states = {
-            GIT_STATUS_WT_NEW: untracked,
-            GIT_STATUS_WT_MODIFIED: unstaged,
-            GIT_STATUS_WT_TYPECHANGE: staged["modify"],
-            GIT_STATUS_WT_DELETED: staged["modify"],
-            GIT_STATUS_WT_RENAMED: staged["modify"],
-            GIT_STATUS_INDEX_NEW: staged["add"],
-            GIT_STATUS_INDEX_MODIFIED: staged["modify"],
-            GIT_STATUS_INDEX_DELETED: staged["delete"],
-            GIT_STATUS_WT_UNREADABLE: untracked,
+            FileStatus.WT_NEW: untracked,
+            FileStatus.WT_MODIFIED: unstaged,
+            FileStatus.WT_TYPECHANGE: staged["modify"],
+            FileStatus.WT_DELETED: staged["modify"],
+            FileStatus.WT_RENAMED: staged["modify"],
+            FileStatus.INDEX_NEW: staged["add"],
+            FileStatus.INDEX_MODIFIED: staged["modify"],
+            FileStatus.INDEX_DELETED: staged["delete"],
+            FileStatus.WT_UNREADABLE: untracked,
         }
 
         if untracked_files != "no" and ignored:
-            states[GIT_STATUS_IGNORED] = untracked
+            states[FileStatus.IGNORED] = untracked
 
         for file, state in self.repo.status(
             untracked_files=untracked_files, ignored=ignored
@@ -970,15 +958,8 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         msg: Optional[str] = None,
         squash: bool = False,
     ) -> Optional[str]:
-        from pygit2 import (
-            GIT_MERGE_ANALYSIS_FASTFORWARD,
-            GIT_MERGE_ANALYSIS_NONE,
-            GIT_MERGE_ANALYSIS_UNBORN,
-            GIT_MERGE_ANALYSIS_UP_TO_DATE,
-            GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY,
-            GIT_MERGE_PREFERENCE_NO_FASTFORWARD,
-            GitError,
-        )
+        from pygit2 import GitError
+        from pygit2.enums import MergeAnalysis, MergePreference
 
         if commit and squash:
             raise SCMError("Cannot merge with 'squash' and 'commit'")
@@ -991,9 +972,9 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
             except GitError as exc:
                 raise SCMError("Merge analysis failed") from exc
 
-            if analysis == GIT_MERGE_ANALYSIS_NONE:
+            if analysis == MergeAnalysis.NONE:
                 raise SCMError(f"'{rev}' cannot be merged into HEAD")
-            if analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE:
+            if analysis & MergeAnalysis.UP_TO_DATE:
                 return None
 
             try:
@@ -1006,15 +987,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
                 raise MergeConflictError("Merge contained conflicts")
 
             try:
-                if not (squash or ff_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD):
-                    if analysis & GIT_MERGE_ANALYSIS_FASTFORWARD:
+                if not (squash or ff_pref & MergePreference.NO_FASTFORWARD):
+                    if analysis & MergeAnalysis.FASTFORWARD:
                         return self._merge_ff(rev, obj)
 
-                    if analysis & GIT_MERGE_ANALYSIS_UNBORN:
+                    if analysis & MergeAnalysis.UNBORN:
                         self.repo.set_head(obj.id)
                         return str(obj.id)
 
-                if ff_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY:
+                if ff_pref & MergePreference.FASTFORWARD_ONLY:
                     raise SCMError(f"Cannot fast-forward HEAD to '{rev}'")
 
                 if commit:
@@ -1105,19 +1086,15 @@ class Pygit2Backend(BaseGitBackend):  # pylint:disable=abstract-method
         attr: str,
         source: Optional[str] = None,
     ) -> Optional[Union[bool, str]]:
-        from pygit2 import (
-            GIT_ATTR_CHECK_FILE_THEN_INDEX,
-            GIT_ATTR_CHECK_INCLUDE_COMMIT,
-            GIT_ATTR_CHECK_INDEX_ONLY,
-            GitError,
-        )
+        from pygit2 import GitError
+        from pygit2.enums import AttrCheck
 
-        commit: Optional["Commit"] = None
-        flags = GIT_ATTR_CHECK_FILE_THEN_INDEX
+        commit: Optional[Commit] = None
+        flags = AttrCheck.FILE_THEN_INDEX
         if source:
             try:
                 commit, _ref = self._resolve_refish(source)
-                flags = GIT_ATTR_CHECK_INDEX_ONLY | GIT_ATTR_CHECK_INCLUDE_COMMIT
+                flags = AttrCheck.INDEX_ONLY | AttrCheck.INCLUDE_COMMIT
             except (KeyError, GitError) as exc:
                 raise SCMError(f"Invalid commit '{source}'") from exc
         try:

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/backend/pygit2/callbacks.py

@@ -28,7 +28,7 @@ class RemoteCallbacks(_RemoteCallbacks, AbstractContextManager):
     ):
         super().__init__(*args, **kwargs)
         self.progress = GitProgressReporter(progress) if progress else None
-        self._store_credentials: Optional["Credential"] = None
+        self._store_credentials: Optional[Credential] = None
         self._tried_credentials = False
         self.result: dict[str, SyncStatus] = {}
 

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/credentials.py

@@ -136,8 +136,8 @@ class GitCredentialHelper(CredentialHelper):
         if not shutil.which(executable) and shutil.which("git"):
             # If the helper cannot be found in PATH, it might be
             # a C git helper in GIT_EXEC_PATH
-            git_exec_path = subprocess.check_output(
-                ("git", "--exec-path"),  # noqa: S603
+            git_exec_path = subprocess.check_output(  # noqa: S603
+                ("git", "--exec-path"),
                 text=True,
             ).strip()
             if shutil.which(executable, path=git_exec_path):
@@ -158,8 +158,8 @@ class GitCredentialHelper(CredentialHelper):
         helper_input.append("")
 
         try:
-            res = subprocess.run(
-                cmd,  # noqa: S603
+            res = subprocess.run(  # noqa: S603
+                cmd,
                 check=True,
                 capture_output=True,
                 input="\n".join(helper_input),
@@ -199,8 +199,8 @@ class GitCredentialHelper(CredentialHelper):
         helper_input.append("")
 
         try:
-            res = subprocess.run(
-                cmd,  # noqa: S603
+            res = subprocess.run(  # noqa: S603
+                cmd,
                 capture_output=True,
                 input="\n".join(helper_input),
                 encoding=self._encoding,
@@ -224,8 +224,8 @@ class GitCredentialHelper(CredentialHelper):
         helper_input.append("")
 
         try:
-            res = subprocess.run(
-                cmd,  # noqa: S603
+            res = subprocess.run(  # noqa: S603
+                cmd,
                 capture_output=True,
                 input="\n".join(helper_input),
                 encoding=self._encoding,
@@ -243,7 +243,7 @@ class GitCredentialHelper(CredentialHelper):
     ) -> Iterator[tuple[str, bool]]:
         config = config or StackedConfig.default()
         if isinstance(config, StackedConfig):
-            backends: Iterable["ConfigDict"] = config.backends
+            backends: Iterable[ConfigDict] = config.backends
         else:
             backends = [config]
 
@@ -324,7 +324,7 @@ class MemoryCredentialHelper(CredentialHelper):
 
     def __init__(self):
         super().__init__()
-        self._credentials: dict["_CredentialKey", "Credential"] = {}
+        self._credentials: dict[_CredentialKey, Credential] = {}
 
     def __getitem__(self, key: object) -> "Credential":
         if isinstance(key, _CredentialKey):
@@ -448,8 +448,8 @@ class _AskpassCommand:
     def input(self, prompt: str) -> str:
         argv = [self.command, prompt]
         try:
-            res = subprocess.run(
-                argv,  # noqa: S603
+            res = subprocess.run(  # noqa: S603
+                argv,
                 check=True,
                 capture_output=True,
                 encoding=locale.getpreferredencoding(),

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo/git/lfs/fetch.py

@@ -46,7 +46,7 @@ def fetch(
     scm.lfs_storage.fetch(url, objects, progress=progress)
 
 
-def get_fetch_url(scm: "Git", remote: Optional[str] = None):  # noqa: C901,PLR0912
+def get_fetch_url(scm: "Git", remote: Optional[str] = None):  # noqa: C901
     """Return LFS fetch URL for the specified repository."""
     git_config = scm.get_config()
 
@@ -56,7 +56,7 @@ def get_fetch_url(scm: "Git", remote: Optional[str] = None):  # noqa: C901,PLR09
     except KeyError:
         pass
     try:
-        lfs_config: Optional["Config"] = scm.get_config(
+        lfs_config: Optional[Config] = scm.get_config(
             os.path.join(scm.root_dir, ".lfsconfig")
         )
     except FileNotFoundError:

{scmrepo-3.3.4 → scmrepo-3.3.6/src/scmrepo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scmrepo
-Version: 3.3.4
+Version: 3.3.6
 Summary: scmrepo
 Author-email: Iterative <support@dvc.org>
 License: Apache-2.0
@@ -36,7 +36,7 @@ Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-sugar; extra == "tests"
 Requires-Dist: pytest-test-utils<0.2,>=0.1.0; extra == "tests"
 Provides-Extra: dev
-Requires-Dist: mypy==1.10.0; extra == "dev"
+Requires-Dist: mypy==1.10.1; extra == "dev"
 Requires-Dist: scmrepo[tests]; extra == "dev"
 Requires-Dist: types-certifi; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"

{scmrepo-3.3.4 → scmrepo-3.3.6}/src/scmrepo.egg-info/requires.txt

@@ -10,7 +10,7 @@ aiohttp-retry>=2.5.0
 tqdm
 
 [dev]
-mypy==1.10.0
+mypy==1.10.1
 scmrepo[tests]
 types-certifi
 types-mock

{scmrepo-3.3.4 → scmrepo-3.3.6}/tests/docker-compose.yml

@@ -2,7 +2,7 @@
 version: '3.2'
 services:
   git-server:
-    image: ghcr.io/linuxserver/openssh-server:9.0_p1-r2-ls100
+    image: ghcr.io/linuxserver/openssh-server
     environment:
       - USER_NAME=user
       - PUBLIC_KEY_FILE=/tmp/key
@@ -10,4 +10,4 @@ services:
       - 2222
     volumes:
       - ./user.key.pub:/tmp/key
-      - ./git-init:/config/custom-cont-init.d
+      - ./git-init:/custom-cont-init.d

{scmrepo-3.3.4 → scmrepo-3.3.6}/tests/test_dulwich.py

@@ -11,18 +11,74 @@ import pytest
 from pytest_mock import MockerFixture
 from pytest_test_utils.waiters import wait_until
 
+from scmrepo.exceptions import AuthError
 from scmrepo.git.backend.dulwich.asyncssh_vendor import AsyncSSHVendor
 
-from .vendor.test_paramiko_vendor import (
-    CLIENT_KEY,
-    PASSWORD,
-    USER,
-    Server,
-)
-
 # pylint: disable=redefined-outer-name
 
 
+USER = "testuser"
+PASSWORD = "test"
+CLIENT_KEY = """-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAxvREKSElPOm/0z/nPO+j5rk2tjdgGcGc7We1QZ6TRXYLu7nN
+GeEFIL4p8N1i6dmB+Eydt7xqCU79MWD6Yy4prFe1+/K1wCDUxIbFMxqQcX5zjJzd
+i8j8PbcaUlVhP/OkjtkSxrXaGDO1BzfdV4iEBtTV/2l3zmLKJlt3jnOHLczP24CB
+DTQKp3rKshbRefzot9Y+wnaK692RsYgsyo9YEP0GyWKG9topCHk13r46J6vGLeuj
+ryUKqmbLJkzbJbIcEqwTDo5iHaCVqaMr5Hrb8BdMucSseqZQJsXSd+9tdRcIblUQ
+38kZjmFMm4SFbruJcpZCNM2wNSZPIRX+3eiwNwIDAQABAoIBAHSacOBSJsr+jIi5
+KUOTh9IPtzswVUiDKwARCjB9Sf8p4lKR4N1L/n9kNJyQhApeikgGT2GCMftmqgoo
+tlculQoHFgemBlOmak0MV8NNzF5YKEy/GzF0CDH7gJfEpoyetVFrdA+2QS5yD6U9
+XqKQxiBi2VEqdScmyyeT8AwzNYTnPeH/DOEcnbdRjqiy/CD79F49CQ1lX1Fuqm0K
+I7BivBH1xo/rVnUP4F+IzocDqoga+Pjdj0LTXIgJlHQDSbhsQqWujWQDDuKb+MAw
+sNK4Zf8ErV3j1PyA7f/M5LLq6zgstkW4qikDHo4SpZX8kFOO8tjqb7kujj7XqeaB
+CxqrOTECgYEA73uWkrohcmDJ4KqbuL3tbExSCOUiaIV+sT1eGPNi7GCmXD4eW5Z4
+75v2IHymW83lORSu/DrQ6sKr1nkuRpqr2iBzRmQpl/H+wahIhBXlnJ25uUjDsuPO
+1Pq2LcmyD+jTxVnmbSe/q7O09gZQw3I6H4+BMHmpbf8tC97lqimzpJ0CgYEA1K0W
+ZL70Xtn9quyHvbtae/BW07NZnxvUg4UaVIAL9Zu34JyplJzyzbIjrmlDbv6aRogH
+/KtuG9tfbf55K/jjqNORiuRtzt1hUN1ye4dyW7tHx2/7lXdlqtyK40rQl8P0kqf8
+zaS6BqjnobgSdSpg32rWoL/pcBHPdJCJEgQ8zeMCgYEA0/PK8TOhNIzrP1dgGSKn
+hkkJ9etuB5nW5mEM7gJDFDf6JPupfJ/xiwe6z0fjKK9S57EhqgUYMB55XYnE5iIw
+ZQ6BV9SAZ4V7VsRs4dJLdNC3tn/rDGHJBgCaym2PlbsX6rvFT+h1IC8dwv0V79Ui
+Ehq9WTzkMoE8yhvNokvkPZUCgYEAgBAFxv5xGdh79ftdtXLmhnDvZ6S8l6Fjcxqo
+Ay/jg66Tp43OU226iv/0mmZKM8Dd1xC8dnon4GBVc19jSYYiWBulrRPlx0Xo/o+K
+CzZBN1lrXH1i6dqufpc0jq8TMf/N+q1q/c1uMupsKCY1/xVYpc+ok71b7J7c49zQ
+nOeuUW8CgYA9Infooy65FTgbzca0c9kbCUBmcAPQ2ItH3JcPKWPQTDuV62HcT00o
+fZdIV47Nez1W5Clk191RMy8TXuqI54kocciUWpThc6j44hz49oUueb8U4bLcEHzA
+WxtWBWHwxfSmqgTXilEA3ALJp0kNolLnEttnhENwJpZHlqtes0ZA4w==
+-----END RSA PRIVATE KEY-----"""
+
+
+class Server(paramiko.ServerInterface):
+    """http://docs.paramiko.org/en/2.4/api/server.html."""
+
+    def __init__(self, commands, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self.commands = commands
+
+    def check_channel_exec_request(self, channel, command):
+        self.commands.append(command)
+        return True
+
+    def check_auth_password(self, username, password):
+        if username == USER and password == PASSWORD:
+            return paramiko.AUTH_SUCCESSFUL
+        return paramiko.AUTH_FAILED
+
+    def check_auth_publickey(self, username, key):
+        pubkey = paramiko.RSAKey.from_private_key(StringIO(CLIENT_KEY))
+        if username == USER and key == pubkey:
+            return paramiko.AUTH_SUCCESSFUL
+        return paramiko.AUTH_FAILED
+
+    def check_channel_request(self, kind, chanid):
+        if kind == "session":
+            return paramiko.OPEN_SUCCEEDED
+        return paramiko.OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
+
+    def get_allowed_auths(self, username):
+        return "password,publickey"
+
+
 @pytest.fixture
 def ssh_conn(request: pytest.FixtureRequest) -> dict[str, Any]:
     server = Server([])
@@ -77,6 +133,18 @@ def test_run_command_password(server: Server, ssh_port: int):
     assert b"test_run_command_password" in server.commands
 
 
+def test_run_command_no_password(server: Server, ssh_port: int):
+    vendor = AsyncSSHVendor()
+    with pytest.raises(AuthError):
+        vendor.run_command(
+            "127.0.0.1",
+            "test_run_command_password",
+            username=USER,
+            port=ssh_port,
+            password=None,
+        )
+
+
 def test_run_command_with_privkey(server: Server, ssh_port: int):
     key = asyncssh.import_private_key(CLIENT_KEY)