Skip to content

Commit

Permalink
Merge pull request #197 from pepkit/dev
Browse files Browse the repository at this point in the history
0.9.3 point release
  • Loading branch information
donaldcampbelljr authored Jun 6, 2024
2 parents 698d024 + 5a23c3e commit 2d2c66e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
7 changes: 6 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format.

## [0.9.2] - 2024-06-24
## [0.9.3] - 2024-06-06
### Fixed
- fixed regression with summarizing or creating a table via aggregate_results.yaml and "{record_identifier}" in the results file path
- fix creating object summary when object is an array/list

## [0.9.2] - 2024-06-03
### Changed
- User can override pipeline name via parameter or config file, otherwise look at output_schema, then fall back on default as last resort.
- Allow pipestat to proceed without creating a results file backend IF using "{record_identifier}" in the file path, helps address [Looper #471](https://github.com/pepkit/looper/issues/471)
Expand Down
2 changes: 1 addition & 1 deletion pipestat/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.2"
__version__ = "0.9.3"
8 changes: 6 additions & 2 deletions pipestat/pipestat.py
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,12 @@ def summarize(

def check_multi_results(self):
# Check to see if the user used a path with "{record-identifier}"
if self.file and self.cfg["unresolved_result_path"] != self.file:
if "{record_identifier}" in self.cfg["unresolved_result_path"]:
if self.file:
# TODO this needs rework: remove self.cfg["unresolved_result_path"] and just use self.file
if (
"{record_identifier}" in self.file
or self.cfg["unresolved_result_path"] != self.file
):
# assume there are multiple result files in sub-directories
self.cfg["multi_result_files"] = True
results_directory = self.cfg["unresolved_result_path"].split(
Expand Down
5 changes: 4 additions & 1 deletion pipestat/reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,10 @@ def _create_stats_objs_summaries(prj, pipeline_name: str) -> List[str]:
if k in all_result_identifiers:
all_result_identifiers.remove(k)
if v is not "None reported":
sample_reported_objects = {k: dict(v)}
if isinstance(v, list):
sample_reported_objects = {k: v}
else:
sample_reported_objects = {k: dict(v)}
else:
sample_reported_objects = {k: "None reported"}
if record_name in reported_objects:
Expand Down

0 comments on commit 2d2c66e

Please sign in to comment.