From 6fb84f443d26184bb580636840c798db8255f5a9070a71200770b19ba39b505e Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Thu, 7 Sep 2023 07:50:05 +0000 Subject: [PATCH] Accepting request 1109411 from home:ojkastl_buildservice:Branch_systemsmanagement_ansible update to 4.1.10 OBS-URL: https://build.opensuse.org/request/show/1109411 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/python-ansible-compat?expand=0&rev=20 --- _service | 2 +- ansible-compat-4.1.10.tar.gz | 3 +++ ansible-compat-4.1.5.tar.gz | 3 --- python-ansible-compat.changes | 49 +++++++++++++++++++++++++++++++++++ python-ansible-compat.spec | 39 +++++++++++++++++++++------- 5 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 ansible-compat-4.1.10.tar.gz delete mode 100644 ansible-compat-4.1.5.tar.gz diff --git a/_service b/_service index 1bd86b8..7a150a7 100644 --- a/_service +++ b/_service @@ -1,4 +1,4 @@ - + diff --git a/ansible-compat-4.1.10.tar.gz b/ansible-compat-4.1.10.tar.gz new file mode 100644 index 0000000..5c7d980 --- /dev/null +++ b/ansible-compat-4.1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2be8c7b510d2e15eed1e9ef443209d67d9aec8f427026b88936d4535ff59863d +size 72127 diff --git a/ansible-compat-4.1.5.tar.gz b/ansible-compat-4.1.5.tar.gz deleted file mode 100644 index 0ddb48a..0000000 --- a/ansible-compat-4.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:597c836a184c1131feeb6b0e23cda236c41fecdee64427375278fb6920fd2e74 -size 68562 diff --git a/python-ansible-compat.changes b/python-ansible-compat.changes index 29fba52..e6d8096 100644 --- a/python-ansible-compat.changes +++ b/python-ansible-compat.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed Sep 6 15:25:15 UTC 2023 - Johannes Kastl + +- fix BuildRequires and Requires +- ignore 4 new checks that need internet connectivity + * test_scan_sys_path[isolatedT-scanT-raises_not_foundT] + * test_scan_sys_path[isolatedT-scanF-raises_not_foundT] + * test_scan_sys_path[isolatedF-scanT-raises_not_foundF] + * test_scan_sys_path[isolatedF-scanF-raises_not_foundT] +- update to 4.1.10: + * Bugfixes + - Catch empty collection lists (#332) @lod + +------------------------------------------------------------------- +Wed Sep 6 14:55:28 UTC 2023 - Johannes Kastl + +- update to 4.1.9: + * Bugfixes + - Automatically add --pre when installing collections from git + repositories @ssbarnea + +------------------------------------------------------------------- +Wed Sep 6 06:01:26 UTC 2023 - Johannes Kastl + +- update to 4.1.8: + * Bugfixes + - Revise site packages collection search test (#325) @cidrblock + - Add only those sys.paths which contain an ansible_collections + directory path (#322) @ajinkyau + - Allow git dependencies in galaxy.yml files (#321) @ssbarnea + +------------------------------------------------------------------- +Wed Sep 6 05:44:29 UTC 2023 - Johannes Kastl + +- update to 4.1.7: + * Bugfixes + - Add `sys.path` to collection paths (#318) @cidrblock + +------------------------------------------------------------------- +Wed Sep 6 05:39:12 UTC 2023 - Johannes Kastl + +- update to 4.1.6: + * Bugfixes + - Fix logic on prepare environment (#310) @ssbarnea + - Add smoke testing with ansible-lint (#312) @ssbarnea + - Adapt collection install test to pass with ansible-core + 2.15.3 changes (#313) @ssbarnea + - Support meta main yaml extension (#304) @zhan9san + ------------------------------------------------------------------- Fri Jul 21 12:08:15 UTC 2023 - Johannes Kastl diff --git a/python-ansible-compat.spec b/python-ansible-compat.spec index 29f6613..dc2089a 100644 --- a/python-ansible-compat.spec +++ b/python-ansible-compat.spec @@ -24,7 +24,7 @@ %endif Name: python-ansible-compat -Version: 4.1.5 +Version: 4.1.10 Release: 0 Summary: Compatibility shim for Ansible 2.9 and newer License: MIT @@ -36,18 +36,24 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: python-rpm-macros # SECTION test -BuildRequires: %{python_module pytest} -BuildRequires: %{python_module PyYAML} -BuildRequires: %{python_module flaky} -BuildRequires: %{python_module jsonschema >= 4.17.3} -BuildRequires: %{python_module pytest-mock} -BuildRequires: %{python_module subprocess-tee >= 0.4.1} +# https://github.com/ansible/ansible-compat/blob/main/pyproject.toml#L38 BuildRequires: ansible-core >= 2.12 +BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module jsonschema >= 4.17.3} +BuildRequires: %{python_module subprocess-tee >= 0.4.1} +# https://github.com/ansible/ansible-compat/blob/main/pyproject.toml#L56 +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytest-mock} +BuildRequires: %{python_module pytest-plus} # /SECTION BuildRequires: fdupes BuildRequires: python-rpm-generators -%{?python_enable_dependency_generator} +Requires: ansible-core >= 2.12 +Requires: python-PyYAML +Requires: python-jsonschema >= 4.17.3 +Requires: python-packaging Requires: python-subprocess-tee >= 0.4.1 +%{?python_enable_dependency_generator} BuildArch: noarch %python_subpackages @@ -66,7 +72,22 @@ Facilitate working with various versions of Ansible 2.9 and newer. %check # excluding tests requiring internet connection -%pytest -k 'not (test_runtime_example or test_require_collection_no_cache_dir or test_upgrade_collection or test_install_collection_dest or test_install_collection or test_require_collection or test_require_collection_wrong_version or test_prerun_reqs_v2 or test_prerun_reqs_v1 or test_prepare_environment_with_collections or test_runtime_require_module)' -W ignore:'There is no current event loop' +IGNORED_CHECKS="test_install_collection" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_install_collection_dest" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_prepare_environment_with_collections" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_prerun_reqs_v1" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_prerun_reqs_v2" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_require_collection" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_require_collection_no_cache_dir" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_require_collection_wrong_version" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_runtime_example" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_runtime_require_module" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_scan_sys_path[isolatedF-scanF-raises_not_foundT]" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_scan_sys_path[isolatedF-scanT-raises_not_foundF]" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_scan_sys_path[isolatedT-scanF-raises_not_foundT]" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_scan_sys_path[isolatedT-scanT-raises_not_foundT]" +IGNORED_CHECKS="${IGNORED_CHECKS} or test_upgrade_collection" +%pytest -k "not (${IGNORED_CHECKS})" %files %{python_files} %{python_sitelib}/ansible_compat