Skip to content

Commit

Permalink
Merge pull request #170 from umccr/bump-my-version
Browse files Browse the repository at this point in the history
Switch from bumpversion to bump-my-version
  • Loading branch information
pdiakumis authored Sep 26, 2024
2 parents ecd442b + 560ed64 commit edb2a7c
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
^README\.Rmd$
^pkgdown$
^data-raw$
^\.bumpversion\.cfg$
^\.bumpversion\.toml$

inst/rmd/rnasum.html
^CODE_OF_CONDUCT\.md$
Expand Down
23 changes: 0 additions & 23 deletions .bumpversion.cfg

This file was deleted.

40 changes: 40 additions & 0 deletions .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[tool.bumpversion]
current_version = "1.1.0"
search = "{current_version}"
replace = "{new_version}"
message = "Bump version: {current_version} → {new_version}"
regex = false
ignore_missing_version = false
ignore_missing_files = false
commit = true
parse = """(?x)
(?P<major>0|[1-9]\\d*)\\.
(?P<minor>0|[1-9]\\d*)\\.
(?P<patch>0|[1-9]\\d*)
(?:\\.(?P<dev>\\d+))?
"""

serialize = [
"{major}.{minor}.{patch}.{dev}",
"{major}.{minor}.{patch}",
]

[[tool.bumpversion.files]]
filename = "DESCRIPTION"
search = "Version: {current_version}"
replace = "Version: {new_version}"

[[tool.bumpversion.files]]
filename = ".github/workflows/conda_docker_pkgdown.yml"
search = "VERSION: '{current_version}'"
replace = "VERSION: '{new_version}'"

[[tool.bumpversion.files]]
filename = "deploy/conda/env/yaml/rnasum.yaml"
search = "r-rnasum =={current_version}"
replace = "r-rnasum =={new_version}"

[[tool.bumpversion.files]]
filename = "deploy/conda/recipe/meta.yaml"
search = "version: {current_version}"
replace = "version: {new_version}"
2 changes: 1 addition & 1 deletion .github/workflows/conda_docker_pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
recipe_path: deploy/conda/recipe
env_yaml_path: deploy/conda/env/yaml
env_lock_path: deploy/conda/env/lock
VERSION: '1.1.0' # versioned by bump2version
VERSION: '1.1.0' # bump

jobs:
condarise-dockerise-document:
Expand Down
2 changes: 1 addition & 1 deletion deploy/conda/env/yaml/rnasum.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ channels:
- bioconda

dependencies:
- r-rnasum ==1.1.0 # versioned by bump2version
- r-rnasum ==1.1.0 # bump
2 changes: 1 addition & 1 deletion deploy/conda/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: r-rnasum
version: 1.1.0 # bump2version
version: 1.1.0 # bump

source:
path: ../../../
Expand Down

0 comments on commit edb2a7c

Please sign in to comment.