Skip to content

Commit b54df1a

Browse files
dwozdwoz
authored
Merge pull request #68283 from dwoz/py311lintfix
Fix lint requirements for 3.11
2 parents bc76330 + 15b9b3d commit b54df1a

Some content is hidden

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

47 files changed

+236
-98
lines changed

‎requirements/base.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ urllib3>=2.5.0; python_version >= '3.10'
2727

2828
jaraco.text>=4.0.0
2929
jaraco.functools>=4.1.0
30+
timelib>=0.2.5; python_version < '3.11'
31+
timelib>=0.3.0; python_version >= '3.11'
32+
frozenlist>=1.3.0; python_version < '3.11'
33+
frozenlist>=1.5.0; python_version >= '3.11'

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,11 @@ flaky==3.8.1
188188
# via
189189
# -c requirements/static/ci/py3.10/linux.txt
190190
# -r requirements/pytest.txt
191-
frozenlist==1.3.0
191+
frozenlist==1.7.0 ; python_version < "3.11"
192192
# via
193+
# -c requirements/static/ci/../pkg/py3.10/linux.txt
193194
# -c requirements/static/ci/py3.10/linux.txt
195+
# -r requirements/base.txt
194196
# aiohttp
195197
# aiosignal
196198
future==1.0.0
@@ -693,11 +695,11 @@ textfsm==1.1.3
693695
# via
694696
# -c requirements/static/ci/py3.10/linux.txt
695697
# -r requirements/static/ci/common.in
696-
timelib==0.2.5
698+
timelib==0.3.0 ; python_version < "3.11"
697699
# via
698700
# -c requirements/static/ci/../pkg/py3.10/linux.txt
699701
# -c requirements/static/ci/py3.10/linux.txt
700-
# -r requirements/static/pkg/linux.in
702+
# -r requirements/base.txt
701703
toml==0.10.2
702704
# via
703705
# -c requirements/static/ci/py3.10/linux.txt

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ filelock==3.0.12
133133
# via virtualenv
134134
flaky==3.8.1
135135
# via -r requirements/pytest.txt
136-
frozenlist==1.3.0
136+
frozenlist==1.7.0 ; python_version < "3.11"
137137
# via
138+
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
139+
# -r requirements/base.txt
138140
# aiohttp
139141
# aiosignal
140142
future==1.0.0
@@ -488,9 +490,10 @@ tempora==4.1.1
488490
# portend
489491
textfsm==1.1.3
490492
# via -r requirements/static/ci/common.in
491-
timelib==0.2.5
493+
timelib==0.2.5 ; python_version < "3.11"
492494
# via
493495
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
496+
# -r requirements/base.txt
494497
# -r requirements/darwin.txt
495498
toml==0.10.2
496499
# via -r requirements/static/ci/common.in

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ distro==1.5.0
5555
# -r requirements/base.txt
5656
docutils==0.19
5757
# via sphinx
58+
frozenlist==1.7.0 ; python_version < "3.11"
59+
# via
60+
# -c requirements/static/ci/py3.10/linux.txt
61+
# -r requirements/base.txt
5862
idna==3.7
5963
# via
6064
# -c requirements/static/ci/py3.10/linux.txt
@@ -215,6 +219,10 @@ tempora==4.1.1
215219
# via
216220
# -c requirements/static/ci/py3.10/linux.txt
217221
# portend
222+
timelib==0.3.0 ; python_version < "3.11"
223+
# via
224+
# -c requirements/static/ci/py3.10/linux.txt
225+
# -r requirements/base.txt
218226
typing-extensions==4.8.0
219227
# via
220228
# -c requirements/static/ci/py3.10/linux.txt

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@ filelock==3.0.12
132132
# via virtualenv
133133
flaky==3.8.1
134134
# via -r requirements/pytest.txt
135-
frozenlist==1.3.0
135+
frozenlist==1.7.0 ; python_version < "3.11"
136136
# via
137+
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
138+
# -r requirements/base.txt
137139
# aiohttp
138140
# aiosignal
139141
future==1.0.0
@@ -478,10 +480,10 @@ tempora==4.1.1
478480
# portend
479481
textfsm==1.1.3
480482
# via -r requirements/static/ci/common.in
481-
timelib==0.2.5
483+
timelib==0.2.5 ; python_version < "3.11"
482484
# via
483485
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
484-
# -r requirements/static/pkg/freebsd.in
486+
# -r requirements/base.txt
485487
toml==0.10.2
486488
# via -r requirements/static/ci/common.in
487489
tomli==2.0.1

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,11 @@ filelock==3.0.12
190190
# via
191191
# -c requirements/static/ci/py3.10/linux.txt
192192
# virtualenv
193-
frozenlist==1.3.0
193+
frozenlist==1.7.0 ; python_version < "3.11"
194194
# via
195+
# -c requirements/static/ci/../pkg/py3.10/linux.txt
195196
# -c requirements/static/ci/py3.10/linux.txt
197+
# -r requirements/base.txt
196198
# aiohttp
197199
# aiosignal
198200
future==1.0.0
@@ -669,11 +671,11 @@ textfsm==1.1.3
669671
# via
670672
# -c requirements/static/ci/py3.10/linux.txt
671673
# -r requirements/static/ci/common.in
672-
timelib==0.2.5
674+
timelib==0.3.0 ; python_version < "3.11"
673675
# via
674676
# -c requirements/static/ci/../pkg/py3.10/linux.txt
675677
# -c requirements/static/ci/py3.10/linux.txt
676-
# -r requirements/static/pkg/linux.in
678+
# -r requirements/base.txt
677679
toml==0.10.2
678680
# via
679681
# -c requirements/static/ci/py3.10/linux.txt

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,10 @@ filelock==3.0.12
141141
# via virtualenv
142142
flaky==3.8.1
143143
# via -r requirements/pytest.txt
144-
frozenlist==1.3.0
144+
frozenlist==1.7.0 ; python_version < "3.11"
145145
# via
146+
# -c requirements/static/ci/../pkg/py3.10/linux.txt
147+
# -r requirements/base.txt
146148
# aiohttp
147149
# aiosignal
148150
future==1.0.0
@@ -521,10 +523,10 @@ tempora==4.1.1
521523
# portend
522524
textfsm==1.1.3
523525
# via -r requirements/static/ci/common.in
524-
timelib==0.2.5
526+
timelib==0.3.0 ; python_version < "3.11"
525527
# via
526528
# -c requirements/static/ci/../pkg/py3.10/linux.txt
527-
# -r requirements/static/pkg/linux.in
529+
# -r requirements/base.txt
528530
toml==0.10.2
529531
# via -r requirements/static/ci/common.in
530532
tomli==2.0.1

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ filelock==3.8.0
123123
# via virtualenv
124124
flaky==3.8.1
125125
# via -r requirements/pytest.txt
126-
frozenlist==1.3.3
126+
frozenlist==1.7.0 ; python_version < "3.11"
127127
# via
128+
# -c requirements/static/ci/../pkg/py3.10/windows.txt
129+
# -r requirements/base.txt
128130
# aiohttp
129131
# aiosignal
130132
future==1.0.0
@@ -464,9 +466,10 @@ tempora==4.1.1
464466
# portend
465467
textfsm==1.1.3
466468
# via -r requirements/static/ci/common.in
467-
timelib==0.2.5
469+
timelib==0.2.5 ; python_version < "3.11"
468470
# via
469471
# -c requirements/static/ci/../pkg/py3.10/windows.txt
472+
# -r requirements/base.txt
470473
# -r requirements/windows.txt
471474
toml==0.10.2
472475
# via -r requirements/static/ci/common.in

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,11 @@ flaky==3.8.1
180180
# via
181181
# -c requirements/static/ci/py3.11/linux.txt
182182
# -r requirements/pytest.txt
183-
frozenlist==1.3.0
183+
frozenlist==1.7.0 ; python_version >= "3.11"
184184
# via
185+
# -c requirements/static/ci/../pkg/py3.11/linux.txt
185186
# -c requirements/static/ci/py3.11/linux.txt
187+
# -r requirements/base.txt
186188
# aiohttp
187189
# aiosignal
188190
future==1.0.0
@@ -648,11 +650,11 @@ textfsm==1.1.3
648650
# via
649651
# -c requirements/static/ci/py3.11/linux.txt
650652
# -r requirements/static/ci/common.in
651-
timelib==0.2.5
653+
timelib==0.3.0 ; python_version >= "3.11"
652654
# via
653655
# -c requirements/static/ci/../pkg/py3.11/linux.txt
654656
# -c requirements/static/ci/py3.11/linux.txt
655-
# -r requirements/static/pkg/linux.in
657+
# -r requirements/base.txt
656658
toml==0.10.2
657659
# via
658660
# -c requirements/static/ci/py3.11/linux.txt

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ filelock==3.0.12
126126
# via virtualenv
127127
flaky==3.8.1
128128
# via -r requirements/pytest.txt
129-
frozenlist==1.3.0
129+
frozenlist==1.7.0 ; python_version >= "3.11"
130130
# via
131+
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
132+
# -r requirements/base.txt
131133
# aiohttp
132134
# aiosignal
133135
future==1.0.0
@@ -453,9 +455,10 @@ tempora==4.1.1
453455
# portend
454456
textfsm==1.1.3
455457
# via -r requirements/static/ci/common.in
456-
timelib==0.2.5
458+
timelib==0.3.0 ; python_version >= "3.11"
457459
# via
458460
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
461+
# -r requirements/base.txt
459462
# -r requirements/darwin.txt
460463
toml==0.10.2
461464
# via -r requirements/static/ci/common.in

0 commit comments

Comments
 (0)