Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lint fixes #37

Merged
merged 4 commits into from
Jun 3, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix E722 and do not ignore globally
  • Loading branch information
ayan-b committed Jun 3, 2019
commit 473f52a23097a8df2efa693f43f6a7c59be841b4
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# flake8 configuration
[flake8]

# E722: do not use bare 'except'
# W605: invalid escape sequence '\*'
# E121: continuation line under-indented for hanging indent
# E126: continuation line over-indented for hanging indent
# W503: line break before binary operator
ignore = E722, W605, E121, E126, W503
ignore = W605, E121, E126, W503
6 changes: 3 additions & 3 deletions xena_gdc_etl/gdc.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,16 +413,16 @@ def gdc_check_new(new_file_uuids):
lambda c: ', '.join({p['project']['project_id']
for p in c})
)
except:
except: # noqa: E722
pass
df_list.append(df)
df = pd.concat(df_list, axis=0)
try:
df = df.drop('id', axis=1)
except:
except KeyError:
pass
try:
df = df.drop_duplicates()
except:
except: # noqa: E722
pass
df.to_csv(sys.stdout, sep='\t', index=False)
3 changes: 2 additions & 1 deletion xena_gdc_etl/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def main():
try:
assert_frame_equal(df1, df2)
print('Equal.')
except: # appeantly AssertionError doesn't catch all
# apparently AssertionError doesn't catch all
except: # noqa: E722
print('Not equal.')
# handle gdc_check_new
elif options.subcomm == "gdc-check-new":
Expand Down