SHA256
1
0
forked from pool/ansible-lint

Accepting request 1039498 from home:ojkastl_buildservice:Branch_systemsmanagement_ansible

- rework spec file to define %ansible_python version, which is the
  python version, that ansible is built against, as well as
  %ansible_python_sitelib
- add explicit Requires for python*-subprocess-tee, that is not being added
  automatically
- Add Requires for python-filelock
- Add Requires for python-bracex
- Add version constraint for python-ruamel.yaml

    - Clarify progressive mode documentation (#2708) @MarcinWieczorek

OBS-URL: https://build.opensuse.org/request/show/1039498
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/ansible-lint?expand=0&rev=17
This commit is contained in:
Johannes Kastl 2022-12-02 07:24:13 +00:00 committed by Git OBS Bridge
parent 06044988f7
commit a7be2ca624
2 changed files with 72 additions and 44 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Nov 25 07:12:13 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
- rework spec file to define %ansible_python version, which is the
python version, that ansible is built against, as well as
%ansible_python_sitelib
- add explicit Requires for python*-subprocess-tee, that is not being added
automatically
- Add Requires for python-filelock
- Add Requires for python-bracex
- Add version constraint for python-ruamel.yaml
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 16:00:09 UTC 2022 - Johannes Kastl <kastl@b1-systems.de> Thu Nov 24 16:00:09 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
@ -19,7 +31,7 @@ Thu Nov 24 16:00:09 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
- Docs: usage content edits (#2682) @oraNod - Docs: usage content edits (#2682) @oraNod
- Sort dependencies (#2711) @ssbarnea - Sort dependencies (#2711) @ssbarnea
- Fix loop_var_prefix message list in the docs (#2709) @evgeni - Fix loop_var_prefix message list in the docs (#2709) @evgeni
- Clarify progressive mode documentation (#2708) @MarcinWieczorek - Clarify progressive mode documentation (#2708) @MarcinWieczorek
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 21 09:24:01 UTC 2022 - Johannes Kastl <kastl@b1-systems.de> Mon Nov 21 09:24:01 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>

View File

@ -16,6 +16,17 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%if 0%{?suse_version} < 1550
# Leap15, SLES15
%define ansible_python python310
%define ansible_python_executable python3.10
%define ansible_python_sitelib %python310_sitelib
%else
# Tumbleweed
%define ansible_python python3
%define ansible_python_executable python3
%define ansible_python_sitelib %python3_sitelib
%endif
%global lib_name ansiblelint %global lib_name ansiblelint
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
@ -28,54 +39,59 @@ URL: https://github.com/ansible-community/ansible-lint
Source0: https://github.com/ansible-community/ansible-lint/archive/v%{version}/ansible-lint-%{version}.tar.gz#/ansible-lint-%{version}.tar.gz Source0: https://github.com/ansible-community/ansible-lint/archive/v%{version}/ansible-lint-%{version}.tar.gz#/ansible-lint-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python3-pip BuildRequires: %{ansible_python}-base >= 3.8
BuildRequires: python3-wheel BuildRequires: %{ansible_python}-pip
BuildRequires: %{ansible_python}-wheel
BuildRequires: fdupes BuildRequires: fdupes
# https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L98 # https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L98
# SECTION tests # SECTION tests
BuildRequires: python3-flaky >= 3.7.0 BuildRequires: %{ansible_python}-flaky >= 3.7.0
BuildRequires: python3-pytest BuildRequires: %{ansible_python}-pytest
BuildRequires: python3-pytest-cov BuildRequires: %{ansible_python}-pytest-cov
BuildRequires: python3-pytest-xdist >= 2.1.0 BuildRequires: %{ansible_python}-pytest-xdist >= 2.1.0
BuildRequires: python3-psutil BuildRequires: %{ansible_python}-psutil
BuildRequires: python3-black >= 22.8.0 BuildRequires: %{ansible_python}-black >= 22.8.0
BuildRequires: python3-mypy BuildRequires: %{ansible_python}-mypy
BuildRequires: python3-pylint BuildRequires: %{ansible_python}-pylint
BuildRequires: python3-flake8 BuildRequires: %{ansible_python}-flake8
# /SECTION # /SECTION
# Add runtime requirements (unless required for tests) # Add runtime requirements (unless required for tests)
# to make sure this only builds if they are present # to make sure this only builds if they are present
# https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L64 # https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L64
BuildRequires: ansible-core >= 2.12 BuildRequires: ansible-core >= 2.12
BuildRequires: python3-ansible-compat >= 2.2.5 BuildRequires: %{ansible_python}-ansible-compat >= 2.2.5
BuildRequires: python3-enrich >= 1.2.6 BuildRequires: %{ansible_python}-enrich >= 1.2.6
BuildRequires: python3-filelock >= 3.8.0 BuildRequires: %{ansible_python}-filelock >= 3.8.0
BuildRequires: python3-jsonschema >= 4.17.0 BuildRequires: %{ansible_python}-jsonschema >= 4.17.0
BuildRequires: python3-packaging >= 21.3 BuildRequires: %{ansible_python}-packaging >= 21.3
BuildRequires: python3-PyYAML >= 5.4.1 BuildRequires: %{ansible_python}-PyYAML >= 5.4.1
BuildRequires: python3-rich >= 12.0.0 BuildRequires: %{ansible_python}-rich >= 12.0.0
BuildRequires: python3-ruamel.yaml >= 0.17.21 BuildRequires: (%{ansible_python}-ruamel.yaml >= 0.17.21 and %{ansible_python}-ruamel.yaml < 0.18)
BuildRequires: python3-six BuildRequires: %{ansible_python}-six
BuildRequires: python3-tenacity BuildRequires: %{ansible_python}-subprocess-tee
BuildRequires: python3-wcmatch >= 8.3.2 BuildRequires: %{ansible_python}-tenacity
BuildRequires: python3-yamllint >= 1.26.3 BuildRequires: %{ansible_python}-wcmatch >= 8.3.2
BuildRequires: %{ansible_python}-yamllint >= 1.26.3
# https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L69 # https://github.com/ansible/ansible-lint/blob/main/setup.cfg#L69
Requires: ansible-core >= 2.12 Requires: ansible-core >= 2.12
Requires: python3-ansible-compat >= 2.2.5 Requires: %{ansible_python}-ansible-compat >= 2.2.5
Requires: python3-black >= 22.8.0 Requires: %{ansible_python}-black >= 22.8.0
Requires: python3-enrich >= 1.2.6 Requires: %{ansible_python}-bracex
Requires: python3-jsonschema >= 4.17.0 Requires: %{ansible_python}-enrich >= 1.2.6
Requires: python3-packaging >= 21.3 Requires: %{ansible_python}-filelock
Requires: python3-PyYAML >= 5.4.1 Requires: %{ansible_python}-jsonschema >= 4.17.0
Requires: python3-rich >= 12.0.0 Requires: %{ansible_python}-packaging >= 21.3
Requires: python3-ruamel.yaml >= 0.17.21 Requires: %{ansible_python}-PyYAML >= 5.4.1
Requires: python3-six Requires: %{ansible_python}-rich >= 12.0.0
Requires: python3-tenacity Requires: (%{ansible_python}-ruamel.yaml >= 0.17.21 and %{ansible_python}-ruamel.yaml < 0.18)
Requires: python3-wcmatch >= 8.3.2 Requires: %{ansible_python}-six
Requires: python3-yamllint >= 1.26.3 Requires: %{ansible_python}-subprocess-tee
Requires: %{ansible_python}-tenacity
Requires: %{ansible_python}-wcmatch >= 8.3.2
Requires: %{ansible_python}-yamllint >= 1.26.3
%description %description
Checks playbooks for practices and behavior that could potentially be improved. Checks playbooks for practices and behavior that could potentially be improved.
@ -86,21 +102,21 @@ sed -ri 's/(\[metadata\])/\1\nversion = %{version}/' setup.cfg
sed -i '1{/\/usr\/bin\/env python/d;}' src/ansiblelint/__main__.py sed -i '1{/\/usr\/bin\/env python/d;}' src/ansiblelint/__main__.py
%build %build
python3 -mpip wheel --no-deps --disable-pip-version-check --use-pep517 --no-build-isolation --progress-bar off --verbose . -w build/ %{ansible_python_executable} -mpip wheel --no-deps --disable-pip-version-check --use-pep517 --no-build-isolation --progress-bar off --verbose . -w build/
%install %install
python3 -mpip install --root %{buildroot} --disable-pip-version-check --no-compile --no-deps --progress-bar off build/ansible_lint-*.whl %{ansible_python_executable} -mpip install --root %{buildroot} --disable-pip-version-check --no-compile --no-deps --progress-bar off build/ansible_lint-*.whl
find %{buildroot}/%{python3_sitelib} -name '*.pyc' -delete find %{buildroot}/%{ansible_python_sitelib} -name '*.pyc' -delete
python3 -m compileall %{buildroot}/%{python3_sitelib} %{ansible_python_executable} -m compileall %{buildroot}/%{ansible_python_sitelib}
python3 -O -m compileall %{buildroot}/%{python3_sitelib} %{ansible_python_executable} -O -m compileall %{buildroot}/%{ansible_python_sitelib}
%fdupes -s %{buildroot}/%{python3_sitelib} %fdupes -s %{buildroot}/%{ansible_python_sitelib}
%files %files
%doc README.md %doc README.md
%license COPYING %license COPYING
%{_bindir}/ansible-lint %{_bindir}/ansible-lint
%{python3_sitelib}/%{lib_name}/ %{ansible_python_sitelib}/%{lib_name}/
%{python3_sitelib}/ansible_lint-%{version}.dist-info/ %{ansible_python_sitelib}/ansible_lint-%{version}.dist-info/
%changelog %changelog