Restore requirements after testing with pygit2 v1.17.0 successfully

requirements/static/ci/common.in

@@ -7,12 +7,7 @@ apache-libcloud>=1.5.0; sys_platform != 'win32'
 boto3>=1.17.67
 boto>=2.46.0
 cassandra-driver>=2.0
-
-# DGM cffi>=1.14.6
-cffi>=1.14.6; python_version < '3.10'
-cffi>=1.17.1; python_version == '3.10'
-cffi>=1.14.6; python_version > '3.10'
-
+cffi>=1.14.6
 cherrypy>=17.4.1
 clustershell
 dnspython

requirements/static/ci/linux.in

@@ -2,11 +2,7 @@
 --constraint=../pkg/py{py_version}/{platform}.txt
 
 pyiface
-# DGM pygit2>=1.10.1
-pygit2>=1.10.1; python_version < '3.10'
-pygit2>=1.17.0; python_version == '3.10'
-pygit2>=1.10.1; python_version > '3.10'
-
+pygit2>=1.10.1
 pymysql>=1.1.1
 ansible>=9.1.0; python_version >= '3.10'
 twilio

requirements/static/ci/py3.10/cloud.txt

@@ -78,7 +78,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   vcert
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -c requirements/static/ci/py3.10/linux.txt

requirements/static/ci/py3.10/darwin.txt

@@ -56,7 +56,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.10/docs.txt

@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   cryptography

requirements/static/ci/py3.10/freebsd.txt

@@ -53,7 +53,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.10/lint.txt

@@ -89,7 +89,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   vcert
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -c requirements/static/ci/py3.10/linux.txt
@@ -421,7 +421,7 @@ pycryptodomex==3.19.1
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/crypto.txt
-pygit2==1.17.0 ; python_version == "3.10"
+pygit2==1.13.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/static/ci/linux.in

requirements/static/ci/py3.10/linux.txt

@@ -62,7 +62,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -r requirements/static/ci/common.in
@@ -310,7 +310,7 @@ pycryptodomex==3.19.1
     #   -r requirements/crypto.txt
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.17.0 ; python_version == "3.10"
+pygit2==1.13.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.10/windows.txt

@@ -41,7 +41,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.17.1 ; python_version == "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.10/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.11/cloud.txt

@@ -74,7 +74,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   -c requirements/static/ci/py3.11/linux.txt

requirements/static/ci/py3.11/darwin.txt

@@ -52,7 +52,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/darwin.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.11/docs.txt

@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -c requirements/static/ci/py3.11/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   cryptography

requirements/static/ci/py3.11/freebsd.txt

@@ -51,7 +51,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.11/lint.txt

@@ -85,7 +85,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   -c requirements/static/ci/py3.11/linux.txt
@@ -396,7 +396,7 @@ pycryptodomex==3.19.1
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   -c requirements/static/ci/py3.11/linux.txt
     #   -r requirements/crypto.txt
-pygit2==1.13.1 ; python_version > "3.10"
+pygit2==1.13.1
     # via
     #   -c requirements/static/ci/py3.11/linux.txt
     #   -r requirements/static/ci/linux.in

requirements/static/ci/py3.11/linux.txt

@@ -60,7 +60,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/linux.txt
     #   -r requirements/static/ci/common.in
@@ -291,7 +291,7 @@ pycryptodomex==3.19.1
     #   -r requirements/crypto.txt
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.13.1 ; python_version > "3.10"
+pygit2==1.13.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.11/windows.txt

@@ -39,7 +39,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.11/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.12/cloud.txt

@@ -74,7 +74,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/linux.txt
     #   -c requirements/static/ci/py3.12/linux.txt

requirements/static/ci/py3.12/darwin.txt

@@ -52,7 +52,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/darwin.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.12/docs.txt

@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -c requirements/static/ci/py3.12/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   cryptography

requirements/static/ci/py3.12/freebsd.txt

@@ -51,7 +51,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.12/lint.txt

@@ -85,7 +85,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/linux.txt
     #   -c requirements/static/ci/py3.12/linux.txt
@@ -396,7 +396,7 @@ pycryptodomex==3.19.1
     #   -c requirements/static/ci/../pkg/py3.12/linux.txt
     #   -c requirements/static/ci/py3.12/linux.txt
     #   -r requirements/crypto.txt
-pygit2==1.13.1 ; python_version > "3.10"
+pygit2==1.13.1
     # via
     #   -c requirements/static/ci/py3.12/linux.txt
     #   -r requirements/static/ci/linux.in

requirements/static/ci/py3.12/linux.txt

@@ -60,7 +60,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/linux.txt
     #   -r requirements/static/ci/common.in
@@ -291,7 +291,7 @@ pycryptodomex==3.19.1
     #   -r requirements/crypto.txt
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.13.1 ; python_version > "3.10"
+pygit2==1.13.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.12/windows.txt

@@ -39,7 +39,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.14.6 ; python_version > "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.12/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.7/cloud.txt

@@ -82,7 +82,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.7/linux.txt
     #   -c requirements/static/ci/py3.7/linux.txt

requirements/static/ci/py3.7/docs.txt

