Skip to content

Commit

Permalink
Merge pull request #221 from sigven/ensembl_v111
Browse files Browse the repository at this point in the history
Update to Ensembl v111
  • Loading branch information
sigven committed Feb 3, 2024
2 parents f8d0606 + 9faa345 commit b2cb64f
Show file tree
Hide file tree
Showing 14 changed files with 391 additions and 285 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.4.1.9000
current_version = 1.4.1.9001
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<dev>\d+))?
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_conda_recipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ on:
branches:
- master
- bundle_update_2023
- ensembl_v111
env:
atoken: ${{ secrets.ANACONDA_UPLOAD_TOKEN }}
recipe_path: conda/recipe
env_yml_path: conda/env/yml
env_lock_path: conda/env/lock
VERSION: '1.4.1.9000' # versioned by bump2version
VERSION: '1.4.1.9001' # versioned by bump2version
jobs:
build_pcgrr_conda_pkg:
# When merging to one of the branches above and the commit message matches
Expand Down
79 changes: 46 additions & 33 deletions conda/env/lock/pcgr-linux-64.lock

Large diffs are not rendered by default.

197 changes: 145 additions & 52 deletions conda/env/lock/pcgr-osx-64.lock

Large diffs are not rendered by default.

182 changes: 91 additions & 91 deletions conda/env/lock/pcgrr-linux-64.lock

Large diffs are not rendered by default.

191 changes: 95 additions & 96 deletions conda/env/lock/pcgrr-osx-64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions conda/env/yml/pcgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ channels:
- conda-forge

dependencies:
- pcgr::pcgr ==1.4.1.9000 # versioned by bump2version
- pcgr::pcgr ==1.4.1.9001 # versioned by bump2version
- bedtools
- bcftools
- cyvcf2
- ensembl-vep ==110.1
- ensembl-vep ==111.0
- htslib
- pandoc
- bioconda::perl-bio-bigfile
Expand Down
2 changes: 1 addition & 1 deletion conda/env/yml/pcgrr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channels:

dependencies:
- python
- pcgr::r-pcgrr ==1.4.1.9000 # versioned by bump2version
- pcgr::r-pcgrr ==1.4.1.9001 # versioned by bump2version
- pcgr::r-cpsr
- r-argparse
- bioconductor-bsgenome.hsapiens.ucsc.hg38
Expand Down
2 changes: 1 addition & 1 deletion conda/env/yml/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- bioconda
- conda-forge
dependencies:
- pcgr::r-pcgrr ==1.4.1.9000 # versioned by bump2version
- pcgr::r-pcgrr ==1.4.1.9001 # versioned by bump2version
- r-pkgdown
- r-readr
- pandoc
2 changes: 1 addition & 1 deletion conda/recipe/pcgrr/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: r-pcgrr
version: 1.4.1.9000 # versioned by bump2version
version: 1.4.1.9001 # versioned by bump2version

source:
path: ../../../pcgrr
Expand Down
2 changes: 1 addition & 1 deletion pcgr/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# versioned by bump2version
__version__ = '1.4.1.9000'
__version__ = '1.4.1.9001'
2 changes: 1 addition & 1 deletion pcgrr/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: pcgrr
Type: Package
Title: Personal Cancer Genome ReporteR
Version: 1.4.1.9000
Version: 1.4.1.9001
Date: 2023-12-30
Authors@R:
c(person(given = "Sigve",
Expand Down
6 changes: 3 additions & 3 deletions pcgrr/vignettes/installation.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ output: rmarkdown::html_document
software requirements:

```bash
PCGR_VERSION="1.4.1.9000"
PCGR_VERSION="1.4.1.9001"
PCGR_REPO="https://raw.githubusercontent.com/sigven/pcgr/v${PCGR_VERSION}/conda/env/lock/"
PLATFORM="linux" # or "osx"

Expand Down Expand Up @@ -79,7 +79,7 @@ Download and unpack the latest software release from <https://github.com/sigven/
Alternatively if you have `git` installed, you can do:
```bash
PCGR_VERSION="1.4.1.9000"
PCGR_VERSION="1.4.1.9001"
OUTPUT_DIRECTORY="PCGR"
git clone \
Expand Down Expand Up @@ -235,7 +235,7 @@ docker container run -it --rm \
-v /Users/you/dir1/data:/root/pcgr_data \
-v /Users/you/dir2/pcgr_inputs:/root/pcgr_inputs \
-v /Users/you/dir3/pcgr_outputs:/root/pcgr_outputs \
sigven/pcgr:1.4.1.9000 \
sigven/pcgr:1.4.1.9001 \
pcgr \
--input_vcf "/root/pcgr_inputs/tumor_sample.BRCA.vcf.gz" \
--pcgr_dir "/root/pcgr_data" \
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setuptools.setup(
name='pcgr',
version='1.4.1.9000', # versioned by bump2version
version='1.4.1.9001', # versioned by bump2version
license='MIT',
author='Sigve Nakken',
author_email='sigven@gmail.com',
Expand Down

0 comments on commit b2cb64f

Please sign in to comment.