Skip to content

Commit

Permalink
Merge pull request #1488 from ComparativeGenomicsToolkit/docker-fixes
Browse files Browse the repository at this point in the history
prep release 2.9.1
  • Loading branch information
glennhickey authored Sep 25, 2024
2 parents b282b58 + 5e324a3 commit feff5d6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
10 changes: 5 additions & 5 deletions BIN-INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.tar.gz
cd cactus-bin-v2.9.0
tar -xzf cactus-bin-v2.9.1.tar.gz
cd cactus-bin-v2.9.1
```

## 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.0
printf "export PATH=$(pwd)/bin:\$PATH\nexport PYTHONPATH=$(pwd)/lib:\$PYTHONPATH\n" >> venv-cactus-v2.9.0/bin/activate
source venv-cactus-v2.9.0/bin/activate
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
python3 -m pip install -U setuptools pip wheel
python3 -m pip install -U .
python3 -m pip install -U -r ./toil-requirement.txt
Expand Down
10 changes: 10 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Release 2.9.1 2024-09-25

This release updates the pangenome pipeline, and adds `KegAlign` to progressive cactus.

- GPU lastz implementation changed from `SegAlign` to `KegAlign`, and should be more robust and better supported as a result.
- Path normalization added to pangenome pipeline to make sure no two equivalent alleles through any site have different paths. `AT` fields in VCF should now always be consistent with the graph as a result.
- Always chop nodes to 1024bp by default in pangenome pipeline. This ensures that all outputs (gfa, gbz, vcf etc) have compatible node ids. Before, only GBZ and downstream graphs were chopped which was too confusing. Old logic can be re-activated using the config XML though.
- Fix recent bug where using the `--mgMemory` option would crash `cactus-pangenome`
- (Experimental) `--collapse` option added to pangenome pipeline to incorporate nearby self-alignments, including on the reference path.

# Release-2.9.0 2024-07-29

This release addresses two important scaling issues in the pangenome pipeline.
Expand Down
4 changes: 2 additions & 2 deletions doc/progressive.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
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
```

Or you can proceed interactively by running
```
docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.0 bash
docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.9.1 bash
cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
```
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def run(self):

setup(
name = "Cactus",
version = "2.9.0",
version = "2.9.1",
author = "Benedict Paten",
package_dir = {'': 'src'},
packages = find_packages(where='src'),
Expand Down
2 changes: 1 addition & 1 deletion src/cactus/shared/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def getDockerTag(gpu=False):
return "latest"
else:
# must be manually kept current with each release
return 'v2.9.0' + ('-gpu' if gpu else '')
return 'v2.9.1' + ('-gpu' if gpu else '')

def getDockerImage(gpu=False):
"""Get fully specified Docker image name."""
Expand Down

0 comments on commit feff5d6

Please sign in to comment.