From c2cb9a786a30e92cd504f452826d26b5e82395bf Mon Sep 17 00:00:00 2001 From: Gao Date: Tue, 22 Mar 2022 18:51:28 +0800 Subject: [PATCH 1/2] Solve `pygit2` version conflict In version 1.5.0, I got a > ImportError: cannot import name 'GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY' from 'pygit2' `GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY` was introduced in 1.6.0. Upgrade the min version of `pygit2` to fix it. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5c2e210b..ed414b60 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ packages = find: install_requires= gitpython>3 dulwich>=0.20.34 - pygit2>=1.5.0 + pygit2>=1.6.0 pygtrie>=2.3.2 fsspec>=2021.7.0 pathspec>=0.9.0,<0.10.0 From a52b9679d1cc1ee9d851a50fda16371f880dd29c Mon Sep 17 00:00:00 2001 From: Gao Date: Tue, 22 Mar 2022 19:50:10 +0800 Subject: [PATCH 2/2] Update setup.cfg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Peter Rowlands (변기호) --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ed414b60..8bf764b3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ packages = find: install_requires= gitpython>3 dulwich>=0.20.34 - pygit2>=1.6.0 + pygit2>=1.7.2 pygtrie>=2.3.2 fsspec>=2021.7.0 pathspec>=0.9.0,<0.10.0