Skip to content

Commit

Permalink
Merge pull request #3169 from grondo/black-version
Browse files Browse the repository at this point in the history
python: reformat with latest black formatter, then pin black version
  • Loading branch information
mergify[bot] committed Aug 27, 2020
2 parents a84105d + 5c70878 commit fe91847
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: 'python format'
language: 'python'
python: '3.6'
install: pip install --upgrade black
install: pip install 'black==20.08.b1' --force-reinstall
script: ./scripts/check-format
before_deploy: skip
deploy: skip
Expand Down
12 changes: 6 additions & 6 deletions src/bindings/python/flux/core/handle.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

class Flux(Wrapper):
"""
The general Flux handle class, create one of these to connect to the
nearest enclosing flux instance
>>> flux.Flux() #doctest: +ELLIPSIS
<flux.core.Flux object at 0x...>
"""
The general Flux handle class, create one of these to connect to the
nearest enclosing flux instance
>>> flux.Flux() #doctest: +ELLIPSIS
<flux.core.Flux object at 0x...>
"""

def __init__(self, url=ffi.NULL, flags=0, handle=None):
super(Flux, self).__init__(
Expand Down Expand Up @@ -124,7 +124,7 @@ def rpc(self, topic, payload=None, nodeid=raw.FLUX_NODEID_ANY, flags=0):
return RPC(self, topic, payload, nodeid, flags)

def event_create(self, topic, payload=None):
""" Create a new event message.
"""Create a new event message.
:param topic: A string, the event's topic
:param payload: If a string, the payload is used unmodified, if it is
Expand Down
3 changes: 1 addition & 2 deletions src/bindings/python/flux/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,7 @@ def get_event(self, autoreset=True):
return event

def cancel(self):
"""Cancel a streaming job.event_watch_async() future
"""
"""Cancel a streaming job.event_watch_async() future"""
RAW.event_watch_cancel(self.pimpl)
self.needs_cancel = False

Expand Down
4 changes: 3 additions & 1 deletion src/cmd/flux-admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ def cleanup_push(args):
commands = [line.strip() for line in sys.stdin]

RPC(
flux.Flux(), "runat.push", {"name": "cleanup", "commands": commands[::-1]},
flux.Flux(),
"runat.push",
{"name": "cleanup", "commands": commands[::-1]},
).get()


Expand Down

0 comments on commit fe91847

Please sign in to comment.