Skip to content

Commit 3800ad9

Browse files
dmurphy18dmurphy18
committed
Restore requirements after testing with pygit2 v1.17.0 successfully
1 parent ed8da92 commit 3800ad9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+56
-69
lines changed

Diff for: ‎requirements/static/ci/common.in

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ apache-libcloud>=1.5.0; sys_platform != 'win32'
77
boto3>=1.17.67
88
boto>=2.46.0
99
cassandra-driver>=2.0
10-
11-
# DGM cffi>=1.14.6
12-
cffi>=1.14.6; python_version < '3.10'
13-
cffi>=1.17.1; python_version == '3.10'
14-
cffi>=1.14.6; python_version > '3.10'
15-
10+
cffi>=1.14.6
1611
cherrypy>=17.4.1
1712
clustershell
1813
dnspython

Diff for: ‎requirements/static/ci/linux.in

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
--constraint=../pkg/py{py_version}/{platform}.txt
33

44
pyiface
5-
# DGM pygit2>=1.10.1
6-
pygit2>=1.10.1; python_version < '3.10'
7-
pygit2>=1.17.0; python_version == '3.10'
8-
pygit2>=1.10.1; python_version > '3.10'
9-
5+
pygit2>=1.10.1
106
pymysql>=1.1.1
117
ansible>=9.1.0; python_version >= '3.10'
128
twilio

Diff for: ‎requirements/static/ci/py3.10/cloud.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ certvalidator==0.11.1
7878
# via
7979
# -c requirements/static/ci/py3.10/linux.txt
8080
# vcert
81-
cffi==1.17.1 ; python_version == "3.10"
81+
cffi==1.14.6
8282
# via
8383
# -c requirements/static/ci/../pkg/py3.10/linux.txt
8484
# -c requirements/static/ci/py3.10/linux.txt

Diff for: ‎requirements/static/ci/py3.10/darwin.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5656
# requests
5757
certvalidator==0.11.1
5858
# via vcert
59-
cffi==1.17.1 ; python_version == "3.10"
59+
cffi==1.14.6
6060
# via
6161
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
6262
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.10/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
1313
# -c requirements/static/ci/py3.10/linux.txt
1414
# -r requirements/base.txt
1515
# requests
16-
cffi==1.17.1 ; python_version == "3.10"
16+
cffi==1.14.6
1717
# via
1818
# -c requirements/static/ci/py3.10/linux.txt
1919
# cryptography

Diff for: ‎requirements/static/ci/py3.10/freebsd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5353
# requests
5454
certvalidator==0.11.1
5555
# via vcert
56-
cffi==1.17.1 ; python_version == "3.10"
56+
cffi==1.14.6
5757
# via
5858
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
5959
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.10/lint.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ certvalidator==0.11.1
8989
# via
9090
# -c requirements/static/ci/py3.10/linux.txt
9191
# vcert
92-
cffi==1.17.1 ; python_version == "3.10"
92+
cffi==1.14.6
9393
# via
9494
# -c requirements/static/ci/../pkg/py3.10/linux.txt
9595
# -c requirements/static/ci/py3.10/linux.txt
@@ -421,7 +421,7 @@ pycryptodomex==3.19.1
421421
# -c requirements/static/ci/../pkg/py3.10/linux.txt
422422
# -c requirements/static/ci/py3.10/linux.txt
423423
# -r requirements/crypto.txt
424-
pygit2==1.17.0 ; python_version == "3.10"
424+
pygit2==1.13.1
425425
# via
426426
# -c requirements/static/ci/py3.10/linux.txt
427427
# -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.10/linux.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
6262
# requests
6363
certvalidator==0.11.1
6464
# via vcert
65-
cffi==1.17.1 ; python_version == "3.10"
65+
cffi==1.14.6
6666
# via
6767
# -c requirements/static/ci/../pkg/py3.10/linux.txt
6868
# -r requirements/static/ci/common.in
@@ -310,7 +310,7 @@ pycryptodomex==3.19.1
310310
# -r requirements/crypto.txt
311311
pyfakefs==5.3.1
312312
# via -r requirements/pytest.txt
313-
pygit2==1.17.0 ; python_version == "3.10"
313+
pygit2==1.13.1
314314
# via -r requirements/static/ci/linux.in
315315
pyiface==0.0.11
316316
# via -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.10/windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
4141
# -r requirements/base.txt
4242
# kubernetes
4343
# requests
44-
cffi==1.17.1 ; python_version == "3.10"
44+
cffi==1.14.6
4545
# via
4646
# -c requirements/static/ci/../pkg/py3.10/windows.txt
4747
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.11/cloud.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ certvalidator==0.11.1
7474
# via
7575
# -c requirements/static/ci/py3.11/linux.txt
7676
# vcert
77-
cffi==1.14.6 ; python_version > "3.10"
77+
cffi==1.14.6
7878
# via
7979
# -c requirements/static/ci/../pkg/py3.11/linux.txt
8080
# -c requirements/static/ci/py3.11/linux.txt

