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-12-02 13:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ansible-compat (Old)
and /work/SRC/openSUSE:Factory/.python-ansible-compat.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ansible-compat"
Fri Dec 2 13:13:34 2022 rev:10 rq:1039503 version:2.2.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-ansible-compat/python-ansible-compat.changes
2022-11-18 15:44:26.158800080 +0100
+++
/work/SRC/openSUSE:Factory/.python-ansible-compat.new.1835/python-ansible-compat.changes
2022-12-02 13:13:51.394089203 +0100
@@ -1,0 +2,16 @@
+Thu Dec 1 05:48:32 UTC 2022 - Johannes Kastl <ka...@b1-systems.de>
+
+- update to 2.2.6:
+ * Bugfixes
+ - Adopt PEP-621 for packaging (#195) @ssbarnea
+ - Revert "Avoid running galaxy on offline mode (#180)" (#192) @ssbarnea
+
+-------------------------------------------------------------------
+Fri Nov 25 07:12:13 UTC 2022 - Johannes Kastl <ka...@b1-systems.de>
+
+- rework spec file to define %pythons to python310 for Leap15 and SLES15,
+ using the python version 3.10 that ansible is built against
+- add explicit Requires for python*-subprocess-tee, that is not being added
+ automatically
+
+-------------------------------------------------------------------
Old:
----
ansible-compat-2.2.5.tar.gz
New:
----
ansible-compat-2.2.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ansible-compat.spec ++++++
--- /var/tmp/diff_new_pack.OqHuq6/_old 2022-12-02 13:13:51.882091886 +0100
+++ /var/tmp/diff_new_pack.OqHuq6/_new 2022-12-02 13:13:51.886091908 +0100
@@ -16,10 +16,17 @@
#
+%if 0%{?suse_version} < 1550
+# Leap15, SLES15
+%define pythons python310
+%else
+# Tumbleweed
# only works with the python version which the package 'ansible' uses
%define pythons python3
+%endif
+
Name: python-ansible-compat
-Version: 2.2.5
+Version: 2.2.6
Release: 0
Summary: Compatibility shim for Ansible 2.9 and newer
License: MIT
@@ -43,6 +50,7 @@
BuildRequires: fdupes
BuildRequires: python-rpm-generators
%{?python_enable_dependency_generator}
+Requires: python-subprocess-tee
BuildArch: noarch
%python_subpackages
++++++ ansible-compat-2.2.5.tar.gz -> ansible-compat-2.2.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/.github/workflows/release.yml
new/ansible-compat-2.2.6/.github/workflows/release.yml
--- old/ansible-compat-2.2.5/.github/workflows/release.yml 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/.github/workflows/release.yml 2022-11-30
21:44:11.000000000 +0100
@@ -13,36 +13,26 @@
needs: before-release
# unable to use environment with uses/with, basically cannot reuse release
pipelines
environment: release
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
env:
FORCE_COLOR: 1
PY_COLORS: 1
- TOXENV: packaging
TOX_PARALLEL_NO_SPINNER: 1
steps:
- - name: Switch to using Python 3.8 by default
+ - name: Switch to using Python 3.9 by default
uses: actions/setup-python@v4
with:
- python-version: 3.8
+ python-version: 3.9
- name: Install tox
- run: >-
- python3 -m
- pip install
- --user
- tox
+ run: python3 -m pip install --user "tox>=4.0.0rc1"
- name: Check out src from Git
uses: actions/checkout@v3
with:
fetch-depth: 0 # needed by setuptools-scm
- name: Build dists
- run: python -m tox
- - name: Publish to test.pypi.org
- uses: pypa/gh-action-pypi-publish@master
- with:
- password: ${{ secrets.testpypi_password }}
- repository_url: https://test.pypi.org/legacy/
+ run: python -m tox -e pkg
- name: Publish to pypi.org
uses: pypa/gh-action-pypi-publish@master
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/.github/workflows/tox.yml
new/ansible-compat-2.2.6/.github/workflows/tox.yml
--- old/ansible-compat-2.2.5/.github/workflows/tox.yml 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/.github/workflows/tox.yml 2022-11-30
21:44:11.000000000 +0100
@@ -18,20 +18,17 @@
jobs:
linters:
name: ${{ matrix.env.TOXENV }}
- runs-on: ${{ matrix.os }}
+ runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
strategy:
fail-fast: false
matrix:
python-version:
- 3.9
- os:
- - ubuntu-20.04
env:
- TOXENV: lint
- TOXENV: docs
- - TOXENV: packaging
+ - TOXENV: pkg
env:
- TOX_PARALLEL_NO_SPINNER: 1
FORCE_COLOR: 1
steps:
@@ -58,7 +55,7 @@
key: ${{ matrix.name }}-pip-${{ hashFiles('setup.cfg', 'tox.ini',
'pyproject.toml', '.pre-commit-config.yaml') }}
- name: Install tox
- run: python3 -m pip install --upgrade tox
+ run: python3 -m pip install --upgrade 'tox>=4.0.0rc1'
- name: Log installed dists
run: python -m pip freeze --all
@@ -68,7 +65,7 @@
env: ${{ matrix.env }}
- name: Test with tox
- run: python -m tox --parallel auto --parallel-live
+ run: python -m tox
env: ${{ matrix.env }}
- name: Archive logs
@@ -79,7 +76,7 @@
unit:
name: ${{ matrix.name || matrix.tox_env }}
- runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
+ runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
strategy:
fail-fast: false
matrix:
@@ -119,7 +116,7 @@
python-version: "3.10"
- name: py311
tox_env: py311,py311-devel
- python-version: "~3.11.0-0" # see
https://github.com/actions/setup-python/issues/213#issuecomment-1146676713
+ python-version: "3.11"
# macos
- name: py38@macos
tox_env: py38,py38-ansible29 # 2.14(devel) does not support 3.8
@@ -162,7 +159,7 @@
key: ${{ runner.os }}-${{ matrix.name }}-pip-${{
hashFiles('constraints.txt', 'setup.cfg', 'tox.ini', 'pyproject.toml',
'.pre-commit-config.yaml', 'pytest.ini') }}
- name: Install tox
- run: python3 -m pip install --upgrade tox 'coverage[toml]'
+ run: python3 -m pip install --upgrade "tox>=4.0.0rc1"
- name: Log installed dists
run: python3 -m pip freeze --all
@@ -173,10 +170,6 @@
- name: "Test with tox: ${{ matrix.tox_env }}"
run: python3 -m tox -e ${{ matrix.tox_env }}
- - name: Combine coverage data
- # produce a single .coverage file at repo root
- run: coverage combine .tox/.coverage.*
-
- name: Upload coverage data
if: "runner.os == 'Linux'"
uses: codecov/codecov-action@v3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/.pre-commit-config.yaml
new/ansible-compat-2.2.6/.pre-commit-config.yaml
--- old/ansible-compat-2.2.5/.pre-commit-config.yaml 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/.pre-commit-config.yaml 2022-11-30
21:44:11.000000000 +0100
@@ -85,14 +85,13 @@
additional_dependencies:
- cached_property
- flaky
- - jinja2
- packaging
- pytest
- pytest-mock
- subprocess-tee>=0.3.5
- types-PyYAML
- - types-jsonschema>=4.4.9
- types-pkg_resources
+ - types-jsonschema>=4.4.9
- repo: https://github.com/pycqa/pylint
rev: v2.15.5
hooks:
@@ -110,17 +109,17 @@
name: Upgrade constraints files and requirements
files: ^(setup\.py|setup\.cfg|requirements\.txt)$
language: python
- entry: python -m piptools compile --upgrade -q --extra docs --extra
test --output-file=requirements.txt setup.cfg
+ entry: python -m piptools compile --upgrade -q --extra docs --extra
test --output-file=requirements.txt pyproject.toml
pass_filenames: false
stages:
- manual
additional_dependencies:
- - pip-tools>=6.8.0
+ - pip-tools>=6.10.0
- id: pip-compile
name: Check constraints files and requirements
files: ^(setup\.py|setup\.cfg|requirements\.txt)$
language: python
- entry: python -m piptools compile -q --extra docs --extra test
--output-file=requirements.txt setup.cfg
+ entry: python -m piptools compile -q --extra docs --extra test
--output-file=requirements.txt pyproject.toml
pass_filenames: false
additional_dependencies:
- - pip-tools>=6.8.0
+ - pip-tools>=6.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/PKG-INFO
new/ansible-compat-2.2.6/PKG-INFO
--- old/ansible-compat-2.2.5/PKG-INFO 2022-11-18 01:11:15.978888500 +0100
+++ new/ansible-compat-2.2.6/PKG-INFO 2022-11-30 21:44:32.828846500 +0100
@@ -1,35 +1,29 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.2.5
+Version: 2.2.6
Summary: Ansible compatibility goodies
-Home-page: https://github.com/ansible/ansible-compat
-Author: Sorin Sbarnea
-Author-email: ssbar...@redhat.com
+Author-email: Sorin Sbarnea <ssbar...@redhat.com>
+Maintainer-email: Sorin Sbarnea <ssbar...@redhat.com>
License: MIT
-Project-URL: Bug Tracker, https://github.com/ansible/ansible-compat/issues
-Project-URL: CI: GitHub,
https://github.com/ansible/ansible-compat/actions?query=workflow:gh+branch:main+event:push
-Project-URL: Code of Conduct,
https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
-Project-URL: Source Code, https://github.com/ansible/ansible-compat
-Project-URL: Documentation, https://ansible-compat.readthedocs.io/
+Project-URL: homepage, https://github.com/ansible/ansible-compat
+Project-URL: documentation, https://ansible-compat.readthedocs.io/
+Project-URL: repository, https://github.com/ansible/ansible-compat
+Project-URL: changelog, https://github.com/ansible/ansible-compat/releases
Keywords: ansible
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Information Technology
Classifier: Intended Audience :: System Administrators
-Classifier: Operating System :: OS Independent
Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)
-Classifier: Programming Language :: Python
+Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: Implementation
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: Jython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Programming Language :: Python
+Classifier: Topic :: System :: Systems Administration
Classifier: Topic :: Software Development :: Bug Tracking
Classifier: Topic :: Software Development :: Quality Assurance
Classifier: Topic :: Software Development :: Testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/pyproject.toml
new/ansible-compat-2.2.6/pyproject.toml
--- old/ansible-compat-2.2.5/pyproject.toml 2022-11-18 01:10:56.000000000
+0100
+++ new/ansible-compat-2.2.6/pyproject.toml 2022-11-30 21:44:11.000000000
+0100
@@ -1,17 +1,77 @@
[build-system]
requires = [
- "setuptools >= 45.0.0", # required by pyproject+setuptools_scm integration
- "setuptools_scm[toml] >= 7.0.0", # required for "no-local-version" scheme
-
+ "setuptools >= 61.0", # PEP-621
+ "setuptools_scm[toml] >= 7.0.0",
]
build-backend = "setuptools.build_meta"
+[project]
+# https://peps.python.org/pep-0621/#readme
+requires-python = ">=3.8"
+dynamic = ["version"]
+name = "ansible-compat"
+description = "Ansible compatibility goodies"
+readme = "README.md"
+authors = [{ "name" = "Sorin Sbarnea", "email" = "ssbar...@redhat.com" }]
+maintainers = [{ "name" = "Sorin Sbarnea", "email" = "ssbar...@redhat.com" }]
+license = { text = "MIT" }
+classifiers = [
+ "Development Status :: 5 - Production/Stable",
+ "Environment :: Console",
+ "Intended Audience :: Developers",
+ "Intended Audience :: Information Technology",
+ "Intended Audience :: System Administrators",
+ "License :: OSI Approved :: MIT License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python",
+ "Topic :: System :: Systems Administration",
+ "Topic :: Software Development :: Bug Tracking",
+ "Topic :: Software Development :: Quality Assurance",
+ "Topic :: Software Development :: Testing",
+ "Topic :: Utilities",
+]
+keywords = ["ansible"]
+dependencies = [
+ "packaging",
+ "PyYAML",
+ "subprocess-tee>=0.3.5",
+ "jsonschema>=4.6.0",
+]
+
+[project.urls]
+homepage = "https://github.com/ansible/ansible-compat";
+documentation = "https://ansible-compat.readthedocs.io/";
+repository = "https://github.com/ansible/ansible-compat";
+changelog = "https://github.com/ansible/ansible-compat/releases";
+
+[project.optional-dependencies]
+docs = [
+ "sphinx-autobuild>=2021.3.14",
+ "sphinx>=5.3.0",
+ "sphinx_ansible_theme",
+ "myst_parser",
+]
+test = [
+ "coverage",
+ "flaky",
+ "pip-tools",
+ "pytest>=7.2.0",
+ "pytest-mock",
+ "pytest-plus",
+]
+
[tool.coverage.run]
source = ["src"]
branch = true
[tool.coverage.report]
exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
+skip_covered = true
[tool.isort]
profile = "black"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/requirements.txt
new/ansible-compat-2.2.6/requirements.txt
--- old/ansible-compat-2.2.5/requirements.txt 2022-11-18 01:10:56.000000000
+0100
+++ new/ansible-compat-2.2.6/requirements.txt 2022-11-30 21:44:11.000000000
+0100
@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
-# pip-compile --extra=docs --extra=test --output-file=requirements.txt
setup.cfg
+# pip-compile --extra=docs --extra=test --output-file=requirements.txt
pyproject.toml
#
alabaster==0.7.12
# via sphinx
@@ -25,21 +25,21 @@
colorama==0.4.6
# via sphinx-autobuild
coverage==6.5.0
- # via ansible-compat (setup.cfg)
+ # via ansible-compat (pyproject.toml)
docutils==0.17.1
# via
# myst-parser
# sphinx
# sphinx-rtd-theme
-exceptiongroup==1.0.0
+exceptiongroup==1.0.4
# via pytest
flaky==3.7.0
- # via ansible-compat (setup.cfg)
+ # via ansible-compat (pyproject.toml)
idna==3.4
# via requests
imagesize==1.4.1
# via sphinx
-importlib-metadata==5.0.0
+importlib-metadata==5.1.0
# via sphinx
iniconfig==1.1.1
# via pytest
@@ -47,8 +47,8 @@
# via
# myst-parser
# sphinx
-jsonschema==4.16.0
- # via ansible-compat (setup.cfg)
+jsonschema==4.17.3
+ # via ansible-compat (pyproject.toml)
livereload==2.6.3
# via sphinx-autobuild
markdown-it-py==2.1.0
@@ -64,17 +64,17 @@
more-itertools==9.0.0
# via pytest-plus
myst-parser==0.18.1
- # via ansible-compat (setup.cfg)
+ # via ansible-compat (pyproject.toml)
packaging==21.3
# via
- # ansible-compat (setup.cfg)
+ # ansible-compat (pyproject.toml)
# build
# pytest
# sphinx
pep517==0.13.0
# via build
-pip-tools==6.9.0
- # via ansible-compat (setup.cfg)
+pip-tools==6.10.0
+ # via ansible-compat (pyproject.toml)
pluggy==1.0.0
# via pytest
pygments==2.13.0
@@ -83,22 +83,22 @@
# sphinx
pyparsing==3.0.9
# via packaging
-pyrsistent==0.19.1
+pyrsistent==0.19.2
# via jsonschema
pytest==7.2.0
# via
- # ansible-compat (setup.cfg)
+ # ansible-compat (pyproject.toml)
# pytest-mock
# pytest-plus
pytest-mock==3.10.0
- # via ansible-compat (setup.cfg)
+ # via ansible-compat (pyproject.toml)
pytest-plus==0.2
- # via ansible-compat (setup.cfg)
+ # via ansible-compat (pyproject.toml)
pytz==2022.6
# via babel
pyyaml==6.0
# via
- # ansible-compat (setup.cfg)
+ # ansible-compat (pyproject.toml)
# myst-parser
requests==2.28.1
# via sphinx
@@ -108,16 +108,16 @@
# via sphinx
sphinx==5.3.0
# via
- # ansible-compat (setup.cfg)
+ # ansible-compat (pyproject.toml)
# myst-parser
# sphinx-ansible-theme
# sphinx-autobuild
# sphinx-rtd-theme
-sphinx-ansible-theme==0.9.1
- # via ansible-compat (setup.cfg)
+sphinx-ansible-theme==0.10.0
+ # via ansible-compat (pyproject.toml)
sphinx-autobuild==2021.3.14
- # via ansible-compat (setup.cfg)
-sphinx-rtd-theme==1.0.0
+ # via ansible-compat (pyproject.toml)
+sphinx-rtd-theme==1.1.1
# via sphinx-ansible-theme
sphinxcontrib-applehelp==1.0.2
# via sphinx
@@ -131,8 +131,8 @@
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
-subprocess-tee==0.3.5
- # via ansible-compat (setup.cfg)
+subprocess-tee==0.4.0
+ # via ansible-compat (pyproject.toml)
tomli==2.0.1
# via
# build
@@ -142,11 +142,11 @@
# via livereload
typing-extensions==4.4.0
# via myst-parser
-urllib3==1.26.12
+urllib3==1.26.13
# via requests
-wheel==0.37.1
+wheel==0.38.4
# via pip-tools
-zipp==3.10.0
+zipp==3.11.0
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/setup.cfg
new/ansible-compat-2.2.6/setup.cfg
--- old/ansible-compat-2.2.5/setup.cfg 2022-11-18 01:11:15.978888500 +0100
+++ new/ansible-compat-2.2.6/setup.cfg 2022-11-30 21:44:32.828846500 +0100
@@ -1,88 +1,3 @@
-[metadata]
-name = ansible-compat
-url = https://github.com/ansible/ansible-compat
-project_urls =
- Bug Tracker = https://github.com/ansible/ansible-compat/issues
- CI: GitHub =
https://github.com/ansible/ansible-compat/actions?query=workflow:gh+branch:main+event:push
- Code of Conduct =
https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
- Source Code = https://github.com/ansible/ansible-compat
- Documentation = https://ansible-compat.readthedocs.io/
-description = Ansible compatibility goodies
-long_description = file: README.md
-long_description_content_type = text/markdown
-author = Sorin Sbarnea
-author_email = ssbar...@redhat.com
-license = MIT
-license_file = LICENSE
-classifiers =
- Development Status :: 5 - Production/Stable
-
- Environment :: Console
-
- Intended Audience :: Developers
- Intended Audience :: Information Technology
- Intended Audience :: System Administrators
-
- Operating System :: OS Independent
-
- License :: OSI Approved :: MIT License
- License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)
-
- Programming Language :: Python
- Programming Language :: Python :: 3
- Programming Language :: Python :: 3.8
- Programming Language :: Python :: 3.9
- Programming Language :: Python :: 3.10
- Programming Language :: Python :: 3.11
- Programming Language :: Python :: Implementation
- Programming Language :: Python :: Implementation :: CPython
- Programming Language :: Python :: Implementation :: Jython
- Programming Language :: Python :: Implementation :: PyPy
-
- Topic :: Software Development :: Bug Tracking
- Topic :: Software Development :: Quality Assurance
- Topic :: Software Development :: Testing
-
- Topic :: Utilities
-keywords =
- ansible
-
-[options]
-use_scm_version = True
-python_requires = >=3.8
-package_dir =
- = src
-packages = find:
-zip_safe = False
-install_requires =
- packaging
- PyYAML
- subprocess-tee >= 0.3.5
- jsonschema >= 4.6.0
-
-[options.extras_require]
-docs =
- sphinx-autobuild>=2021.3.14
- sphinx>=5.3.0
- sphinx_ansible_theme
- myst_parser
-test =
- coverage
- flaky
- pip-tools
- pytest>=7.2.0
- pytest-mock
- pytest-plus
-
-[options.packages.find]
-where = src
-
-[options.package_data]
-ansible_compat = py.typed
-
-[codespell]
-skip = .tox,.mypy_cache,build,.git,.eggs,pip-wheel-metadata
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/src/ansible_compat/__init__.py
new/ansible-compat-2.2.6/src/ansible_compat/__init__.py
--- old/ansible-compat-2.2.5/src/ansible_compat/__init__.py 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/src/ansible_compat/__init__.py 2022-11-30
21:44:11.000000000 +0100
@@ -1 +1,9 @@
"""ansible_compat package."""
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+ __version__ = version("ansible-compat")
+except PackageNotFoundError: # pragma: no branch
+ __version__ = "0.1.dev1"
+
+__all__ = ["__version__"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/src/ansible_compat/runtime.py
new/ansible-compat-2.2.6/src/ansible_compat/runtime.py
--- old/ansible-compat-2.2.5/src/ansible_compat/runtime.py 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/src/ansible_compat/runtime.py 2022-11-30
21:44:11.000000000 +0100
@@ -270,7 +270,6 @@
force=True,
)
- # pylint: disable=too-many-branches
def install_requirements(
self, requirement: str, retry: bool = False, offline: bool = False
) -> None:
@@ -296,14 +295,13 @@
if offline:
_logger.warning(
- "Role installation skipped because `ansible-galaxy role
install` command does not support an offline mode."
+ "Offline mode ignored because `ansible-galaxy role
install` command does not support it."
)
- else:
- _logger.info("Running %s", " ".join(cmd))
- result = self.exec(cmd, retry=retry)
- if result.returncode != 0:
- _logger.error(result.stdout)
- raise AnsibleCommandError(result)
+ _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:
@@ -314,25 +312,22 @@
"install",
"-v",
]
- skip = False
if offline:
if self.version_in_range(upper="2.14"):
_logger.warning(
- "Collection install skipped because ansible versions
before 2.14 do not support an offline mode."
+ "Offline mode ignored because it is not supported by
ansible versions before 2.14."
)
- skip = True
else:
cmd.append("--offline")
- 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)
+ 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.5/src/ansible_compat.egg-info/PKG-INFO
new/ansible-compat-2.2.6/src/ansible_compat.egg-info/PKG-INFO
--- old/ansible-compat-2.2.5/src/ansible_compat.egg-info/PKG-INFO
2022-11-18 01:11:15.000000000 +0100
+++ new/ansible-compat-2.2.6/src/ansible_compat.egg-info/PKG-INFO
2022-11-30 21:44:32.000000000 +0100
@@ -1,35 +1,29 @@
Metadata-Version: 2.1
Name: ansible-compat
-Version: 2.2.5
+Version: 2.2.6
Summary: Ansible compatibility goodies
-Home-page: https://github.com/ansible/ansible-compat
-Author: Sorin Sbarnea
-Author-email: ssbar...@redhat.com
+Author-email: Sorin Sbarnea <ssbar...@redhat.com>
+Maintainer-email: Sorin Sbarnea <ssbar...@redhat.com>
License: MIT
-Project-URL: Bug Tracker, https://github.com/ansible/ansible-compat/issues
-Project-URL: CI: GitHub,
https://github.com/ansible/ansible-compat/actions?query=workflow:gh+branch:main+event:push
-Project-URL: Code of Conduct,
https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
-Project-URL: Source Code, https://github.com/ansible/ansible-compat
-Project-URL: Documentation, https://ansible-compat.readthedocs.io/
+Project-URL: homepage, https://github.com/ansible/ansible-compat
+Project-URL: documentation, https://ansible-compat.readthedocs.io/
+Project-URL: repository, https://github.com/ansible/ansible-compat
+Project-URL: changelog, https://github.com/ansible/ansible-compat/releases
Keywords: ansible
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Console
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Information Technology
Classifier: Intended Audience :: System Administrators
-Classifier: Operating System :: OS Independent
Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)
-Classifier: Programming Language :: Python
+Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: Implementation
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: Jython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Programming Language :: Python
+Classifier: Topic :: System :: Systems Administration
Classifier: Topic :: Software Development :: Bug Tracking
Classifier: Topic :: Software Development :: Quality Assurance
Classifier: Topic :: Software Development :: Testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ansible-compat-2.2.5/src/ansible_compat.egg-info/SOURCES.txt
new/ansible-compat-2.2.6/src/ansible_compat.egg-info/SOURCES.txt
--- old/ansible-compat-2.2.5/src/ansible_compat.egg-info/SOURCES.txt
2022-11-18 01:11:15.000000000 +0100
+++ new/ansible-compat-2.2.6/src/ansible_compat.egg-info/SOURCES.txt
2022-11-30 21:44:32.000000000 +0100
@@ -10,7 +10,6 @@
mypy.ini
pyproject.toml
requirements.txt
-setup.cfg
tox.ini
.github/CODEOWNERS
.github/CODE_OF_CONDUCT.md
@@ -38,7 +37,6 @@
src/ansible_compat.egg-info/PKG-INFO
src/ansible_compat.egg-info/SOURCES.txt
src/ansible_compat.egg-info/dependency_links.txt
-src/ansible_compat.egg-info/not-zip-safe
src/ansible_compat.egg-info/requires.txt
src/ansible_compat.egg-info/top_level.txt
test/__init__.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ansible-compat-2.2.5/src/ansible_compat.egg-info/not-zip-safe
new/ansible-compat-2.2.6/src/ansible_compat.egg-info/not-zip-safe
--- old/ansible-compat-2.2.5/src/ansible_compat.egg-info/not-zip-safe
2022-11-18 01:11:15.000000000 +0100
+++ new/ansible-compat-2.2.6/src/ansible_compat.egg-info/not-zip-safe
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/test/test_runtime.py
new/ansible-compat-2.2.6/test/test_runtime.py
--- old/ansible-compat-2.2.5/test/test_runtime.py 2022-11-18
01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/test/test_runtime.py 2022-11-30
21:44:11.000000000 +0100
@@ -662,14 +662,7 @@
"""Ensure that we can make use of offline roles."""
with remember_cwd("test/roles/acme.missing_deps"):
runtime = Runtime(isolated=True)
- 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:
+ with pytest.raises(AnsibleCommandError):
runtime.prepare_environment(install_local=True, offline=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ansible-compat-2.2.5/tox.ini
new/ansible-compat-2.2.6/tox.ini
--- old/ansible-compat-2.2.5/tox.ini 2022-11-18 01:10:56.000000000 +0100
+++ new/ansible-compat-2.2.6/tox.ini 2022-11-30 21:44:11.000000000 +0100
@@ -1,8 +1,8 @@
[tox]
-minversion = 3.16.1
+minversion = 4.0.0rc1
envlist =
lint
- packaging
+ pkg
docs
# matrix assumed current (implicit) is 2.13:
py38{,-ansible29}
@@ -10,9 +10,6 @@
py310{,-devel}
py311{,-devel}
isolated_build = true
-requires =
- setuptools >= 41.4.0
- pip >= 19.3.0
skip_missing_interpreters = True
skipsdist = true
@@ -41,10 +38,11 @@
--editable .[test]
commands =
- ansible --version
+ sh -c "ansible --version | head -n 1"
# We add coverage options but not making them mandatory as we do not want to
force
# pytest users to run coverage when they just want to run a single test with
`pytest -k test`
coverage run -m pytest {posargs:}
+ sh -c "coverage xml || true && coverage report"
commands_pre =
# safety measure to assure we do not accidentally run tests with broken
dependencies
{envpython} -m pip check
@@ -64,6 +62,7 @@
COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}}
PIP_DISABLE_PIP_VERSION_CHECK = 1
PIP_CONSTRAINT = {toxinidir}/requirements.txt
+ py38: PIP_CONSTRAINT = /dev/null
PRE_COMMIT_COLOR = always
PYTEST_REQPASS = 78
FORCE_COLOR = 1
@@ -76,9 +75,7 @@
# locked basepython is needed because to keep constrains.txt predictable
basepython = python3.9
deps =
- pip-tools>=6.8.0
pre-commit>=2.6.0
- setuptools>=51.1.1
skip_install = true
usedevelop = false
commands =
@@ -98,9 +95,11 @@
skip_install = true
commands =
{[testenv:lint]commands} --hook-stage manual
+setenv =
+ {[testenv]setenv}
+ PIP_CONSTRAINT = /dev/null
-[testenv:packaging]
-basepython = python3
+[testenv:pkg]
description =
Build package, verify metadata, install package and assert behavior when
ansible is missing.
deps =
@@ -122,6 +121,7 @@
twine check --strict {toxinidir}/dist/*
# Install the wheel
sh -c "python3 -m pip install {toxinidir}/dist/*.whl"
+ pip uninstall -y ansible-compat
[testenv:py{39,38,37,36}]
description = Run the tests with {basepython} ansible-core 2.11+
