From c9f4edbc92ebf60842ff0ae72eaf5ce7c70c154d Mon Sep 17 00:00:00 2001 From: darcy220606 Date: Thu, 21 Mar 2024 11:51:37 +0100 Subject: [PATCH 1/2] fix remove temp for funcscan --- README.md | 2 +- ampcombi/ampcombi.py | 5 +++-- ampcombi/version.py | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 99a29cb..f8723dc 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ conda env create -f ./ampcombi/environment.yml - Using **singularity and docker**: ``` - +singularity pull ampcombi:0.2.2--pyhdfd78af_0 ``` - From git repository: diff --git a/ampcombi/ampcombi.py b/ampcombi/ampcombi.py index 5b107a2..de75573 100644 --- a/ampcombi/ampcombi.py +++ b/ampcombi/ampcombi.py @@ -339,8 +339,9 @@ def parse_tables(args): sample_summary_df.to_csv(samplelist[i] +'/'+samplelist[i]+'_ampcombi.tsv', sep='\t', index=False) print(f'The summary file for {samplelist[i]} was saved to {samplelist[i]}.tsv') - # Remove the temp directory - shutil.rmtree('./temp') + # Remove the temp directory if it exists + if os.path.exists('./temp'): + shutil.rmtree('./temp') ######################################### # FUNCTION : CONCATENATING diff --git a/ampcombi/version.py b/ampcombi/version.py index fb13a35..9dd16a3 100644 --- a/ampcombi/version.py +++ b/ampcombi/version.py @@ -1 +1 @@ -__version__ = '0.2.1' \ No newline at end of file +__version__ = '0.2.2' \ No newline at end of file diff --git a/setup.py b/setup.py index bcad290..1a89212 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='AMPcombi', - version='0.2.1', + version='0.2.2', author='Anan Ibrahim, Louisa Perelo', author_email='ananhamido@hotmail.com, louperelo@gmail.com', packages=['ampcombi'], From 537c7a2fb2815d6ac3bc6c5f31c561aa97748233 Mon Sep 17 00:00:00 2001 From: darcy220606 Date: Thu, 21 Mar 2024 11:58:25 +0100 Subject: [PATCH 2/2] update change log --- CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 9361558..eca870e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -48,3 +48,6 @@ v<0.2.1>, <14.03.2024> -- Adjusted readme for installation setup -- Fixed the `./temp` dir removal step at the end of the process -- Changed the default matrix in diamond blastp to PAM250 +v<0.2.2>, <21.03.2024> + -- Added a check if ./temp dir is found before removal. This caused problems with pipeline setups. +