Fix all remaining unit tests under Python 3 #6450
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvdbeek
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
5 times, most recently
from
daf7b7f
to
6c7773c
Compare
|
I think all unit tests should be passing now, and I even managed to run a couple of tools successfully! |
mvdbeek
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
from
6c7773c
to
25d871a
Compare
nsoranzo
reviewed
Jul 3, 2018
| @@ -1546,7 +1546,7 @@ def check_limits(self, runtime=None): | |||
| return None | |||
|
|
|||
| def has_limits(self): | |||
| has_output_limit = self.app.job_config.limits.output_size > 0 | |||
| has_output_limit = self.app.job_config.limits.output_size and self.app.job_config.limits.output_size > 0 | |||
There was a problem hiding this comment.
Need to do the same at line 1533
There was a problem hiding this comment.
Good catch, done that in aaf968c
|
Hmm, the failing tests in https://travis-ci.org/mvdbeek/galaxy/jobs/399571214 pass fine locally, but I'm running 3.6 instead of 3.4 ... do you think it's worth switching travis to 3.6 ? |
mvdbeek
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
from
aaf968c
to
0cc6fe3
Compare
nsoranzo
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
2 times, most recently
from
ca4fbeb
to
58a4518
Compare
nsoranzo
reviewed
Jul 4, 2018
| @@ -26,7 +26,7 @@ | |||
| from galaxy.util import stringify_dictionary_keys | |||
|
|
|||
| # ensure supported version | |||
| assert sys.version_info[:2] >= (2, 6) and sys.version_info[:2] <= (2, 7), 'Python version must be 2.6 or 2.7, this is: %s' % sys.version | |||
| assert sys.version_info[:2] >= (2, 7) and sys.version_info[:2] <= (3, 7), 'Python version must be at least 2.7, this is: %s' % sys.version | |||
There was a problem hiding this comment.
Can we just drop the sys.version_info[:2] <= () ?
nsoranzo
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
from
2e9c123
to
73e98cd
Compare
|
@natefoo Can you help with the last remaining unit test error which involves |
mvdbeek
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
from
a2a4519
to
4ae2d97
Compare
nsoranzo
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
2 times, most recently
from
eef2d4d
to
256f569
Compare
nsoranzo
changed the title
nsoranzo
added
kind/bug
area/workflows
status/review
area/tool-framework
and removed
status/WIP
triage
labels
Might fix the last failing unit test?
nsoranzo
force-pushed
the
py3_workflow_and_tool_unit_fixes
branch
from
256f569
to
d15b6cc
Compare
nsoranzo
approved these changes
Jul 5, 2018
|
All green! |
martenson
reviewed
Jul 6, 2018
| @@ -34,7 +34,6 @@ matrix: | |||
| - env: TOX_ENV=py34-unit | |||
| addons: *py3_addons | |||
| allow_failures: | |||
| - env: TOX_ENV=py34-unit | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
xref. #1715