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

PEP-8 fixes in random doctests. #4764

Merged
merged 1 commit into from Oct 10, 2017

Conversation

Projects
None yet
3 participants
@jmchilton
Member

jmchilton commented Oct 6, 2017

No description provided.

>>> b.name = 'b'
>>> b.inputs = odict([ ('c', c), ('d', d) ])
>>> d.name = 'd'
>>> d.inputs = odict([ ('e', e), ('f', f) ])
>>> f.test_param = g
>>> f.name = 'f'
>>> f.cases = [ Bunch( value='true', inputs= { 'h': h } ), Bunch( value='false', inputs= { 'i': i } ) ]
>>> f.cases = [ Bunch(value='true', inputs= { 'h': h }), Bunch(value='false', inputs= { 'i': i }) ]

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

There are spaces after [ and before ]

>>> inputs = odict([('a',a),('b',b)])
>>> nested = odict([ ('a', 1), ('b', [ odict([('c', 3), ( 'd', [odict([ ('e', 5), ('f', odict([ ('g', True), ('h', 7) ])) ]) ])]) ]) ])
>>> visit_input_values( inputs, nested, visitor )
>>> nested = odict([ ('a', 1), ('b', [ odict([('c', 3), ('d', [odict([ ('e', 5), ('f', odict([ ('g', True), ('h', 7) ])) ]) ])]) ]) ])

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

Also here.

name=a, prefix=, prefixed_name=a, value=1
name=c, prefix=b_0|, prefixed_name=b_0|c, value=3
name=e, prefix=b_0|d_0|, prefixed_name=b_0|d_0|e, value=5
name=g, prefix=b_0|d_0|, prefixed_name=b_0|d_0|f|g, value=True
name=h, prefix=b_0|d_0|, prefixed_name=b_0|d_0|f|h, value=7
>>> params_from_strings( inputs, params_to_strings( inputs, nested, None ), None )[ 'b' ][ 0 ][ 'd' ][ 0 ][ 'f' ][ 'g' ] is True
>>> params_from_strings(inputs, params_to_strings(inputs, nested, None), None)[ 'b' ][ 0 ][ 'd' ][ 0 ][ 'f' ][ 'g' ] is True

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

And here.

>>> b.name = 'b'
>>> b.inputs = odict([ ('c', c), ('d', d) ])
>>> d.name = 'd'
>>> d.inputs = odict([ ('e', e), ('f', f) ])
>>> f.test_param = g
>>> f.name = 'f'
>>> f.cases = [ Bunch( value='true', inputs= { 'h': h } ), Bunch( value='false', inputs= { 'i': i } ) ]
>>> f.cases = [ Bunch(value='true', inputs= { 'h': h }), Bunch(value='false', inputs= { 'i': i }) ]

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

Here.

>>> inputs = odict([('a',a),('b',b)])
>>> flat = odict([ ('a', 1 ), ( 'b_0|c', 2 ), ( 'b_0|d_0|e', 3 ), ( 'b_0|d_0|f|h', 4 ), ( 'b_0|d_0|f|g', True ) ])
>>> flat = odict([ ('a', 1), ('b_0|c', 2), ('b_0|d_0|e', 3), ('b_0|d_0|f|h', 4), ('b_0|d_0|f|g', True) ])

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

Here too.

@@ -2541,9 +2541,9 @@ bedtools annotate
'${bed.inputName}'
#end for
#else:
#set files = '" "'.join( [ str( $file ) for $file in $names.beds ] )
#set files = '" "'.join([ str($file) for $file in $names.beds ])

This comment has been minimized.

@nsoranzo

nsoranzo Oct 6, 2017

Member

In this file too.

@galaxybot galaxybot added this to the 18.01 milestone Oct 6, 2017

blah
>>> clp = ColumnListParameter ( None, XML( '<param name="numerical_column" type="data_column" data_ref="blah" numerical="true"/>' ) )
>>> print clp.name
>>> clp = ColumnListParameter (None, XML('<param name="numerical_column" type="data_column" data_ref="blah" numerical="true"/>'))

This comment has been minimized.

@nsoranzo

nsoranzo Oct 9, 2017

Member

There's an extra space between ColumnListParameter and (

PEP-8 fixes in doctests.
Rebased with " ]" and "[ " fixes pointed out by @nsoranzo.

@nsoranzo nsoranzo merged commit f608753 into galaxyproject:dev Oct 10, 2017

6 checks passed

api test Build finished. 303 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 161 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 57 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details
@nsoranzo

This comment has been minimized.

Member

nsoranzo commented Oct 10, 2017

Thanks @jmchilton for bearing with me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment