Johannes Kastl 2024-06-13 13:54:12 +00:00 committed by Git OBS Bridge
parent a32d1a6215
commit f3d81f2d32
4 changed files with 43 additions and 29 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2174a12dcad2dc2f342ea82876898f568a0b66c53568600bf80577158fcba1c
size 179068

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82d02b2548830f37a53517b65c823c4af371069406c7d213b5c9041d45e0c5b6
size 148802

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Sun Jun 9 16:25:46 UTC 2024 - Ben Greiner <code@bnavigator.de>
- Use pytest-xdist in order to avoid non-terminating processes in
tests
- Fix files section and version info (setuptools_scm required to
build)
- Simplify python flavor declaration
-------------------------------------------------------------------
Sat May 18 08:39:38 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- update to 2.4.0:
* Bug Fixes
- Honor inventory filepath by @Akasurde in #1065
- Ensure that UTC ISO8601 datetimes include timezone info by
@sivel in #1238
- Fix for non-str ident by @Shrews in #1268
- Pass inventory directory path instead of file path when using
containerization by @christophert in #1304
- Validate inventory from CLI early by @Shrews in #1307
- Allow shutil to copy into existing isolation directory by
@christophert in #1311
- Fix invalid inventory with relative pvt data dir by @Shrews
in #1316
- Add lib symlink to bwrap call by @christophert in #1312
-------------------------------------------------------------------
Sat Mar 16 14:25:23 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>

View File

@ -19,27 +19,18 @@
%{?sle15_python_module_pythons}
%if 0%{?suse_version} < 1550
# Leap15, SLES15
%if %pythons == "python310"
%define ansible_python python310
%define ansible_python_executable python3.10
%define ansible_python_sitelib %python310_sitelib
%endif
%if %pythons == "python311"
%define ansible_python python311
%define ansible_python_executable python3.11
%define ansible_python_sitelib %python311_sitelib
%endif
# Leap15, SLES15: There is always only one entry in pythons
%define ansible_python %{pythons}
%define ansible_python_sitelib %{expand:%%%{ansible_python}_sitelib}
%else
# Tumbleweed
%define pythons python3
%define ansible_python python3
%define ansible_python_executable python3
%define ansible_python_sitelib %python3_sitelib
%endif
Name: ansible-runner
Version: 2.3.6
Version: 2.4.0
Release: 0
Summary: Run ansible-playbook inside an execution environment
License: Apache-2.0
@ -48,8 +39,11 @@ Source: https://files.pythonhosted.org/packages/source/a/%{module_name}/
BuildArch: noarch
BuildRequires: python-rpm-macros
# https://github.com/ansible/ansible-runner/blob/devel/setup.cfg#L31
BuildRequires: %{ansible_python}-base >= 3.8
BuildRequires: %{ansible_python}-base >= 3.9
BuildRequires: %{ansible_python}-setuptools
BuildRequires: %{ansible_python}-setuptools_scm
BuildRequires: %{ansible_python}-pip
BuildRequires: %{ansible_python}-wheel
BuildRequires: %{ansible_python}-pbr
# https://github.com/ansible/ansible-runner/blob/devel/setup.cfg#L32
BuildRequires: ansible-core
@ -73,8 +67,6 @@ Requires: %{ansible_python}-packaging
Requires: %{ansible_python}-pexpect >= 4.5
Requires: %{ansible_python}-python-daemon
Requires: %{ansible_python}-PyYAML
Requires: %{ansible_python}-six
Requires: %{ansible_python}-setuptools
# https://github.com/ansible/ansible-runner/blob/devel/setup.cfg#L38
# importlib-metadata not required, as we are using python3.10 or higher
@ -85,17 +77,15 @@ Consistent Ansible Python API and CLI with container and process isolation runti
%setup -q -n %{module_name}-%{version}
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%fdupes %{buildroot}%{ansible_python_sitelib}
sed -i '1s|^#!%{_bindir}/env bash$|#!%{_bindir}/bash|' %{buildroot}/%{_datadir}/%{module_name}/utils/entrypoint.sh
%check
# disable coverage tests
sed -i '/cov/d' pytest.ini
sed -i -e '/cov/d' -e '/color/d' pytest.ini
# Ignored tests, upstream bug report:
# https://github.com/ansible/ansible-runner/issues/1237
@ -108,16 +98,13 @@ IGNORED_TESTS+='test_multiline_blank_write[pexpect] or '
IGNORED_TESTS+='test_run_command_long_running or '
IGNORED_TESTS+='test_run_command_long_running_children'
export PATH=%{buildroot}%{_bindir}:$PATH
%pytest -k "not ($IGNORED_TESTS)"
%pytest -n auto -k "not ($IGNORED_TESTS)"
%files
%doc README.md
%license LICENSE.md
%{_bindir}/%{module_name}
%{ansible_python_sitelib}/ansible_runner
%{ansible_python_sitelib}/ansible_runner-*-info
%dir %{_datadir}/%{module_name}/
%dir %{_datadir}/%{module_name}/utils/
%{_datadir}/%{module_name}/utils/entrypoint.sh
%{ansible_python_sitelib}/ansible_runner-%{version}.dist-info
%changelog