Diff for: ‎requirements/static/ci/py3.11/darwin.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5252
# requests
5353
certvalidator==0.11.1
5454
# via vcert
55-
cffi==1.14.6 ; python_version > "3.10"
55+
cffi==1.14.6
5656
# via
5757
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
5858
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.11/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
1313
# -c requirements/static/ci/py3.11/linux.txt
1414
# -r requirements/base.txt
1515
# requests
16-
cffi==1.14.6 ; python_version > "3.10"
16+
cffi==1.14.6
1717
# via
1818
# -c requirements/static/ci/py3.11/linux.txt
1919
# cryptography

Diff for: ‎requirements/static/ci/py3.11/freebsd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5151
# requests
5252
certvalidator==0.11.1
5353
# via vcert
54-
cffi==1.14.6 ; python_version > "3.10"
54+
cffi==1.14.6
5555
# via
5656
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
5757
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.11/lint.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ certvalidator==0.11.1
8585
# via
8686
# -c requirements/static/ci/py3.11/linux.txt
8787
# vcert
88-
cffi==1.14.6 ; python_version > "3.10"
88+
cffi==1.14.6
8989
# via
9090
# -c requirements/static/ci/../pkg/py3.11/linux.txt
9191
# -c requirements/static/ci/py3.11/linux.txt
@@ -396,7 +396,7 @@ pycryptodomex==3.19.1
396396
# -c requirements/static/ci/../pkg/py3.11/linux.txt
397397
# -c requirements/static/ci/py3.11/linux.txt
398398
# -r requirements/crypto.txt
399-
pygit2==1.13.1 ; python_version > "3.10"
399+
pygit2==1.13.1
400400
# via
401401
# -c requirements/static/ci/py3.11/linux.txt
402402
# -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.11/linux.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
6060
# requests
6161
certvalidator==0.11.1
6262
# via vcert
63-
cffi==1.14.6 ; python_version > "3.10"
63+
cffi==1.14.6
6464
# via
6565
# -c requirements/static/ci/../pkg/py3.11/linux.txt
6666
# -r requirements/static/ci/common.in
@@ -291,7 +291,7 @@ pycryptodomex==3.19.1
291291
# -r requirements/crypto.txt
292292
pyfakefs==5.3.1
293293
# via -r requirements/pytest.txt
294-
pygit2==1.13.1 ; python_version > "3.10"
294+
pygit2==1.13.1
295295
# via -r requirements/static/ci/linux.in
296296
pyiface==0.0.11
297297
# via -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.11/windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
3939
# -r requirements/base.txt
4040
# kubernetes
4141
# requests
42-
cffi==1.14.6 ; python_version > "3.10"
42+
cffi==1.14.6
4343
# via
4444
# -c requirements/static/ci/../pkg/py3.11/windows.txt
4545
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.12/cloud.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ certvalidator==0.11.1
7474
# via
7575
# -c requirements/static/ci/py3.12/linux.txt
7676
# vcert
77-
cffi==1.14.6 ; python_version > "3.10"
77+
cffi==1.14.6
7878
# via
7979
# -c requirements/static/ci/../pkg/py3.12/linux.txt
8080
# -c requirements/static/ci/py3.12/linux.txt

