From 47bdb368bd1dfdb81a0eafd5f2cc1caafff30798 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Tue, 12 Sep 2023 20:33:31 +0900 Subject: [PATCH 1/3] deps: bump pygit2 to 1.13.0 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0fb89af4..d7632f48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ packages = find: install_requires= gitpython>3 dulwich>=0.21.6 - pygit2>=1.10.0 + pygit2>=1.13.0 pygtrie>=2.3.2 fsspec>=2021.7.0 pathspec>=0.9.0 From f5b9560d91211f2b40d0f68601bc861ef18e9219 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Tue, 12 Sep 2023 20:34:06 +0900 Subject: [PATCH 2/3] pygit2: use create_anonymous for in-memory remotes --- src/scmrepo/git/backend/pygit2/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/scmrepo/git/backend/pygit2/__init__.py b/src/scmrepo/git/backend/pygit2/__init__.py index 131c3a45..e36ce090 100644 --- a/src/scmrepo/git/backend/pygit2/__init__.py +++ b/src/scmrepo/git/backend/pygit2/__init__.py @@ -19,7 +19,6 @@ from urllib.parse import urlparse from funcy import cached_property, reraise -from shortuuid import uuid from scmrepo.exceptions import CloneError, MergeConflictError, RevError, SCMError from scmrepo.git.backend.base import BaseGitBackend, SyncStatus @@ -567,11 +566,7 @@ def get_remote(self, url: str) -> Generator["Remote", None, None]: if os.name == "nt" and url.startswith("file://"): url = url[len("file://") :] - try: - remote_name = uuid() - yield self.repo.remotes.create(remote_name, url) - finally: - self.repo.remotes.delete(remote_name) + yield self.repo.remotes.create_anonymous(url) def fetch_refspecs( self, From 8c59f34f0f5325424bd414f47e5e2021721af9f5 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Wed, 13 Sep 2023 15:04:26 +0900 Subject: [PATCH 3/3] ci: drop pypy testing --- .github/workflows/tests.yaml | 2 -- noxfile.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 7efd436b..7f67658f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -22,8 +22,6 @@ jobs: matrix: os: [ubuntu-20.04, windows-latest, macos-latest] pyv: ['3.8', '3.9', '3.10', '3.11'] - include: - - {os: ubuntu-latest, pyv: 'pypy3.8'} steps: - name: Check out the repository diff --git a/noxfile.py b/noxfile.py index 820e12c6..68f91460 100644 --- a/noxfile.py +++ b/noxfile.py @@ -9,7 +9,7 @@ locations = "src", "tests" -@nox.session(python=["3.8", "3.9", "3.10", "3.11", "pypy3.8", "pypy3.9"]) +@nox.session(python=["3.8", "3.9", "3.10", "3.11"]) def tests(session: nox.Session) -> None: session.install(".[tests]") session.run(