diff --git a/requirements/static/ci/darwin.in b/requirements/static/ci/darwin.in index d7b8f010e0ff..c8257bf0c361 100644 --- a/requirements/static/ci/darwin.in +++ b/requirements/static/ci/darwin.in @@ -3,7 +3,8 @@ # pylxd(or likely ws4py) will cause the test suite to hang at the finish line under runtests.py # pylxd>=2.2.5 yamlordereddictloader -pygit2>=1.2.0; python_version >= '3.7' +pygit2>=1.10.1; python_version >= '3.7' +pygit2>=1.13.1; python_version >= '3.8' yamllint mercurial hglib diff --git a/requirements/static/ci/freebsd.in b/requirements/static/ci/freebsd.in index 20f88c8724a7..f064146074d4 100644 --- a/requirements/static/ci/freebsd.in +++ b/requirements/static/ci/freebsd.in @@ -1,5 +1,6 @@ # FreeBSD static CI requirements -pygit2==1.8.0; python_version >= '3.7' +pygit2>=1.10.1; python_version >= '3.7' +pygit2>=1.13.1; python_version >= '3.8' yamllint mercurial hglib diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in index c05c78de1e5b..d9c19815264c 100644 --- a/requirements/static/ci/linux.in +++ b/requirements/static/ci/linux.in @@ -1,8 +1,7 @@ # Linux static CI requirements pyiface -pygit2<1.1.0; python_version <= '3.8' -pygit2>=1.4.0; python_version > '3.8' -pygit2==1.9.1; python_version >= '3.10' +pygit2>=1.10.1; python_version >= '3.7' +pygit2>=1.13.1; python_version >= '3.8' pymysql==0.9.3; python_version <= '3.5' pymysql>=1.0.2; python_version > '3.5' ansible>=4.4.0; python_version < '3.9' diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 84d153a310b5..5df1ad324841 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -664,7 +664,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/darwin.in pyjwt==2.4.0 # via adal diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index e4ac6666cad7..dacf22dd0daf 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -662,7 +662,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -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 dae283998723..34141dbf9c92 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -657,7 +657,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.10" +pygit2==1.13.1 ; python_version >= "3.8" # 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/linux.txt b/requirements/static/ci/py3.10/linux.txt index 35207680b2fc..fcbeb0c0b735 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -675,7 +675,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.9.8 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.10" +pygit2==1.13.1 ; python_version >= "3.8" # 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 218a65c8ec77..485e68842c5f 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -232,7 +232,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/windows.in pymssql==2.2.7 # via -r requirements/windows.txt diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 9842a5c61e89..6e38eecb0357 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -346,6 +346,8 @@ botocore==1.24.46 # boto3 # moto # s3transfer +cached-property==1.5.2 + # via pygit2 cachetools==3.1.0 # via google-auth cassandra-driver==3.24.0 @@ -698,7 +700,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.10.1 ; python_version >= "3.7" # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 9d08fbbd9fd3..1a2c64ff895c 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -351,6 +351,8 @@ botocore==1.24.46 # boto3 # moto # s3transfer +cached-property==1.5.2 + # via pygit2 cachetools==4.2.2 # via # google-auth @@ -700,7 +702,7 @@ pycryptodomex==3.10.1 # via -r requirements/crypto.txt pyeapi==0.8.4 # via napalm -pygit2==1.0.3 ; python_version <= "3.8" +pygit2==1.10.1 ; python_version >= "3.7" # 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/linux.txt b/requirements/static/ci/py3.7/linux.txt index 1712ddc501b2..b57e7005fc0b 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -357,6 +357,8 @@ botocore==1.24.46 # boto3 # moto # s3transfer +cached-property==1.5.2 + # via pygit2 cachetools==4.2.2 # via # google-auth @@ -711,7 +713,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.0.3 ; python_version <= "3.8" +pygit2==1.10.1 ; python_version >= "3.7" # 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 427ffbccb612..1c596105e304 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -245,7 +245,7 @@ pycparser==2.21 # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.10.1 ; python_version >= "3.7" # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 72fed05bd52d..c278b84b880f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -688,7 +688,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -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 a4c9f88df2cd..e9d07d4cd63e 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -691,7 +691,7 @@ pycryptodomex==3.10.1 # via -r requirements/crypto.txt pyeapi==0.8.4 # via napalm -pygit2==1.0.3 ; python_version <= "3.8" +pygit2==1.13.1 ; python_version >= "3.8" # 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/linux.txt b/requirements/static/ci/py3.8/linux.txt index 813e472060b2..822a74ee7115 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -701,7 +701,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.0.3 ; python_version <= "3.8" +pygit2==1.13.1 ; python_version >= "3.8" # 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 a569f4cc57e2..ce6f3cfec3c4 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -233,7 +233,7 @@ pycparser==2.21 # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index b7919e3ad5d8..a2b96a312da7 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -693,7 +693,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/darwin.in pyjwt==2.4.0 # via adal diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index fa800ba551a7..b0f8c9ecaba7 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -691,7 +691,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.8.0 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/freebsd.in pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd" # via -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 28cce1cc6523..90b83f3bcd6c 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -692,7 +692,7 @@ pycryptodomex==3.10.1 # via -r requirements/crypto.txt pyeapi==0.8.4 # via napalm -pygit2==1.6.1 ; python_version > "3.8" +pygit2==1.13.1 ; python_version >= "3.8" # 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/linux.txt b/requirements/static/ci/py3.9/linux.txt index 2b12495b674d..5c7475c6538b 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -355,8 +355,6 @@ botocore==1.24.46 # boto3 # moto # s3transfer -cached-property==1.5.2 - # via pygit2 cachetools==4.2.2 # via # google-auth @@ -706,7 +704,7 @@ pycryptodomex==3.9.8 # via -r requirements/crypto.txt pyeapi==0.8.3 # via napalm -pygit2==1.5.0 ; python_version > "3.8" +pygit2==1.13.1 ; python_version >= "3.8" # 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 ca747c4bd01d..d5417dc7c738 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -234,7 +234,7 @@ pycparser==2.21 ; python_version >= "3.9" # cffi pycryptodomex==3.10.1 # via -r requirements/crypto.txt -pygit2==1.9.1 ; python_version >= "3.7" +pygit2==1.13.1 ; python_version >= "3.8" # via -r requirements/static/ci/windows.in pymssql==2.2.1 # via -r requirements/windows.txt diff --git a/requirements/static/ci/windows.in b/requirements/static/ci/windows.in index b2b7857de46a..45647fcdee7f 100644 --- a/requirements/static/ci/windows.in +++ b/requirements/static/ci/windows.in @@ -1,7 +1,8 @@ # This is a compilation of requirements installed on salt-jenkins git.salt state run dmidecode patch -pygit2>=1.2.0; python_version >= '3.7' +pygit2>=1.10.1; python_version >= '3.7' +pygit2>=1.13.1; python_version >= '3.8' sed pywinrm>=0.4.1 yamllint