Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
khsrali committed Dec 10, 2024
1 parent 9a5bdd2 commit 0d4f99c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 54 deletions.
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
'rabbitmq': '[RabbitMQ](https://www.rabbitmq.com/)',
'kiwipy': '[kiwipy](https://kiwipy.readthedocs.io)',
}
nb_execution_mode = 'cache'
nb_execution_show_tb = 'READTHEDOCS' in os.environ
nb_execution_timeout = 60
jupyter_execute_notebooks = 'cache'
execution_show_tb = 'READTHEDOCS' in os.environ
execution_timeout = 60

# Warnings to ignore when using the -n (nitpicky) option
# We should ignore any python built-in exception, for instance
Expand Down
2 changes: 1 addition & 1 deletion examples/process_helloworld.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def define(cls, spec):
spec.input('name', default='World', required=True)
spec.output('greeting', valid_type=str)

async def run(self):
def run(self):
self.out('greeting', f'Hello {self.inputs.name}!')
return plumpy.Stop(None, True)

Expand Down
2 changes: 1 addition & 1 deletion examples/process_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def define(cls, spec):
spec.outputs.dynamic = True
spec.output('default', valid_type=int)

async def run(self):
def run(self):
self.out('default', 5)


Expand Down
10 changes: 5 additions & 5 deletions tests/test_workchains.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def define(cls, spec):
super().define(spec)
spec.output('res')

async def run(self):
def run(self):
self.out('res', A)

class ReturnB(plumpy.Process):
Expand All @@ -214,7 +214,7 @@ def define(cls, spec):
super().define(spec)
spec.output('res')

async def run(self):
def run(self):
self.out('res', B)

class Wf(WorkChain):
Expand Down Expand Up @@ -394,7 +394,7 @@ def define(cls, spec):
spec.outline(cls.run, cls.check)
spec.outputs.dynamic = True

async def run(self):
def run(self):
return ToContext(subwc=self.launch(SubWorkChain))

def check(self):
Expand All @@ -406,7 +406,7 @@ def define(cls, spec):
super().define(spec)
spec.outline(cls.run)

async def run(self):
def run(self):
self.out('value', 5)

workchain = MainWorkChain()
Expand Down Expand Up @@ -449,7 +449,7 @@ def define(cls, spec):
super().define(spec)
spec.output('_return')

async def run(self):
def run(self):
self.out('_return', val)

class Workchain(WorkChain):
Expand Down
44 changes: 0 additions & 44 deletions tox.ini

This file was deleted.

0 comments on commit 0d4f99c

Please sign in to comment.