Skip to content

Commit

Permalink
Merge branch 'dev' into new_pipestat
Browse files Browse the repository at this point in the history
  • Loading branch information
khoroshevskyi authored Nov 7, 2023
2 parents d9c818d + 0b430c7 commit e30fe6e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.13.3a1] -- 2023-10-04
### Fixed
- refactor for pipestat 0.6.0a1

## [0.13.2] -- 2023-08-02
### Fixed
- fixed self.new_start overriding checkpoints.
Expand Down
2 changes: 1 addition & 1 deletion pypiper/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.13.2"
__version__ = "0.13.3a1"
2 changes: 2 additions & 0 deletions pypiper/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,7 @@ def start_pipeline(self, args=None, multi=False):
self.status = "running"
self.pipestat.set_status(
record_identifier=self._pipestat_manager.cfg["record_identifier"],

status_identifier="running",
)

Expand Down Expand Up @@ -1425,6 +1426,7 @@ def _wait_for_lock(self, lock_file):
# self._set_status_flag(WAIT_FLAG)
self.pipestat.set_status(
record_identifier=self._pipestat_manager.cfg["record_identifier"],

status_identifier="waiting",
)
first_message_flag = True
Expand Down
10 changes: 5 additions & 5 deletions pypiper/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,20 +387,20 @@ def split_by_pipes(cmd):
cmdlist = []
newcmd = str()
for char in cmd:
if char is "{":
if char == "{":
stack_brace.append("{")
elif char is "}":
elif char == "}":
stack_brace.pop()
elif char is "(":
elif char == "(":
stack_paren.append("(")
elif char is ")":
elif char == ")":
stack_paren.pop()

if len(stack_brace) > 0 or len(stack_paren) > 0:
# We are inside a parenthetic of some kind; emit character
# no matter what it is
newcmd += char
elif char is "|":
elif char == "|":
# if it's a pipe, finish the command and start a new one
cmdlist.append(newcmd)
newcmd = str()
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements-pypiper.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ psutil
pandas
ubiquerg>=0.4.5
yacman
pipestat>=0.4.0
pipestat>=0.6.0a1

0 comments on commit e30fe6e

Please sign in to comment.