Diff for: ‎requirements/static/ci/py3.12/darwin.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5252
# requests
5353
certvalidator==0.11.1
5454
# via vcert
55-
cffi==1.14.6 ; python_version > "3.10"
55+
cffi==1.14.6
5656
# via
5757
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
5858
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.12/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
1313
# -c requirements/static/ci/py3.12/linux.txt
1414
# -r requirements/base.txt
1515
# requests
16-
cffi==1.14.6 ; python_version > "3.10"
16+
cffi==1.14.6
1717
# via
1818
# -c requirements/static/ci/py3.12/linux.txt
1919
# cryptography

Diff for: ‎requirements/static/ci/py3.12/freebsd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
5151
# requests
5252
certvalidator==0.11.1
5353
# via vcert
54-
cffi==1.14.6 ; python_version > "3.10"
54+
cffi==1.14.6
5555
# via
5656
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
5757
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.12/lint.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ certvalidator==0.11.1
8585
# via
8686
# -c requirements/static/ci/py3.12/linux.txt
8787
# vcert
88-
cffi==1.14.6 ; python_version > "3.10"
88+
cffi==1.14.6
8989
# via
9090
# -c requirements/static/ci/../pkg/py3.12/linux.txt
9191
# -c requirements/static/ci/py3.12/linux.txt
@@ -396,7 +396,7 @@ pycryptodomex==3.19.1
396396
# -c requirements/static/ci/../pkg/py3.12/linux.txt
397397
# -c requirements/static/ci/py3.12/linux.txt
398398
# -r requirements/crypto.txt
399-
pygit2==1.13.1 ; python_version > "3.10"
399+
pygit2==1.13.1
400400
# via
401401
# -c requirements/static/ci/py3.12/linux.txt
402402
# -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.12/linux.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
6060
# requests
6161
certvalidator==0.11.1
6262
# via vcert
63-
cffi==1.14.6 ; python_version > "3.10"
63+
cffi==1.14.6
6464
# via
6565
# -c requirements/static/ci/../pkg/py3.12/linux.txt
6666
# -r requirements/static/ci/common.in
@@ -291,7 +291,7 @@ pycryptodomex==3.19.1
291291
# -r requirements/crypto.txt
292292
pyfakefs==5.3.1
293293
# via -r requirements/pytest.txt
294-
pygit2==1.13.1 ; python_version > "3.10"
294+
pygit2==1.13.1
295295
# via -r requirements/static/ci/linux.in
296296
pyiface==0.0.11
297297
# via -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.12/windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ certifi==2024.7.4 ; python_version >= "3.10"
3939
# -r requirements/base.txt
4040
# kubernetes
4141
# requests
42-
cffi==1.14.6 ; python_version > "3.10"
42+
cffi==1.14.6
4343
# via
4444
# -c requirements/static/ci/../pkg/py3.12/windows.txt
4545
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.7/cloud.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ certvalidator==0.11.1
8282
# via
8383
# -c requirements/static/ci/py3.7/linux.txt
8484
# vcert
85-
cffi==1.14.6 ; python_version < "3.10"
85+
cffi==1.14.6
8686
# via
8787
# -c requirements/static/ci/../pkg/py3.7/linux.txt
8888
# -c requirements/static/ci/py3.7/linux.txt

Diff for: ‎requirements/static/ci/py3.7/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ certifi==2023.07.22 ; python_version < "3.10"
1313
# -c requirements/static/ci/py3.7/linux.txt
1414
# -r requirements/base.txt
1515
# requests
16-
cffi==1.14.6 ; python_version < "3.10"
16+
cffi==1.14.6
1717
# via
1818
# -c requirements/static/ci/py3.7/linux.txt
1919
# cryptography