@@ -13,7 +13,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -c requirements/static/ci/py3.7/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.7/linux.txt
     #   cryptography

requirements/static/ci/py3.7/freebsd.txt

@@ -57,7 +57,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.7/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.7/linux.txt

@@ -64,7 +64,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.7/linux.txt
     #   -r requirements/static/ci/common.in
@@ -344,7 +344,7 @@ pyeapi==0.8.3
     # via napalm
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.10.1 ; python_version < "3.10"
+pygit2==1.10.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.7/windows.txt

@@ -47,7 +47,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.7/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.8/cloud.txt

@@ -78,7 +78,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   -c requirements/static/ci/py3.8/linux.txt

requirements/static/ci/py3.8/docs.txt

@@ -13,7 +13,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -c requirements/static/ci/py3.8/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   cryptography

requirements/static/ci/py3.8/freebsd.txt

@@ -53,7 +53,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.8/lint.txt

@@ -85,7 +85,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   -c requirements/static/ci/py3.8/linux.txt
@@ -447,7 +447,7 @@ pyeapi==0.8.3
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   napalm
-pygit2==1.13.1 ; python_version < "3.10"
+pygit2==1.13.1
     # via
     #   -c requirements/static/ci/py3.8/linux.txt
     #   -r requirements/static/ci/linux.in

requirements/static/ci/py3.8/linux.txt

@@ -60,7 +60,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   -r requirements/static/ci/common.in
@@ -330,7 +330,7 @@ pyeapi==0.8.3
     # via napalm
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.13.1 ; python_version < "3.10"
+pygit2==1.13.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.8/windows.txt

@@ -43,7 +43,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.8/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.9/cloud.txt

@@ -78,7 +78,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -c requirements/static/ci/py3.9/linux.txt

requirements/static/ci/py3.9/darwin.txt

@@ -56,7 +56,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.9/docs.txt

@@ -13,7 +13,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -c requirements/static/ci/py3.9/linux.txt
     #   -r requirements/base.txt
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   cryptography

requirements/static/ci/py3.9/freebsd.txt

@@ -53,7 +53,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   -r requirements/static/ci/common.in

requirements/static/ci/py3.9/lint.txt

@@ -81,7 +81,7 @@ certvalidator==0.11.1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -c requirements/static/ci/py3.9/linux.txt
@@ -445,7 +445,7 @@ pyeapi==0.8.3
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   napalm
-pygit2==1.13.1 ; python_version < "3.10"
+pygit2==1.13.1
     # via
     #   -c requirements/static/ci/py3.9/linux.txt
     #   -r requirements/static/ci/linux.in

requirements/static/ci/py3.9/linux.txt

@@ -58,7 +58,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   requests
 certvalidator==0.11.1
     # via vcert
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -r requirements/static/ci/common.in
@@ -330,7 +330,7 @@ pyeapi==0.8.3
     # via napalm
 pyfakefs==5.3.1
     # via -r requirements/pytest.txt
-pygit2==1.13.1 ; python_version < "3.10"
+pygit2==1.13.1
     # via -r requirements/static/ci/linux.in
 pyiface==0.0.11
     # via -r requirements/static/ci/linux.in

requirements/static/ci/py3.9/windows.txt

@@ -43,7 +43,7 @@ certifi==2023.07.22 ; python_version < "3.10"
     #   -r requirements/base.txt
     #   kubernetes
     #   requests
-cffi==1.14.6 ; python_version < "3.10"
+cffi==1.14.6
     # via
     #   -c requirements/static/ci/../pkg/py3.9/windows.txt
     #   -r requirements/static/ci/common.in

requirements/static/pkg/py3.10/darwin.txt

@@ -10,7 +10,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.17.1
+cffi==1.14.6
     # via cryptography
 charset-normalizer==3.2.0
     # via requests

requirements/static/pkg/py3.10/freebsd.txt

@@ -8,7 +8,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.17.1
+cffi==1.14.6
     # via cryptography
 charset-normalizer==3.2.0
     # via requests

requirements/static/pkg/py3.10/linux.txt

@@ -8,7 +8,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.17.1
+cffi==1.14.6
     # via cryptography
 charset-normalizer==3.2.0
     # via requests

requirements/static/pkg/py3.10/windows.txt

@@ -8,7 +8,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.17.1
+cffi==1.14.6
     # via
     #   -r requirements/windows.txt
     #   clr-loader

tests/pytests/unit/utils/test_gitfs.py

@@ -23,7 +23,6 @@ except AttributeError:
 if HAS_PYGIT2:
     import pygit2
 
-    ## DGM
     try:
         from pygit2.enums import ObjectType
 
@@ -156,9 +155,6 @@ def _prepare_remote_repository_pygit2(tmp_path):
         tree,
         [repository.head.target],
     )
-    ## DGM repository.create_tag(
-    ## DGM     "annotated_tag", commit, pygit2.GIT_OBJ_COMMIT, signature, "some message"
-    ## DGM )
     if HAS_PYGIT2_ENUMS:
         repository.create_tag(
             "annotated_tag", commit, ObjectType.COMMIT, signature, "some message"