From efb6cfda10ce5069c8c321868a3ac7dfd640d2e6a84667423e4c76593a435330 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Tue, 16 May 2023 10:21:12 +0000 Subject: [PATCH 1/2] Accepting request 1087381 from home:ojkastl_buildservice:branches:systemsmanagement:ansible rework %if condition to work with new sle15_python_module_pythons macro on SLES15/Leap15 OBS-URL: https://build.opensuse.org/request/show/1087381 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/python-ansible-compat?expand=0&rev=13 --- python-ansible-compat.changes | 6 ++++++ python-ansible-compat.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python-ansible-compat.changes b/python-ansible-compat.changes index 281129d..ddf4842 100644 --- a/python-ansible-compat.changes +++ b/python-ansible-compat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 16 09:43:46 UTC 2023 - Johannes Kastl + +- rework %if condition to work with new sle15_python_module_pythons + macro on SLES15/Leap15 + ------------------------------------------------------------------- Fri Apr 14 06:54:22 UTC 2023 - Johannes Kastl diff --git a/python-ansible-compat.spec b/python-ansible-compat.spec index c437014..e09dc09 100644 --- a/python-ansible-compat.spec +++ b/python-ansible-compat.spec @@ -16,10 +16,8 @@ # -%if 0%{?suse_version} < 1550 -# Leap15, SLES15 -%define pythons python310 -%else +%{?sle15_python_module_pythons} +%if 0%{?suse_version} >= 1650 # Tumbleweed # only works with the python version which the package 'ansible' uses %define pythons python3 From cec58d4d10fdd62717df3e099fe558857f03e5d442d23a1710fee9a2f55cf921 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 22 May 2023 12:22:37 +0000 Subject: [PATCH 2/2] Accepting request 1088248 from home:ojkastl_buildservice:Branch_systemsmanagement_ansible OBS-URL: https://build.opensuse.org/request/show/1088248 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/python-ansible-compat?expand=0&rev=14 --- ansible-compat-3.0.2.tar.gz | 3 --- ansible-compat-4.0.5.tar.gz | 3 +++ python-ansible-compat.changes | 46 +++++++++++++++++++++++++++++++++++ python-ansible-compat.spec | 4 +-- 4 files changed, 51 insertions(+), 5 deletions(-) delete mode 100644 ansible-compat-3.0.2.tar.gz create mode 100644 ansible-compat-4.0.5.tar.gz diff --git a/ansible-compat-3.0.2.tar.gz b/ansible-compat-3.0.2.tar.gz deleted file mode 100644 index 32fef44..0000000 --- a/ansible-compat-3.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a10ea191f9efe08590ff64cb46a31af1f8142c08618db1a4bc827ed257c68230 -size 63328 diff --git a/ansible-compat-4.0.5.tar.gz b/ansible-compat-4.0.5.tar.gz new file mode 100644 index 0000000..b1d96ec --- /dev/null +++ b/ansible-compat-4.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d7e333f8d4f35b103eabc027d91b585d55dd6193a14b91187fc66b1add6c6cd +size 65711 diff --git a/python-ansible-compat.changes b/python-ansible-compat.changes index ddf4842..e37d2e1 100644 --- a/python-ansible-compat.changes +++ b/python-ansible-compat.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Mon May 22 05:42:53 UTC 2023 - Johannes Kastl + +- update to 4.0.5: + * Bugfixes + - Improve requirements.yml detection (#275) @ssbarnea +- update to 4.0.4: + * Bugfixes + - Allow use of * version on dependencies (#268) @ssbarnea +- update to 4.0.3: + * Bugfixes + - Automatically install tests/requirements.yml when found + (#266) @ssbarnea + - Also install requirements from galaxy.yml files (#265) + @ssbarnea + - Include original message in AnsibleWarning (#264) @ssbarnea +- update to 4.0.2: + * Bugfixes + - Revert to previous behavior for ansible_collections_path + (#261) @ajinkyau +- update to 4.0.1 (4.0.0 does not exist): + * Major Changes + - Rename Runtime.exec to Runtime.run (#256) @ssbarnea + - Introduce use of JSON recursive type (#253) @ssbarnea + - ruff: Make optional arguments keyword-only (#251) @ssbarnea + - Finish pathlib migration (#245) @ssbarnea + - Make Runtime.project_dir use Path (#244) @ssbarnea + - Migrate some functions to use Path (#243) @ssbarnea + - Make Runtime.cache_dir use Path (#240) @ssbarnea + - Remove support for py38 (#239) @ssbarnea + * Minor Changes + - Monkeypatch ansible core Display.warning (#238) @ssbarnea + * Bugfixes + - Use YAML safe loader instead of full loader (#255) @ssbarnea + - Use dataclass sorting for json schema errors (#254) @ssbarnea + - ruff: Address more skips (#249) @ssbarnea + - ruff: address TRY and T201 (#248) @ssbarnea + - ruff: Address EM (#247) @ssbarnea + - Convert more code to pathlib (#242) @ssbarnea + +------------------------------------------------------------------- +Fri May 19 07:25:35 UTC 2023 - Johannes Kastl + +- change python version on Leap15/SLES15 to python3.11 to use the + new stack supported by SUSE + ------------------------------------------------------------------- Tue May 16 09:43:46 UTC 2023 - Johannes Kastl diff --git a/python-ansible-compat.spec b/python-ansible-compat.spec index e09dc09..abecdc6 100644 --- a/python-ansible-compat.spec +++ b/python-ansible-compat.spec @@ -24,7 +24,7 @@ %endif Name: python-ansible-compat -Version: 3.0.2 +Version: 4.0.5 Release: 0 Summary: Compatibility shim for Ansible 2.9 and newer License: MIT @@ -40,7 +40,7 @@ BuildRequires: python-rpm-macros BuildRequires: %{python_module pytest} BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module flaky} -BuildRequires: %{python_module jsonschema >= 4.6.0} +BuildRequires: %{python_module jsonschema >= 4.17.3} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module subprocess-tee >= 0.4.1} BuildRequires: ansible-core >= 2.12