diff --git a/.files b/.files
index 5751700..d7c8b66 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 098c3bb..3dbd436 100644
--- a/.rev
+++ b/.rev
@@ -15,4 +15,12 @@
1061943
+
+ fc6132180193c092922ec51568ccb763
+ 5.0.1
+
+ dimstar_suse
+
+ 1087421
+
diff --git a/molecule-4.0.4.tar.gz b/molecule-4.0.4.tar.gz
deleted file mode 120000
index 2f1a1c3..0000000
--- a/molecule-4.0.4.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibulr4cbj6kqniyitswyu4qlverrmp3uvnlfcbke2ys3eysekzvny
\ No newline at end of file
diff --git a/molecule-5.0.1.tar.gz b/molecule-5.0.1.tar.gz
new file mode 120000
index 0000000..5bf3761
--- /dev/null
+++ b/molecule-5.0.1.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeifl4novzqkisbsdx4glvy7lxxxfmtzn5pr2e2vu2kogo5mhscjpdm
\ No newline at end of file
diff --git a/molecule.changes b/molecule.changes
index 4e93582..234a028 100644
--- a/molecule.changes
+++ b/molecule.changes
@@ -1,4 +1,71 @@
-------------------------------------------------------------------
+Tue May 16 09:18:43 UTC 2023 - Johannes Kastl
+
+- modify %if-condition to allow building for python3.10 or
+ python3.11 on SLES15
+
+-------------------------------------------------------------------
+Wed May 10 07:23:47 UTC 2023 - Johannes Kastl
+
+- update to 5.0.1:
+ * Bugfixes
+ - Avoid using incompatible ansible-compat version (#3906)
+ @ssbarnea
+ - Fix tree example in use case document (#3894) @akira6592
+ - Use api to get driver schema file (#3898) @apatard
+ - Add subprocess-run-check (#3896) @Ruchip16
+ - Add unidiomatic-typecheck check (#3893) @Ruchip16
+ - Add unnecessary-lambda check (#3892) @Ruchip16
+ - Address ruff S, EXE skips (#3889) @ssbarnea
+ - More ruff fixes (#3887) @ssbarnea
+ - Fix colors when displaying plugin versions (#3886) @ssbarnea
+ - Add raise-missing-from rule (#3885) @Ruchip16
+ - Add no-else-return, no-else-raise & logging-not-lazy check
+ (#3884) @Ruchip16
+ - Add implicit-str-concat & inconsistent-return-statements
+ check (#3882) @Ruchip16
+
+-------------------------------------------------------------------
+Wed May 10 06:49:25 UTC 2023 - Johannes Kastl
+
+- update to 5.0.0:
+ * Major Changes
+ - Remove lint command (#3802) @ssbarnea
+ * Minor Changes
+ - Add tags document (#3866) @zhan9san
+ - Replace sphinx documentation with mkdocs (#3811) @ssbarnea
+ - Require ansible-core>=2.12.10 (#3799) @ssbarnea
+ - Remove support for python3.8 (#3770) @ssbarnea
+ - Adopt PEP-621 for packaging (#3767) @ssbarnea
+ * Bugfixes
+ - Refactor dependency locks (#3879) @ssbarnea
+ - Add consider-using-in check (#3880) @Ruchip16
+ - Extend schema validation (#3765) @zhan9san
+ - fix link to monorepo under faq (#3863) @ahmedwonolo
+ - Fix documentation (#3833) @ziegenberg
+ - Documentation: Improve group names (#3812) @ltog
+ - Better indentation in verify template (#3816) @muellerbe
+ - Replace sphinx documentation with mkdocs (#3811) @ssbarnea
+ - Remove embedded dockerfile (#3824) @ssbarnea
+ - Upgrade linters (#3813)
+ - Add support for custom driver name (#3795) @gciavarrini
+ - Document molecule-plugins package (#3805) @ssbarnea
+ - Update test dependencies (#3800) @ssbarnea
+ - Fix rpm building (#3798) @ssbarnea
+ - Reorder heading and reformat badges (#3778) @mamercad
+ - Fixed typo in docs/ci.rst (#3796) @mitchellroe
+ - Bump test dependencies (#3797) @ssbarnea
+ * Deprecations
+ - Remove lint command (#3802) @ssbarnea
+- drop patch skip-broken-test.patch
+
+-------------------------------------------------------------------
+Mon May 8 13:47:59 UTC 2023 - Johannes Kastl
+
+- add macro definitions to allow building for SLES15 with
+ python3.11 instead of python3
+
+-------------------------------------------------------------------
Sun Jan 29 15:48:17 UTC 2023 - Lukas Müller
- Disable deprecation warnings and tests requiring internet connection.
diff --git a/molecule.spec b/molecule.spec
index 4dfeef3..5dc5462 100644
--- a/molecule.spec
+++ b/molecule.spec
@@ -16,68 +16,80 @@
#
-# Disable tests on Leap due to missing build dependencies.
-%if 0%{?suse_version} > 1500
-%bcond_without test
+%{?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
%else
-%bcond_with test
+# Tumbleweed
+%define pythons python3
+%define ansible_python python3
+%define ansible_python_executable python3
+%define ansible_python_sitelib %python3_sitelib
%endif
-%define pythons python3
+%bcond_without test
Name: molecule
-Version: 4.0.4
+Version: 5.0.1
Release: 0
Summary: Aids in the development and testing of Ansible roles
License: MIT
URL: https://github.com/ansible-community/molecule
Source: https://files.pythonhosted.org/packages/source/m/molecule/molecule-%{version}.tar.gz
-Patch0: skip-broken-test.patch
-BuildRequires: python3-pip
-BuildRequires: python3-rpm-macros
-BuildRequires: python3-setuptools
-BuildRequires: python3-wheel
+BuildRequires: python-rpm-macros
+BuildRequires: %{ansible_python}-pip
+BuildRequires: %{ansible_python}-setuptools
+BuildRequires: %{ansible_python}-wheel
%if %{with test}
-BuildRequires: ansible-lint
-BuildRequires: python3-ansi2html
-BuildRequires: python3-coverage
-BuildRequires: python3-filelock
-BuildRequires: python3-pexpect
-BuildRequires: python3-pytest
-BuildRequires: python3-pytest-html
-BuildRequires: python3-pytest-mock
-BuildRequires: python3-pytest-plus
-BuildRequires: python3-pytest-testinfra
-BuildRequires: python3-pytest-xdist
-BuildRequires: python3-yamllint
+BuildRequires: ansible-lint >= 6.12.1
+BuildRequires: %{ansible_python}-ansi2html >= 1.8.0
+BuildRequires: %{ansible_python}-coverage >= 7.0.3
+BuildRequires: %{ansible_python}-filelock >= 3.9.0
+BuildRequires: %{ansible_python}-pexpect >= 4.8.0
+BuildRequires: %{ansible_python}-pytest >= 7.2.0
+BuildRequires: %{ansible_python}-pytest-mock >= 3.10.0
+BuildRequires: %{ansible_python}-pytest-plus >= 0.4.0
+BuildRequires: %{ansible_python}-pytest-testinfra >= 7.0.0
+BuildRequires: %{ansible_python}-pytest-xdist >= 3.1.0
+BuildRequires: %{ansible_python}-yamllint
# Runtime dependencies of molecule
-BuildRequires: ansible
-BuildRequires: python3
-BuildRequires: python3-Jinja2 >= 2.11.3
-BuildRequires: python3-PyYAML >= 5.1
-BuildRequires: python3-ansible-compat >= 2.2.0
-BuildRequires: python3-click >= 8.0
-BuildRequires: python3-click-help-colors >= 0.9
-BuildRequires: python3-cookiecutter >= 1.7.3
-BuildRequires: python3-enrich >= 1.2.7
-BuildRequires: python3-jsonschema >= 4.9.1
-BuildRequires: python3-packaging
-BuildRequires: python3-pluggy >= 0.7.1
-BuildRequires: python3-rich >= 9.5.1
+BuildRequires: ansible-core
+BuildRequires: %{ansible_python}
+BuildRequires: %{ansible_python}-Jinja2 >= 2.11.3
+BuildRequires: %{ansible_python}-PyYAML >= 5.1
+BuildRequires: (%{ansible_python}-ansible-compat >= 2.2.0 with %{ansible_python}-ansible-compat < 4)
+BuildRequires: %{ansible_python}-click >= 8.0
+BuildRequires: %{ansible_python}-click-help-colors >= 0.9
+BuildRequires: %{ansible_python}-cookiecutter >= 1.7.3
+BuildRequires: %{ansible_python}-enrich >= 1.2.7
+BuildRequires: %{ansible_python}-jsonschema >= 4.9.1
+BuildRequires: %{ansible_python}-packaging
+BuildRequires: %{ansible_python}-pluggy >= 0.7.1
+BuildRequires: %{ansible_python}-rich >= 9.5.1
%endif
BuildRequires: fdupes
-Requires: ansible
-Requires: python3
-Requires: python3-Jinja2 >= 2.11.3
-Requires: python3-PyYAML >= 5.1
-Requires: python3-ansible-compat >= 2.2.0
-Requires: python3-click >= 8.0
-Requires: python3-click-help-colors >= 0.9
-Requires: python3-cookiecutter >= 1.7.3
-Requires: python3-enrich >= 1.2.7
-Requires: python3-jsonschema >= 4.9.1
-Requires: python3-packaging
-Requires: python3-pluggy >= 0.7.1
-Requires: python3-rich >= 9.5.1
+Requires: ansible-core
+Requires: %{ansible_python}-base
+Requires: %{ansible_python}-Jinja2 >= 2.11.3
+Requires: %{ansible_python}-PyYAML >= 5.1
+Requires: (%{ansible_python}-ansible-compat >= 2.2.0 with %{ansible_python}-ansible-compat < 4)
+Requires: %{ansible_python}-click >= 8.0
+Requires: %{ansible_python}-click-help-colors >= 0.9
+Requires: %{ansible_python}-cookiecutter >= 1.7.3
+Requires: %{ansible_python}-enrich >= 1.2.7
+Requires: %{ansible_python}-jsonschema >= 4.9.1
+Requires: %{ansible_python}-packaging
+Requires: %{ansible_python}-pluggy >= 0.7.1
+Requires: %{ansible_python}-rich >= 9.5.1
BuildArch: noarch
%description
@@ -91,32 +103,27 @@ testing scenarios.
%prep
%setup -q -n molecule-%{version}
-%patch0 -p1
-
%build
-# On Leap < 15.4, setuptools is too old to support omitting setup.py.
-%if 0%{?sle_version} < 150400
-echo 'from setuptools import setup; setup()' > setup.py
-%endif
%pyproject_wheel
%install
%pyproject_install
-sed -i '1{\@^#!/usr/bin/env ansible-playbook@d}' %{buildroot}%{python3_sitelib}/molecule/data/validate-dockerfile.yml
-sed -i '1{\@^#!/usr/bin/python@d}' %{buildroot}%{python3_sitelib}/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py
+sed -i '1{\@^#!/usr/bin/python@d}' %{buildroot}%{ansible_python_sitelib}/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py
-%fdupes %{buildroot}%{python3_sitelib}
+%fdupes %{buildroot}%{ansible_python_sitelib}
%check
%if %{with test}
export PATH="%{buildroot}%{_bindir}:$PATH"
-%pytest -k 'not (test_command_dependency or test_sample_collection)' -W ignore:'There is no current event loop'
+sed -i '/^addopts/s/ --color=yes//' pyproject.toml
+
+%pytest -k 'not (test_command_dependency or test_sample_collection or test_command_init_role[delegated] or test_command_init_scenario[delegated] or test_molecule_schema)' -W ignore:'There is no current event loop'
%endif
%files
%license LICENSE
-%{python3_sitelib}/*
+%{ansible_python_sitelib}/*
%{_bindir}/molecule
%changelog
diff --git a/skip-broken-test.patch b/skip-broken-test.patch
deleted file mode 100644
index 303b526..0000000
--- a/skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/molecule/test/functional/test_command.py b/src/molecule/test/functional/test_command.py
-index 047064d..9e3bc82 100644
---- a/src/molecule/test/functional/test_command.py
-+++ b/src/molecule/test/functional/test_command.py
-@@ -98,6 +98,7 @@ def test_command_converge(scenario_to_test, with_scenario, scenario_name):
- assert run_command(cmd).returncode == 0
-
-
-+@pytest.mark.skip(reason="Broken since default python changed from 3.8 to 3.10.")
- @pytest.mark.extensive
- @pytest.mark.parametrize(
- "scenario_to_test, driver_name, scenario_name",