Merge pull request #1501 from ComparativeGenomicsToolkit/gpu-lastz

prep release v2.9.2
ComparativeGenomicsToolkit · Oct 14, 2024 · 8b4e8a9 · 8b4e8a9
2 parents f4cdf66 + c480b3f
commit 8b4e8a9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/BIN-INSTALL.md b/BIN-INSTALL.md
@@ -6,17 +6,17 @@ pre-compile binary, static linked distribution.
 ## Extracting
 If you have not already extract the distribution and cd into the cactus directory:
 ```
-tar -xzf cactus-bin-v2.9.1.tar.gz
-cd cactus-bin-v2.9.1
+tar -xzf cactus-bin-v2.9.2.tar.gz
+cd cactus-bin-v2.9.2
 ```
 
 ## Setup
 
 To build a python virtualenv and activate, do the following steps. This requires Python version >= 3.7 (so Ubuntu 18.04 users should use `-p python3.8` below):
 ```
-virtualenv -p python3 venv-cactus-v2.9.1
-printf "export PATH=$(pwd)/bin:\$PATH\nexport PYTHONPATH=$(pwd)/lib:\$PYTHONPATH\n" >> venv-cactus-v2.9.1/bin/activate
-source venv-cactus-v2.9.1/bin/activate
+virtualenv -p python3 venv-cactus-v2.9.2
+printf "export PATH=$(pwd)/bin:\$PATH\nexport PYTHONPATH=$(pwd)/lib:\$PYTHONPATH\n" >> venv-cactus-v2.9.2/bin/activate
+source venv-cactus-v2.9.2/bin/activate
 python3 -m pip install -U setuptools pip wheel
 python3 -m pip install -U .
 python3 -m pip install -U -r ./toil-requirement.txt

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,11 @@
+# Release 2.9.2 2024-10-14
+
+This release patches a couple bugs
+
+- fix broken `--collapse` option 
+- give Toil exact disk requirement for merge_aligments job, fixing a potential over-estimate
+- update abpoa to latest release (v1.5.3)
+
 # Release 2.9.1 2024-09-25
 
 This release updates the pangenome pipeline, and adds `KegAlign` to progressive cactus. 

diff --git a/doc/progressive.md b/doc/progressive.md
@@ -278,12 +278,12 @@ The Cactus Docker image contains everything you need to run Cactus (python envir
 
 ```
 wget -q https://raw.githubusercontent.com/ComparativeGenomicsToolkit/cactus/master/examples/evolverMammals.txt -O evolverMammals.txt
-docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.1 cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
+docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.2 cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
 ```
 
 Or you can proceed interactively by running
 ```
-docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.1 bash
+docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.2 bash
 cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
 
 ```

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def run(self):
 
 setup(
     name = "Cactus",
-    version = "2.9.1",
+    version = "2.9.2",
     author = "Benedict Paten",
     package_dir = {'': 'src'},
     packages = find_packages(where='src'),

diff --git a/src/cactus/shared/common.py b/src/cactus/shared/common.py
@@ -318,7 +318,7 @@ def getDockerTag(gpu=False):
         return "latest"    
     else:
         # must be manually kept current with each release        
-        return 'v2.9.1' + ('-gpu' if gpu else '')
+        return 'v2.9.2' + ('-gpu' if gpu else '')
 
 def getDockerImage(gpu=False):
     """Get fully specified Docker image name."""