From 0deda11b5183e66ae0953811f7b9a5a41baf1d6b Mon Sep 17 00:00:00 2001 From: kopardev Date: Wed, 30 Oct 2024 12:51:46 -0400 Subject: [PATCH 1/2] fix: fix #26 --- src/parkit/scripts/parkit_folder2hpcdme | 3 ++- src/parkit/src/VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/parkit/scripts/parkit_folder2hpcdme b/src/parkit/scripts/parkit_folder2hpcdme index 897bc88..a808772 100755 --- a/src/parkit/scripts/parkit_folder2hpcdme +++ b/src/parkit/scripts/parkit_folder2hpcdme @@ -23,7 +23,8 @@ temp_script=$(mktemp) cat << EOF > "$temp_script" #!/bin/bash ${SOURCE_CONDA_CMD} -conda activate parkit_dev +# conda activate parkit_dev +conda activate parkit export HPC_DM_UTILS=${hpcdmutilspath} echo \$HPC_DM_UTILS which parkit diff --git a/src/parkit/src/VERSION b/src/parkit/src/VERSION index 7ec1d6d..3e3c2f1 100644 --- a/src/parkit/src/VERSION +++ b/src/parkit/src/VERSION @@ -1 +1 @@ -2.1.0 +2.1.1 From 9bd182bb7ff04ad994dd8b4bb4e90081cb47c80b Mon Sep 17 00:00:00 2001 From: kopardev Date: Wed, 30 Oct 2024 12:54:59 -0400 Subject: [PATCH 2/2] docs: update CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b18bd..a97baac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -## v2.1 +## v2.1.1 + +## Features/BugFixes + +- fix loading `parkit_dev` conda env (#26) + +## v2.1.0 ## Features/BugFixes