Skip to content

Commit

Permalink
Merge pull request #1412 from ComparativeGenomicsToolkit/docker-fixes
Browse files Browse the repository at this point in the history
prep release 2.8.3
  • Loading branch information
glennhickey authored Jun 12, 2024
2 parents 2974952 + a983794 commit d37fce4
Show file tree
Hide file tree
Showing 5 changed files with 22 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.8.2.tar.gz
cd cactus-bin-v2.8.2
tar -xzf cactus-bin-v2.8.3.tar.gz
cd cactus-bin-v2.8.3
```

## 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.8.2
printf "export PATH=$(pwd)/bin:\$PATH\nexport PYTHONPATH=$(pwd)/lib:\$PYTHONPATH\n" >> venv-cactus-v2.8.2/bin/activate
source venv-cactus-v2.8.2/bin/activate
virtualenv -p python3 venv-cactus-v2.8.3
printf "export PATH=$(pwd)/bin:\$PATH\nexport PYTHONPATH=$(pwd)/lib:\$PYTHONPATH\n" >> venv-cactus-v2.8.3/bin/activate
source venv-cactus-v2.8.3/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
13 changes: 13 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# Release-2.8.3 2024-06-12

This release fixes some bugs and updates to the latest Toil.

- Fix broken `--restart` option in `cactus-graphmap`
- Raise Toil job memory requirement for `filter-paf-deletions`
- Update to `vg` v1.57.0
- Update `Toil` to v7.0
- Fix bug where trim-outgroups job could requeset way too little memory when there are no outgroups
- Fix typo that broke `cactus-maf2bigmaf` on uncompressed inputs
- More robust implementation of `vcfwave`
- Fix bug where RED preprocessing crashed `awk` returned a number in scientific notation

# Release 2.8.2 2024-05-09

This release fixes some bugs and adds a (docker-only) `vcfwave` normalization option for pangenomes.
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.8.2 cactus /data/jobStore /data/evolverMammals.txt /data/evolverMammals.hal
docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.8.3 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.8.2 bash
docker run -v $(pwd):/data --rm -it quay.io/comparative-genomics-toolkit/cactus:v2.8.3 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.8.2",
version = "2.8.3",
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.8.2' + ('-gpu' if gpu else '')
return 'v2.8.3' + ('-gpu' if gpu else '')

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

0 comments on commit d37fce4

Please sign in to comment.