Commit dab8a7f

committed

fix(bump): fixed environment variables in bump hooks

During development of #644, merging the hook environment variables with existing OS variables broke.

1 parent 1ff575d commit dab8a7fCopy full SHA for dab8a7f

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`from commitizen import cmd, out`
`4`	`4`	`from commitizen.exceptions import RunHookError`
`5`	`5`
	`6`	`+import os`
	`7`	`+`
`6`	`8`
`7`	`9`	`def run(hooks, _env_prefix="CZ_", **env):`
`8`	`10`	`if isinstance(hooks, str):`
`@@ -25,7 +27,7 @@ def run(hooks, _env_prefix="CZ_", **env):`
`25`	`27`	`def _format_env(prefix: str, env: dict[str, str]) -> dict[str, str]:`
`26`	`28`	`"""_format_env() prefixes all given environment variables with the given`
`27`	`29`	`prefix so it can be passed directly to cmd.run()."""`
`28`		`- penv = dict()`
	`30`	`+ penv = dict(os.environ)`
`29`	`31`	`for name, value in env.items():`
`30`	`32`	`name = prefix + name.upper()`
`31`	`33`	`value = str(value) if value is not None else ""`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import os`
`1`	`2`	`from unittest.mock import call`
`2`	`3`
`3`	`4`	`import pytest`
`@@ -17,7 +18,10 @@ def test_run(mocker: MockFixture):`
`17`	`18`	`hooks.run(bump_hooks)`
`18`	`19`
`19`	`20`	`cmd_run_mock.assert_has_calls(`
`20`		`- [call("pre_bump_hook", env={}), call("pre_bump_hook_1", env={})]`
	`21`	`+ [`
	`22`	`+ call("pre_bump_hook", env=dict(os.environ)),`
	`23`	`+ call("pre_bump_hook_1", env=dict(os.environ)),`
	`24`	`+ ]`
`21`	`25`	`)`
`22`	`26`
`23`	`27`

Comments

(0)