diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 50460ad12b1..7611baf7373 100644 --- a/requirements/static/ci/common.in +++ b/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 diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in index e8a1c8acf5b..c52c53dc58b 100644 --- a/requirements/static/ci/linux.in +++ b/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 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index ecd64387fa3..d40e35e3fea 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 444b1daaa7e..4a24aabb2a4 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 7cca6c22ec9..26970270a34 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 115f133ca88..1a8587f2655 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index a0c31b56083..041231763c9 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 59e572d78ae..8a573d009a4 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index eb680518e4e..3c271b0cd41 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index dee24f3dd17..460da41efc8 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 905b54a4d1d..376053f2348 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 935f9fd430d..4d78150e436 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 61d7c18fe93..f2822d4a2ad 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index aff1e8daa99..525ba97b080 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4d7b61aeb6d..9887856537c 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 120681bf244..9fee82fa466 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 198da286962..efbaf7aca33 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 61ef459809d..b3f19156670 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 277f1d74ced..3c536f15de8 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index b8ad9130e7b..74142860bb0 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 468155ba8ae..b796d01ed4c 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 0a241bf4179..c21d0cac0dd 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 3262f437bc8..5affc00a7f0 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/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 diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 84f1c8e068c..9280c610e40 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 50399dab55d..b0ac8d78ed8 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 6afd500e230..394bc0b38b3 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 6152833eed7..53e6a0598ad 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index e966dc7684f..3be85a5d491 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 22226fdcd49..9f18c56bb16 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 633b8665bdb..7f440e0dc0f 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index f0bb1851cdb..e42ad37bd0f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 5b73b5821fa..7b6ffbbfde6 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 715ca752470..6a9dcd361f7 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index a08be5a229f..f38be0bcc27 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index c1a2cb90050..b24fdf78b10 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 21b60e304b0..66bddbb9630 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index ca5db17ae5e..9b9f3136276 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 800443925bc..c7a81642b26 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 13fb7c14e92..d23f65943db 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index ffc95f40d60..fd5f770ef99 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 54ccfae7f15..5c9bd25c8ef 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/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 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index a89fca6beb4..ccb85c35ee2 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/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 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 34e3bea1b8d..332e944ecf5 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/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 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 07703493d85..4708e14af5d 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/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 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index b9b239dbaef..ee99032daec 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/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 diff --git a/tests/pytests/unit/utils/test_gitfs.py b/tests/pytests/unit/utils/test_gitfs.py index 78636d472d8..03e4398dd98 100644 --- a/tests/pytests/unit/utils/test_gitfs.py +++ b/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"