Skip to content

Commit

Permalink
Correct bumpversion config for setup.cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
domdfcoding committed Apr 6, 2021
1 parent f535e5f commit 2c5e43b
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 21 deletions.
9 changes: 6 additions & 3 deletions repo_helper/files/ci_cd.py
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,12 @@ def ensure_bumpversion(repo_path: pathlib.Path, templates: jinja2.Environment) -

if "bumpversion:file:setup.cfg" in bv.sections():
setup_cfg_section = bv["bumpversion:file:setup.cfg"]
if "search" not in setup_cfg_section:
setup_cfg_section["search"] = "name = {current_version}"
setup_cfg_section["replace"] = "name = {new_version}"
if (
"search" not in setup_cfg_section
or ("search" in setup_cfg_section and setup_cfg_section["search"] == "name = {current_version}")
):
setup_cfg_section["search"] = "version = {current_version}"
setup_cfg_section["replace"] = "version = {new_version}"

bv["bumpversion"]["current_version"] = templates.globals["version"]
bv["bumpversion"]["commit"] = "True"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ replace = : str = "{new_version}"
[bumpversion:file:repo_helper.yml]

[bumpversion:file:setup.cfg]
search = name = {current_version}
replace = name = {new_version}
search = version = {current_version}
replace = version = {new_version}

0 comments on commit 2c5e43b

Please sign in to comment.