Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-ansible-compat for
openSUSE:Factory checked in at 2022-11-17 17:24:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ansible-compat (Old)
and /work/SRC/openSUSE:Factory/.python-ansible-compat.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ansible-compat"
Thu Nov 17 17:24:34 2022 rev:8 rq:1036287 version:2.2.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-ansible-compat/python-ansible-compat.changes
2022-11-04 17:36:51.765405324 +0100
+++
/work/SRC/openSUSE:Factory/.python-ansible-compat.new.1597/python-ansible-compat.changes
2022-11-17 17:24:44.841142524 +0100
@@ -1,0 +2,7 @@
+Tue Nov 15 15:40:25 UTC 2022 - Johannes Kastl <[email protected]>
+
+- update to 2.2.4:
+ * Bugfixes
+ - Avoid running galaxy on offline mode (#180) @ssbarnea
+
+-------------------------------------------------------------------
Old:
----
ansible-compat-2.2.3.tar.gz
New:
----
ansible-compat-2.2.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ansible-compat.spec ++++++
--- /var/tmp/diff_new_pack.yBnIDr/_old 2022-11-17 17:24:45.321145063 +0100
+++ /var/tmp/diff_new_pack.yBnIDr/_new 2022-11-17 17:24:45.325145085 +0100
@@ -19,7 +19,7 @@
# only works with the python version which the package 'ansible' uses
%define pythons python3
Name: python-ansible-compat
-Version: 2.2.3
+Version: 2.2.4
Release: 0
Summary: Compatibility shim for Ansible 2.9 and newer
License: MIT
++++++ ansible-compat-2.2.3.tar.gz -> ansible-compat-2.2.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/.github/workflows/tox.yml
new/ansible-compat-2.2.4/.github/workflows/tox.yml
--- old/ansible-compat-2.2.3/.github/workflows/tox.yml 2022-10-31
13:16:24.000000000 +0100
+++ new/ansible-compat-2.2.4/.github/workflows/tox.yml 2022-11-01
17:07:49.000000000 +0100
@@ -105,6 +105,12 @@
- name: py38-ansible212
tox_env: py38-ansible212
python-version: 3.8
+ - name: py38-ansible213
+ tox_env: py38-ansible213
+ python-version: 3.8
+ - name: py39-ansible214
+ tox_env: py39-ansible214
+ python-version: 3.9
- name: py39
tox_env: py39,py39-devel
python-version: 3.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/.pre-commit-config.yaml
new/ansible-compat-2.2.4/.pre-commit-config.yaml
--- old/ansible-compat-2.2.3/.pre-commit-config.yaml 2022-10-31
13:16:24.000000000 +0100
+++ new/ansible-compat-2.2.4/.pre-commit-config.yaml 2022-11-01
17:07:49.000000000 +0100
@@ -85,13 +85,14 @@
additional_dependencies:
- cached_property
- flaky
+ - jinja2
- packaging
- pytest
- pytest-mock
- subprocess-tee>=0.3.5
- types-PyYAML
- - types-pkg_resources
- types-jsonschema>=4.4.9
+ - types-pkg_resources
- repo: https://github.com/pycqa/pylint
rev: v2.15.3
hooks:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/PKG-INFO
new/ansible-compat-2.2.4/PKG-INFO
--- old/ansible-compat-2.2.3/PKG-INFO 2022-10-31 13:16:42.089235000 +0100
+++ new/ansible-compat-2.2.4/PKG-INFO 2022-11-01 17:08:11.833703800 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.2.3
+Version: 2.2.4
Summary: Ansible compatibility goodies
Home-page: https://github.com/ansible-community/ansible-compat
Author: Sorin Sbarnea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/docs/conf.py
new/ansible-compat-2.2.4/docs/conf.py
--- old/ansible-compat-2.2.3/docs/conf.py 2022-10-31 13:16:24.000000000
+0100
+++ new/ansible-compat-2.2.4/docs/conf.py 2022-11-01 17:07:49.000000000
+0100
@@ -43,7 +43,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/requirements.txt
new/ansible-compat-2.2.4/requirements.txt
--- old/ansible-compat-2.2.3/requirements.txt 2022-10-31 13:16:24.000000000
+0100
+++ new/ansible-compat-2.2.4/requirements.txt 2022-11-01 17:07:49.000000000
+0100
@@ -8,13 +8,11 @@
# via sphinx
ansible-pygments==0.1.1
# via sphinx-ansible-theme
-argh==0.26.2
- # via sphinx-autobuild
attrs==22.1.0
# via
# jsonschema
# pytest
-babel==2.10.3
+babel==2.11.0
# via sphinx
build==0.9.0
# via pip-tools
@@ -24,8 +22,8 @@
# via requests
click==8.1.3
# via pip-tools
-commonmark==0.9.1
- # via pytest-markdown
+colorama==0.4.6
+ # via sphinx-autobuild
coverage==6.5.0
# via ansible-compat (setup.cfg)
docutils==0.17.1
@@ -33,6 +31,8 @@
# myst-parser
# sphinx
# sphinx-rtd-theme
+exceptiongroup==1.0.0
+ # via pytest
flaky==3.7.0
# via ansible-compat (setup.cfg)
idna==3.4
@@ -71,18 +71,12 @@
# build
# pytest
# sphinx
-pathtools==0.1.2
- # via sphinx-autobuild
pep517==0.13.0
# via build
pip-tools==6.9.0
# via ansible-compat (setup.cfg)
pluggy==1.0.0
# via pytest
-port-for==0.3.1
- # via sphinx-autobuild
-py==1.11.0
- # via pytest
pygments==2.13.0
# via
# ansible-pygments
@@ -91,40 +85,37 @@
# via packaging
pyrsistent==0.19.1
# via jsonschema
-pytest==6.2.5
+pytest==7.2.0
# via
# ansible-compat (setup.cfg)
- # pytest-markdown
# pytest-mock
# pytest-plus
-pytest-markdown==1.0.2
- # via ansible-compat (setup.cfg)
pytest-mock==3.10.0
# via ansible-compat (setup.cfg)
pytest-plus==0.2
# via ansible-compat (setup.cfg)
-pytz==2022.5
+pytz==2022.6
# via babel
pyyaml==6.0
# via
# ansible-compat (setup.cfg)
# myst-parser
- # sphinx-autobuild
requests==2.28.1
# via sphinx
six==1.16.0
# via livereload
snowballstemmer==2.2.0
# via sphinx
-sphinx==4.5.0
+sphinx==5.3.0
# via
# ansible-compat (setup.cfg)
# myst-parser
# sphinx-ansible-theme
+ # sphinx-autobuild
# sphinx-rtd-theme
sphinx-ansible-theme==0.9.1
# via ansible-compat (setup.cfg)
-sphinx-autobuild==0.7.1
+sphinx-autobuild==2021.3.14
# via ansible-compat (setup.cfg)
sphinx-rtd-theme==1.0.0
# via sphinx-ansible-theme
@@ -142,22 +133,17 @@
# via sphinx
subprocess-tee==0.3.5
# via ansible-compat (setup.cfg)
-toml==0.10.2
- # via pytest
tomli==2.0.1
# via
# build
# pep517
+ # pytest
tornado==6.2
- # via
- # livereload
- # sphinx-autobuild
+ # via livereload
typing-extensions==4.4.0
# via myst-parser
urllib3==1.26.12
# via requests
-watchdog==2.1.9
- # via sphinx-autobuild
wheel==0.37.1
# via pip-tools
zipp==3.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/setup.cfg
new/ansible-compat-2.2.4/setup.cfg
--- old/ansible-compat-2.2.3/setup.cfg 2022-10-31 13:16:42.093235000 +0100
+++ new/ansible-compat-2.2.4/setup.cfg 2022-11-01 17:08:11.833703800 +0100
@@ -62,16 +62,15 @@
[options.extras_require]
docs =
- sphinx-autobuild>=0.7.1,<1.0
- sphinx>=4.2.0,<5.0
+ sphinx-autobuild>=2021.3.14
+ sphinx>=5.3.0
sphinx_ansible_theme
myst_parser
test =
coverage
flaky
pip-tools
- pytest
- pytest-markdown
+ pytest>=7.2.0
pytest-mock
pytest-plus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/src/ansible_compat/runtime.py
new/ansible-compat-2.2.4/src/ansible_compat/runtime.py
--- old/ansible-compat-2.2.3/src/ansible_compat/runtime.py 2022-10-31
13:16:24.000000000 +0100
+++ new/ansible-compat-2.2.4/src/ansible_compat/runtime.py 2022-11-01
17:07:49.000000000 +0100
@@ -269,6 +269,7 @@
force=True,
)
+ # pylint: disable=too-many-branches
def install_requirements(
self, requirement: str, retry: bool = False, offline: bool = False
) -> None:
@@ -294,13 +295,14 @@
if offline:
_logger.warning(
- "Offline mode ignored because `ansible-galaxy role
install` command does not support it."
+ "Role installation skipped because `ansible-galaxy role
install` command does not support an offline mode."
)
- _logger.info("Running %s", " ".join(cmd))
- result = self.exec(cmd, retry=retry)
- if result.returncode != 0:
- _logger.error(result.stdout)
- raise AnsibleCommandError(result)
+ else:
+ _logger.info("Running %s", " ".join(cmd))
+ result = self.exec(cmd, retry=retry)
+ if result.returncode != 0:
+ _logger.error(result.stdout)
+ raise AnsibleCommandError(result)
# Run galaxy collection install works on v2 requirements.yml
if "collections" in reqs_yaml:
@@ -311,22 +313,25 @@
"install",
"-v",
]
+ skip = False
if offline:
if self.version_in_range(upper="2.14"):
_logger.warning(
- "Offline mode ignored because it is not supported by
ansible versions before 2.14."
+ "Collection install skipped because ansible versions
before 2.14 do not support an offline mode."
)
+ skip = True
else:
cmd.append("--offline")
- cmd.extend(["-r", requirement])
- if self.cache_dir:
- cmd.extend(["-p", f"{self.cache_dir}/collections"])
- _logger.info("Running %s", " ".join(cmd))
- result = self.exec(cmd, retry=retry)
- if result.returncode != 0:
- _logger.error(result.stdout)
- _logger.error(result.stderr)
- raise AnsibleCommandError(result)
+ if not skip:
+ cmd.extend(["-r", requirement])
+ if self.cache_dir:
+ cmd.extend(["-p", f"{self.cache_dir}/collections"])
+ _logger.info("Running %s", " ".join(cmd))
+ result = self.exec(cmd, retry=retry)
+ if result.returncode != 0:
+ _logger.error(result.stdout)
+ _logger.error(result.stderr)
+ raise AnsibleCommandError(result)
def prepare_environment( # noqa: C901
self,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ansible-compat-2.2.3/src/ansible_compat.egg-info/PKG-INFO
new/ansible-compat-2.2.4/src/ansible_compat.egg-info/PKG-INFO
--- old/ansible-compat-2.2.3/src/ansible_compat.egg-info/PKG-INFO
2022-10-31 13:16:42.000000000 +0100
+++ new/ansible-compat-2.2.4/src/ansible_compat.egg-info/PKG-INFO
2022-11-01 17:08:11.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.2.3
+Version: 2.2.4
Summary: Ansible compatibility goodies
Home-page: https://github.com/ansible-community/ansible-compat
Author: Sorin Sbarnea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ansible-compat-2.2.3/src/ansible_compat.egg-info/requires.txt
new/ansible-compat-2.2.4/src/ansible_compat.egg-info/requires.txt
--- old/ansible-compat-2.2.3/src/ansible_compat.egg-info/requires.txt
2022-10-31 13:16:42.000000000 +0100
+++ new/ansible-compat-2.2.4/src/ansible_compat.egg-info/requires.txt
2022-11-01 17:08:11.000000000 +0100
@@ -4,8 +4,8 @@
jsonschema>=4.6.0
[docs]
-sphinx-autobuild<1.0,>=0.7.1
-sphinx<5.0,>=4.2.0
+sphinx-autobuild>=2021.3.14
+sphinx>=5.3.0
sphinx_ansible_theme
myst_parser
@@ -13,7 +13,6 @@
coverage
flaky
pip-tools
-pytest
-pytest-markdown
+pytest>=7.2.0
pytest-mock
pytest-plus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/test/test_runtime.py
new/ansible-compat-2.2.4/test/test_runtime.py
--- old/ansible-compat-2.2.3/test/test_runtime.py 2022-10-31
13:16:24.000000000 +0100
+++ new/ansible-compat-2.2.4/test/test_runtime.py 2022-11-01
17:07:49.000000000 +0100
@@ -662,7 +662,14 @@
"""Ensure that we can make use of offline roles."""
with remember_cwd("test/roles/acme.missing_deps"):
runtime = Runtime(isolated=True)
- with pytest.raises(AnsibleCommandError):
+ if runtime.version_in_range(lower="2.14"):
+ # starting with 2.14 we can properly fail because this role has
+ # some missing collections in its requirements. We pass the offline
+ # but install will fail because there are not really offline
+ # requirements.
+ with pytest.raises(AnsibleCommandError):
+ runtime.prepare_environment(install_local=True, offline=True)
+ else:
runtime.prepare_environment(install_local=True, offline=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.3/tox.ini
new/ansible-compat-2.2.4/tox.ini
--- old/ansible-compat-2.2.3/tox.ini 2022-10-31 13:16:24.000000000 +0100
+++ new/ansible-compat-2.2.4/tox.ini 2022-11-01 17:07:49.000000000 +0100
@@ -25,12 +25,16 @@
ansible211: ansible-base 2.11
ansible212: ansible-core 2.12
ansible213: ansible-core 2.13
+ ansible214: ansible-core 2.14
+
deps =
ansible29: ansible>=2.9,<2.10
ansible210: ansible-base>=2.10,<2.11
ansible211: ansible-core>=2.11,<2.12
ansible212: ansible-core>=2.12,<2.13
ansible213: ansible-core>=2.13,<2.14
+ ansible214: ansible-core>=2.14.0b1,<2.15
+
devel: ansible-core @ git+https://github.com/ansible/ansible.git # GPLv3+
# avoid installing ansible-core on -devel, ansible29 and ansible210 envs:
!devel-!ansible29-!ansible210: ansible-core
