Skip to content

Commit cc68cd1

Browse files
kimadelinekarthiknadig
authored andcommitted
CI failures: Pin prospector to 1.6.0, pytest to < 7.0.0, and fix linting issues with flake8 3.9.2 (#18446)
* See if pinning pip works * Pin in pr check * Pin pip everywhere else * angery * Undo pip changes * Pin pytest < 7.0.0 * Fix linting?
1 parent fca6fe3 commit cc68cd1

File tree

2 files changed

+26
-27
lines changed

2 files changed

+26
-27
lines changed

build/test-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ yapf
88
pylint ; python_version > '2.7'
99
pycodestyle
1010
pydocstyle
11-
prospector ; python_version > '2.7'
12-
pytest ; python_version > '2.7'
11+
prospector>=1.6.0 ; python_version > '2.7'
12+
pytest<7.0.0 ; python_version > '2.7'
1313
flask
1414
fastapi ; python_version > '2.7'
1515
uvicorn ; python_version > '2.7'

src/test/pythonFiles/linting/flake8config/file.py

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
__revision__ = None
44

5+
56
class Foo(object):
67
"""block-disable test"""
78

@@ -10,78 +11,76 @@ def __init__(self):
1011

1112
def meth1(self, arg):
1213
"""this issues a message"""
13-
print self
14+
print(self)
1415

1516
def meth2(self, arg):
1617
"""and this one not"""
1718
# pylint: disable=unused-argument
18-
print self\
19-
+ "foo"
19+
print(self + "foo")
2020

2121
def meth3(self):
2222
"""test one line disabling"""
2323
# no error
24-
print self.bla # pylint: disable=no-member
24+
print(self.bla) # pylint: disable=no-member
2525
# error
26-
print self.blop
26+
print(self.blop)
2727

2828
def meth4(self):
2929
"""test re-enabling"""
3030
# pylint: disable=no-member
3131
# no error
32-
print self.bla
33-
print self.blop
32+
print(self.bla)
33+
print(self.blop)
3434
# pylint: enable=no-member
3535
# error
36-
print self.blip
36+
print(self.blip)
3737

3838
def meth5(self):
3939
"""test IF sub-block re-enabling"""
4040
# pylint: disable=no-member
4141
# no error
42-
print self.bla
42+
print(self.bla)
4343
if self.blop:
4444
# pylint: enable=no-member
4545
# error
46-
print self.blip
46+
print(self.blip)
4747
else:
4848
# no error
49-
print self.blip
49+
print(self.blip)
5050
# no error
51-
print self.blip
51+
print(self.blip)
5252

5353
def meth6(self):
5454
"""test TRY/EXCEPT sub-block re-enabling"""
5555
# pylint: disable=no-member
5656
# no error
57-
print self.bla
57+
print(self.bla)
5858
try:
5959
# pylint: enable=no-member
6060
# error
61-
print self.blip
62-
except UndefinedName: # pylint: disable=undefined-variable
61+
print(self.blip)
62+
except UndefinedName: # pylint: disable=undefined-variable
6363
# no error
64-
print self.blip
64+
print(self.blip)
6565
# no error
66-
print self.blip
66+
print(self.blip)
6767

6868
def meth7(self):
6969
"""test one line block opening disabling"""
70-
if self.blop: # pylint: disable=no-member
70+
if self.blop: # pylint: disable=no-member
7171
# error
72-
print self.blip
72+
print(self.blip)
7373
else:
7474
# error
75-
print self.blip
75+
print(self.blip)
7676
# error
77-
print self.blip
78-
77+
print(self.blip)
7978

8079
def meth8(self):
8180
"""test late disabling"""
8281
# error
83-
print self.blip
82+
print(self.blip)
8483
# pylint: disable=no-member
8584
# no error
86-
print self.bla
87-
print self.blop
85+
print(self.bla)
86+
print(self.blop)

0 commit comments

Comments
 (0)