minor bug fixes before goldrush release (#142)

* minor bug fixes before goldrush release

* removing .DS_Store file

* removing mamba version pin from yml file

* repinning stable version of mamba in yml file

* Install conda for macos CI test

* Updating install conda script in yml file since last one was buggy

* Updating install conda script again

README.md

@@ -15,7 +15,7 @@ GoldRush iterates through the input long reads to produce a "golden path" of rea
 2. **[GoldPolish](https://github.com/bcgsc/goldpolish)** (aka GoldRush-Edit): polishing the genome
 3. **[Tigmint-long](https://github.com/bcgsc/tigmint)**: correcting the genome
 4. **[GoldChain](https://github.com/bcgsc/ntlink)** (aka GoldRush-Link): scaffolding the genome
-5. **[GoldPolish-Target](https://github.com/bcgsc/goldpolish)**: targeted polishing the genome
+5. **[GoldPolish-Target](https://github.com/bcgsc/goldpolish)**: targeted polishing of the genome
 
 
 ## Credits

azure-pipelines.yml

@@ -14,7 +14,7 @@ jobs:
     displayName: Create Anaconda environment
   - script: |
       source activate goldrush_CI
-      conda install --yes -c conda-forge mamba python=3.10 
+      conda install --yes -c conda-forge mamba=1.5.10 python=3.10 
       mamba install --yes -c conda-forge -c bioconda compilers meson gperftools sdsl-lite boost-cpp sparsehash btllib libdivsufsort minimap2 tigmint ntlink miller snakemake intervaltree  
     displayName: Install dependencies
   - script: |
@@ -41,8 +41,16 @@ jobs:
   - checkout: self
     persistCredentials: true
     submodules: true
-  - script: echo "##vso[task.prependpath]$CONDA/bin"
-    displayName: Add conda to PATH
+  - script: |
+      mkdir -p ~/miniforge3
+      curl -L https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh  -o ~/miniforge3/miniforge.sh
+      bash ~/miniforge3/miniforge.sh -b -u -p ~/miniforge3
+      rm -rf  ~/miniforge3/miniforge.sh
+      ~/miniforge3/bin/conda init bash
+      ~/miniforge3/bin/conda init zsh
+      export CONDA=$(realpath ~/miniforge3/bin)
+      echo "##vso[task.prependpath]$CONDA"
+    displayName: Install conda
   - script: conda create --yes --quiet --name goldrush_CI
     displayName: Create Anaconda environment
   - script: |

bin/goldrush

@@ -150,7 +150,7 @@ help:
 	@echo "	goldrush-path			run GoldRush-Path"
 	@echo "	path-polish			run GoldRush-Path, then $(polisher_logs)"
 	@echo "	path-tigmint			run GoldRush-Path, then $(polisher_logs), then Tigmint-long"
-	@echo "	path-tigmint-ntLin		run GoldRush-Path, then $(polisher_logs), then Tigmint-long, then ntLink (default 5 rounds)"
+	@echo "	path-tigmint-ntLink		run GoldRush-Path, then $(polisher_logs), then Tigmint-long, then ntLink (default 5 rounds)"
 	@echo "	path-tigmint-ntLink-target	run GoldRush-Path, then $(polisher_logs), then Tigmint-long, then ntLink (default 5 rounds), then GoldPolish-Target"
 	@echo ""
 	@echo "	General options (required):"

tests/goldrush_test_demo.sh

@@ -9,7 +9,7 @@ curl -L --output test_reads.fq https://www.bcgsc.ca/downloads/btl/goldrush/test/
 echo "Launching GoldRush"
 goldrush run reads=test_reads G=1e6 t=4 p=goldrush_test  -B
 
-l50=$(abyss-fac goldrush_test_golden_path.goldpolish-polished.span2.dist500.tigmint.fa.k40.w250.ntLink-5rounds.fa |awk '{print $3}' |tail -n1)
+l50=$(abyss-fac goldrush_test_golden_path.goldpolish-polished.span2.dist500.tigmint.fa.k40.w250.ntLink-5rounds.polished.fa |awk '{print $3}' |tail -n1)
 
 if [ -e goldrush_test_golden_path.goldpolish-polished.span2.dist500.tigmint.fa.k40.w250.ntLink-5rounds.polished.fa ] && [ ${l50} -eq 1 ]; then
   echo -e "\nTest successful!"