diff --git a/.Rbuildignore b/.Rbuildignore index ea0336b7..cac23d10 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -14,7 +14,7 @@ ^README\.Rmd$ ^pkgdown$ ^data-raw$ -^\.bumpversion\.cfg$ +^\.bumpversion\.toml$ inst/rmd/rnasum.html ^CODE_OF_CONDUCT\.md$ diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index f2e27b17..00000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[bumpversion] -current_version = 1.1.0 -commit = True -parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P\d+))? -serialize = - {major}.{minor}.{patch}.{dev} - {major}.{minor}.{patch} - -[bumpversion:file:DESCRIPTION] -search = Version: {current_version} -replace = Version: {new_version} - -[bumpversion:file:.github/workflows/conda_docker_pkgdown.yml] -search = VERSION: '{current_version}' -replace = VERSION: '{new_version}' - -[bumpversion:file:deploy/conda/env/yaml/rnasum.yaml] -search = r-rnasum =={current_version} -replace = r-rnasum =={new_version} - -[bumpversion:file:deploy/conda/recipe/meta.yaml] -search = version: {current_version} -replace = version: {new_version} diff --git a/.bumpversion.toml b/.bumpversion.toml new file mode 100644 index 00000000..0a75636e --- /dev/null +++ b/.bumpversion.toml @@ -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) + (?P0|[1-9]\\d*)\\. + (?P0|[1-9]\\d*)\\. + (?P0|[1-9]\\d*) + (?:\\.(?P\\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}" diff --git a/.github/workflows/conda_docker_pkgdown.yml b/.github/workflows/conda_docker_pkgdown.yml index da71640b..4b13b6fc 100644 --- a/.github/workflows/conda_docker_pkgdown.yml +++ b/.github/workflows/conda_docker_pkgdown.yml @@ -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: diff --git a/deploy/conda/env/yaml/rnasum.yaml b/deploy/conda/env/yaml/rnasum.yaml index edbbfad1..be07b9c9 100644 --- a/deploy/conda/env/yaml/rnasum.yaml +++ b/deploy/conda/env/yaml/rnasum.yaml @@ -6,4 +6,4 @@ channels: - bioconda dependencies: - - r-rnasum ==1.1.0 # versioned by bump2version + - r-rnasum ==1.1.0 # bump diff --git a/deploy/conda/recipe/meta.yaml b/deploy/conda/recipe/meta.yaml index 8edf6aff..767e8d03 100644 --- a/deploy/conda/recipe/meta.yaml +++ b/deploy/conda/recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: r-rnasum - version: 1.1.0 # bump2version + version: 1.1.0 # bump source: path: ../../../