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

Fix new flake8 warnings #174

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Fix new flake8 warnings #174

merged 1 commit into from
Jun 3, 2020

Conversation

joshmoore
Copy link
Member

Especially "E741 ambiguous variable name".
see: ome/openmicroscopy#6236

@joshmoore
Copy link
Member Author

cc: @manics @will-moore

This is needed to get #168 passing

Especially "E741 ambiguous variable name".
see: ome/openmicroscopy#6236
@will-moore
Copy link
Member

Looks good 👍

@snoopycrimecop
Copy link
Member

snoopycrimecop commented Jun 3, 2020

Conflicting PR. Removed from build OMERO-python-superbuild-push#334. See the console output for more details.
Possible conflicts:

--conflicts Conflict resolved in build OMERO-python-superbuild-push#335. See the console output for more details.

@will-moore
Copy link
Member

@joshmoore conflict with #148

I can close that if you just want to get this in? Then rebase etc.

@joshmoore
Copy link
Member Author

Thanks. I went ahead and added --exclude to the description of #148. I'll re-run the build and see how things are this evening.

@joshmoore
Copy link
Member Author

Re-run https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-test-integration/415/ passed with 9 seemingly unrelated failures. Merging to unblock #148 and we can re-address as necessary.

@joshmoore joshmoore merged commit ec07fe5 into ome:master Jun 3, 2020
@joshmoore joshmoore deleted the fix-flake8 branch June 3, 2020 20:08
@sbesson sbesson added this to the 5.7.0 milestone Jun 26, 2020
@will-moore will-moore mentioned this pull request Jul 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants