Merge branch 'dev' of github.com:databio/pypiper into dev

databio · Jun 20, 2019 · 8e728cb · 8e728cb
2 parents eb594a2 + ba2b501
commit 8e728cb
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 103 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,9 +1,25 @@
 # Changelog
 
-## Unreleased
+## [0.12.0] -- unreleased
+### Added
+- Use profile to determine total elapsed time
 
+## [0.11.3] -- 2019-06-17
+### Fixed
+- Fixed a bug that caused an OSError removing lock files for some filesystems.
 
-## [0.11.0] -- 2019-5-13
+
+## [0.11.2] -- 2019-06-06
+### Fixed
+- Elevate `attmap` depdendency bound to require inclusion of improved path expansion behavior.
+
+
+## [0.11.1] -- 2019-05-30
+### Fixed
+- Elevate `attmap` dependency bound to require inclusion of a bugfix there.
+
+
+## [0.11.0] -- 2019-05-13
 - Improve python3 handling of integers and strings
 - Fixed a bug with cleanup scripts in `dirty` mode
 - Restructured profile output with hash and processID, and made lock paths relative
@@ -14,7 +30,6 @@
 - Allow `ngstk.input_to_fastq` to yield gzipped fastq files
 
 
-
 ## [0.10.0] -- 2019-03-22
 - Fixed a bug that raised exception with empty commands
 - Fixed the pipeline profiling issues

diff --git a/pypiper/_version.py b/pypiper/_version.py
@@ -1 +1 @@
-__version__ = "0.11.3-dev"
+__version__ = "0.12.0dev"
diff --git a/pypiper/const.py b/pypiper/const.py
@@ -4,3 +4,4 @@
 CHECKPOINT_EXTENSION = ".checkpoint"
 PIPELINE_CHECKPOINT_DELIMITER = "_"
 STAGE_NAME_SPACE_REPLACEMENT = "-"
+PROFILE_COLNAMES = ['pid', 'hash', 'cid', 'runtime', 'mem', 'cmd', 'lock']