Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into benc-remove-channels
Browse files Browse the repository at this point in the history
 Conflicts:
	docs/reference.rst
	parsl/channels/base.py
	parsl/channels/errors.py
	parsl/channels/local/local.py
	parsl/dataflow/dflow.py
	parsl/tests/test_channels/test_local_channel.py
  • Loading branch information
benclifford committed Nov 7, 2024
2 parents d2fe86b + 6683f5b commit a3fdfaa
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions parsl/tests/test_channels/test_local_channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ def test_env():

x = [s for s in stdout if s.startswith("HOME=")]
assert x, "HOME not found"

print("RC:{} \nSTDOUT:{} \nSTDERR:{}".format(rc, stdout, stderr))

0 comments on commit a3fdfaa

Please sign in to comment.