Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package molecule for openSUSE:Factory checked in at 2023-05-23 15:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/molecule (Old) and /work/SRC/openSUSE:Factory/.molecule.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "molecule" Tue May 23 15:42:53 2023 rev:4 rq:1088423 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/molecule/molecule.changes 2023-05-17 10:53:50.175575190 +0200 +++ /work/SRC/openSUSE:Factory/.molecule.new.1533/molecule.changes 2023-05-23 15:42:54.467616696 +0200 @@ -1,0 +2,6 @@ +Mon May 22 13:30:53 UTC 2023 - Lukas Müller <expee...@outlook.com> + +- Add fix_ansible_compat.patch from upstream pull request to fix + compatibility with python-ansible-compat v4. + +------------------------------------------------------------------- New: ---- fix_ansible_compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ molecule.spec ++++++ --- /var/tmp/diff_new_pack.lqYC7Q/_old 2023-05-23 15:42:54.955619591 +0200 +++ /var/tmp/diff_new_pack.lqYC7Q/_new 2023-05-23 15:42:54.963619639 +0200 @@ -45,6 +45,8 @@ License: MIT URL: https://github.com/ansible-community/molecule Source: https://files.pythonhosted.org/packages/source/m/molecule/molecule-%{version}.tar.gz +# Taken from upstream PR https://github.com/ansible-community/molecule/pull/3904 +Patch0: fix_ansible_compat.patch BuildRequires: python-rpm-macros BuildRequires: %{ansible_python}-pip BuildRequires: %{ansible_python}-setuptools @@ -66,7 +68,7 @@ BuildRequires: %{ansible_python} BuildRequires: %{ansible_python}-Jinja2 >= 2.11.3 BuildRequires: %{ansible_python}-PyYAML >= 5.1 -BuildRequires: (%{ansible_python}-ansible-compat >= 2.2.0 with %{ansible_python}-ansible-compat < 4) +BuildRequires: %{ansible_python}-ansible-compat >= 4.0.1 BuildRequires: %{ansible_python}-click >= 8.0 BuildRequires: %{ansible_python}-click-help-colors >= 0.9 BuildRequires: %{ansible_python}-cookiecutter >= 1.7.3 @@ -81,7 +83,7 @@ Requires: %{ansible_python}-base Requires: %{ansible_python}-Jinja2 >= 2.11.3 Requires: %{ansible_python}-PyYAML >= 5.1 -Requires: (%{ansible_python}-ansible-compat >= 2.2.0 with %{ansible_python}-ansible-compat < 4) +Requires: %{ansible_python}-ansible-compat >= 4.0.1 Requires: %{ansible_python}-click >= 8.0 Requires: %{ansible_python}-click-help-colors >= 0.9 Requires: %{ansible_python}-cookiecutter >= 1.7.3 @@ -102,6 +104,7 @@ %prep %setup -q -n molecule-%{version} +%patch0 -p1 %build %pyproject_wheel ++++++ fix_ansible_compat.patch ++++++ diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt index 5af77861..cf0bc2b2 100644 --- a/.config/requirements-lock.txt +++ b/.config/requirements-lock.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --no-annotate --output-file=.config/requirements-lock.txt --resolver=backtracking --strip-extras --unsafe-package=ruamel-yaml-clib pyproject.toml # -ansible-compat==3.0.2 +ansible-compat==4.0.2 ansible-core==2.14.4 arrow==1.2.3 attrs==23.1.0 diff --git a/.config/requirements.in b/.config/requirements.in index ce0cb9ae..d4bbe3a3 100644 --- a/.config/requirements.in +++ b/.config/requirements.in @@ -1,4 +1,4 @@ -ansible-compat >= 2.2.0, < 4.0.0 +ansible-compat >= 4.0.1 ansible-core >= 2.12.10 click >= 8.0, < 9 click-help-colors >= 0.9 diff --git a/.config/requirements.txt b/.config/requirements.txt index 2e1a36f1..5b8ef04d 100644 --- a/.config/requirements.txt +++ b/.config/requirements.txt @@ -5,7 +5,7 @@ # pip-compile --extra=docs --extra=test --no-annotate --output-file=.config/requirements.txt --resolver=backtracking --strip-extras pyproject.toml # ansi2html==1.8.0 -ansible-compat==3.0.2 +ansible-compat==4.0.2 ansible-core==2.14.4 ansible-lint==6.14.6 arrow==1.2.3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 55b0043e..6b9b8910 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -62,7 +62,7 @@ repos: entry: mypy src/ pass_filenames: false additional_dependencies: - - ansible-compat>=2.2.0,<4.0.0 + - ansible-compat>=4.0.1 - click>=8.0.1 - enrich>=1.2.7 - importlib-metadata>=4.6.1 @@ -81,7 +81,7 @@ repos: args: - --output-format=colorized additional_dependencies: - - ansible-compat>=2.2.0,<4.0.0 + - ansible-compat>=4.0.1 - click - click-help-colors - cookiecutter diff --git a/src/molecule/util.py b/src/molecule/util.py index 66c7610c..56f9c0ac 100644 --- a/src/molecule/util.py +++ b/src/molecule/util.py @@ -146,7 +146,7 @@ def run_command( if debug: print_environment_vars(env) - result = app.runtime.exec( + result = app.runtime.run( args=args, env=env, cwd=cwd,
