Skip to content

Commit

Permalink
Merge branch 'bundle_update_2023' of github.com:sigven/cpsr into bund…
Browse files Browse the repository at this point in the history
…le_update_2023
  • Loading branch information
sigven committed Jun 7, 2024
2 parents d31a0bd + 17b5de3 commit c031634
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 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.0.1.9006
current_version = 1.0.1.9007
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_conda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
atoken: ${{ secrets.ANACONDA_UPLOAD_TOKEN }}
recipe_path: conda/recipe
env_yml_path: conda/env/yml
VERSION: '1.0.1.9006' # versioned by bump2version
VERSION: '1.0.1.9007' # versioned by bump2version
jobs:
build_conda_pkgs:
# When merging to one of the branches above and the commit message matches
Expand Down
4 changes: 1 addition & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: cpsr
Type: Package
Title: Cancer Predisposition Sequencing Reporter (CPSR)
Version: 1.0.1.9006
Version: 1.0.1.9007
Date: 2024-05-27
Authors@R:
c(person(given = "Sigve",
Expand Down Expand Up @@ -45,8 +45,6 @@ Imports:
Depends:
R (>= 4.0)
Suggests:
testthat,
devtools,
BSgenome.Hsapiens.UCSC.hg19,
BSgenome.Hsapiens.UCSC.hg38,
knitr,
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 @@ -5,6 +5,6 @@ channels:
- bioconda
dependencies:
- r-pcgrr
- r-cpsr ==1.0.1.9006 # versioned by bump2version
- r-cpsr ==1.0.1.9007 # versioned by bump2version
- r-pkgdown
- pandoc
1 change: 0 additions & 1 deletion conda/recipe/cpsr/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash

export DISABLE_AUTOBREW=1
${R} -e "install.packages('openxlsx2', repos = 'https://cloud.r-project.org/', lib = '${PREFIX}/lib/R/library')"
${R} CMD INSTALL --build . ${R_ARGS}
6 changes: 5 additions & 1 deletion conda/recipe/cpsr/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: r-cpsr
version: 1.0.1.9006 # versioned by bump2version
version: 1.0.1.9007 # versioned by bump2version

source:
path: ../../../
Expand All @@ -17,10 +17,12 @@ requirements:
- git
host:
- r-base ==4.3.3
- r-assertable
- r-assertthat
- r-dplyr
- r-ggplot2
- r-glue
- r-openxlsx2
- r-pcgrr
- r-quarto
- quarto
Expand All @@ -31,10 +33,12 @@ requirements:
- r-tidyr
run:
- r-base
- r-assertable
- r-assertthat
- r-dplyr
- r-ggplot2
- r-glue
- r-openxlsx2
- r-pcgrr
- r-quarto
- quarto
Expand Down

0 comments on commit c031634

Please sign in to comment.