Skip to content

Commit 75268a8

Browse files
authored
Merge branch 'master' into bugfixs/19671
2 parents 2e27f22 + abc4ef9 commit 75268a8

Some content is hidden

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

74 files changed

+2554
-2146
lines changed

.pep8speaks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ scanner:
66
pycodestyle:
77
max-line-length: 79
88
ignore: # Errors and warnings to ignore
9-
- E731
10-
- E402
9+
- E402, # module level import not at top of file
10+
- E731, # do not assign a lambda expression, use a def
11+
- E741, # do not use variables named 'l', 'O', or 'I'
12+
- W503 # line break before binary operator

asv_bench/benchmarks/io/excel.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ def setup(self, engine):
2525
self.writer_read.save()
2626
self.bio_read.seek(0)
2727

28-
self.bio_write = BytesIO()
29-
self.bio_write.seek(0)
30-
self.writer_write = ExcelWriter(self.bio_write, engine=engine)
31-
3228
def time_read_excel(self, engine):
3329
read_excel(self.bio_read)
3430

3531
def time_write_excel(self, engine):
36-
self.df.to_excel(self.writer_write, sheet_name='Sheet1')
37-
self.writer_write.save()
32+
bio_write = BytesIO()
33+
bio_write.seek(0)
34+
writer_write = ExcelWriter(bio_write, engine=engine)
35+
self.df.to_excel(writer_write, sheet_name='Sheet1')
36+
writer_write.save()

ci/lint.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ if [ "$LINT" ]; then
3737
fi
3838
echo "Linting scripts/*.py DONE"
3939

40+
echo "Linting doc scripts"
41+
flake8 doc/make.py doc/source/conf.py
42+
if [ $? -ne "0" ]; then
43+
RET=1
44+
fi
45+
echo "Linting doc scripts DONE"
46+
4047
echo "Linting *.pyx"
4148
flake8 pandas --filename=*.pyx --select=E501,E302,E203,E111,E114,E221,E303,E128,E231,E126,E265,E305,E301,E127,E261,E271,E129,W291,E222,E241,E123,F403
4249
if [ $? -ne "0" ]; then

0 commit comments

Comments
 (0)