Diff for: ‎requirements/static/ci/py3.7/freebsd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ certifi==2023.07.22 ; python_version < "3.10"
5757
# requests
5858
certvalidator==0.11.1
5959
# via vcert
60-
cffi==1.14.6 ; python_version < "3.10"
60+
cffi==1.14.6
6161
# via
6262
# -c requirements/static/ci/../pkg/py3.7/freebsd.txt
6363
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.7/linux.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ certifi==2023.07.22 ; python_version < "3.10"
6464
# requests
6565
certvalidator==0.11.1
6666
# via vcert
67-
cffi==1.14.6 ; python_version < "3.10"
67+
cffi==1.14.6
6868
# via
6969
# -c requirements/static/ci/../pkg/py3.7/linux.txt
7070
# -r requirements/static/ci/common.in
@@ -344,7 +344,7 @@ pyeapi==0.8.3
344344
# via napalm
345345
pyfakefs==5.3.1
346346
# via -r requirements/pytest.txt
347-
pygit2==1.10.1 ; python_version < "3.10"
347+
pygit2==1.10.1
348348
# via -r requirements/static/ci/linux.in
349349
pyiface==0.0.11
350350
# via -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.7/windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ certifi==2023.07.22 ; python_version < "3.10"
4747
# -r requirements/base.txt
4848
# kubernetes
4949
# requests
50-
cffi==1.14.6 ; python_version < "3.10"
50+
cffi==1.14.6
5151
# via
5252
# -c requirements/static/ci/../pkg/py3.7/windows.txt
5353
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.8/cloud.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ certvalidator==0.11.1
7878
# via
7979
# -c requirements/static/ci/py3.8/linux.txt
8080
# vcert
81-
cffi==1.14.6 ; python_version < "3.10"
81+
cffi==1.14.6
8282
# via
8383
# -c requirements/static/ci/../pkg/py3.8/linux.txt
8484
# -c requirements/static/ci/py3.8/linux.txt

Diff for: ‎requirements/static/ci/py3.8/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ certifi==2023.07.22 ; python_version < "3.10"
1313
# -c requirements/static/ci/py3.8/linux.txt
1414
# -r requirements/base.txt
1515
# requests
16-
cffi==1.14.6 ; python_version < "3.10"
16+
cffi==1.14.6
1717
# via
1818
# -c requirements/static/ci/py3.8/linux.txt
1919
# cryptography

Diff for: ‎requirements/static/ci/py3.8/freebsd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ certifi==2023.07.22 ; python_version < "3.10"
5353
# requests
5454
certvalidator==0.11.1
5555
# via vcert
56-
cffi==1.14.6 ; python_version < "3.10"
56+
cffi==1.14.6
5757
# via
5858
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
5959
# -r requirements/static/ci/common.in

Diff for: ‎requirements/static/ci/py3.8/lint.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ certvalidator==0.11.1
8585
# via
8686
# -c requirements/static/ci/py3.8/linux.txt
8787
# vcert
88-
cffi==1.14.6 ; python_version < "3.10"
88+
cffi==1.14.6
8989
# via
9090
# -c requirements/static/ci/../pkg/py3.8/linux.txt
9191
# -c requirements/static/ci/py3.8/linux.txt
@@ -447,7 +447,7 @@ pyeapi==0.8.3
447447
# via
448448
# -c requirements/static/ci/py3.8/linux.txt
449449
# napalm
450-
pygit2==1.13.1 ; python_version < "3.10"
450+
pygit2==1.13.1
451451
# via
452452
# -c requirements/static/ci/py3.8/linux.txt
453453
# -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.8/linux.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ certifi==2023.07.22 ; python_version < "3.10"
6060
# requests
6161
certvalidator==0.11.1
6262
# via vcert
63-
cffi==1.14.6 ; python_version < "3.10"
63+
cffi==1.14.6
6464
# via
6565
# -c requirements/static/ci/../pkg/py3.8/linux.txt
6666
# -r requirements/static/ci/common.in
@@ -330,7 +330,7 @@ pyeapi==0.8.3
330330
# via napalm
331331
pyfakefs==5.3.1
332332
# via -r requirements/pytest.txt
333-
pygit2==1.13.1 ; python_version < "3.10"
333+
pygit2==1.13.1
334334
# via -r requirements/static/ci/linux.in
335335
pyiface==0.0.11
336336
# via -r requirements/static/ci/linux.in

Diff for: ‎requirements/static/ci/py3.8/windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ certifi==2023.07.22 ; python_version < "3.10"
4343
# -r requirements/base.txt
4444
# kubernetes
4545
# requests
46-
cffi==1.14.6 ; python_version < "3.10"
46+
cffi==1.14.6
4747
# via
4848
# -c requirements/static/ci/../pkg/py3.8/windows.txt
4949
# -r requirements/static/ci/common.in

0 commit comments

Comments
 (0)