From ad5773f1f71787c4198adf3e5a59f3d079507063 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Tue, 09 Apr 2024 21:16:41 +0200 Subject: [PATCH] python/pytest-ignore-flaky: update to 2.2.0 --- components/python/pytest-ignore-flaky/Makefile | 20 ++++-- components/python/pytest-ignore-flaky/patches/01-pytest-disable-plugins.patch | 32 +++++++--- components/python/pytest-ignore-flaky/python-integrate-project.conf | 9 +++ components/python/pytest-ignore-flaky/manifests/sample-manifest.p5m | 13 ++-- components/python/pytest-ignore-flaky/pkg5 | 8 +- components/python/pytest-ignore-flaky/test/results-all.master | 73 ++---------------------- components/python/pytest-ignore-flaky/pytest-ignore-flaky-PYVER.p5m | 11 +-- 7 files changed, 66 insertions(+), 100 deletions(-) diff --git a/components/python/pytest-ignore-flaky/Makefile b/components/python/pytest-ignore-flaky/Makefile index dd94f6e..32f8051 100644 --- a/components/python/pytest-ignore-flaky/Makefile +++ b/components/python/pytest-ignore-flaky/Makefile @@ -14,18 +14,16 @@ # $WS_TOOLS/python-integrate-project pytest-ignore-flaky # -BUILD_STYLE = setup.py +BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = pytest-ignore-flaky -HUMAN_VERSION = 2.1.0 +HUMAN_VERSION = 2.2.0 COMPONENT_SUMMARY = pytest-ignore-flaky - ignore failures from flaky tests (pytest plugin) -COMPONENT_PROJECT_URL = https://github.com/schettino72/pytest-ignore-flaky -COMPONENT_ARCHIVE_URL = \ - https://files.pythonhosted.org/packages/5e/1d/ec566a60a02fad11b5a5a73be05e6bfae0b776d006be758e70d1cc5011a0/pytest-ignore-flaky-2.1.0.tar.gz +COMPONENT_PROJECT_URL = https://github.com/coherent-oss/pytest-ignore-flaky COMPONENT_ARCHIVE_HASH = \ - sha256:bbdb2615df1a4854661ec52fff102b9ea47dcc08df6e46da521e0468d36467e1 + sha256:e3fb91f3513babf8ad1a4175592be81da208ebd99b2f772cf6ce5cbfb94c7e64 COMPONENT_LICENSE = MIT COMPONENT_LICENSE_FILE = LICENSE @@ -33,6 +31,16 @@ include $(WS_MAKE_RULES)/common.mk +# https://github.com/pytest-dev/pytest/issues/12186 +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-ignore-flaky +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-salt-factories +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-system-statistics + # Auto-generated dependencies PYTHON_REQUIRED_PACKAGES += library/python/pytest +PYTHON_REQUIRED_PACKAGES += library/python/setuptools +PYTHON_REQUIRED_PACKAGES += library/python/wheel PYTHON_REQUIRED_PACKAGES += runtime/python diff --git a/components/python/pytest-ignore-flaky/manifests/sample-manifest.p5m b/components/python/pytest-ignore-flaky/manifests/sample-manifest.p5m index 94dcee3..9de3d05 100644 --- a/components/python/pytest-ignore-flaky/manifests/sample-manifest.p5m +++ b/components/python/pytest-ignore-flaky/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2023 <contributor> +# Copyright 2024 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -23,12 +23,11 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/LICENSE +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/METADATA +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/WHEEL +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/entry_points.txt +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/top_level.txt file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky.py # python modules are unusable without python runtime binary diff --git a/components/python/pytest-ignore-flaky/patches/01-pytest-disable-plugins.patch b/components/python/pytest-ignore-flaky/patches/01-pytest-disable-plugins.patch index 71dd9e4..b2f0e5e 100644 --- a/components/python/pytest-ignore-flaky/patches/01-pytest-disable-plugins.patch +++ b/components/python/pytest-ignore-flaky/patches/01-pytest-disable-plugins.patch @@ -1,13 +1,23 @@ -https://github.com/jaraco/pytest-enabler/issues/11 +https://github.com/pytest-dev/pytest/issues/12186 ---- pytest-ignore-flaky-2.1.0/tests/test_functional.py.orig -+++ pytest-ignore-flaky-2.1.0/tests/test_functional.py -@@ -34,7 +34,7 @@ +Please note it is currently impossible to uninstall typeguard because +package/pkg transitionally depends on it. The dependency chain is: + +package/pkg -> cherrypy -> jaraco-collections -> jaraco-text -> inflect -> typeguard + +--- pytest-ignore-flaky-2.2.0/tests/test_functional.py.orig ++++ pytest-ignore-flaky-2.2.0/tests/test_functional.py +@@ -1,3 +1,5 @@ ++import pytest ++ + pytest_plugins = ('pytester',) - def test_fail_flaky(testdir, capsys): - test = testdir.makepyfile(TEST_SAMPLE) -- rec = testdir.inline_run(test) -+ rec = testdir.inline_run('-p', 'no:plugin-enabled options', test) - results = get_results(rec) - assert results['test_ok', 'call'] == 'passed' - assert results['test_mf', 'call'] == 'failed' + +@@ -50,6 +52,7 @@ + """ + + ++@pytest.mark.skip(reason="fails with typeguard installed") + def test_success_flaky(testdir, capsys): + test = testdir.makepyfile(TEST_SAMPLE_SUCCEED) + rec = testdir.inline_run('--ignore-flaky', test) diff --git a/components/python/pytest-ignore-flaky/pkg5 b/components/python/pytest-ignore-flaky/pkg5 index 9ba6b7a..a463793 100644 --- a/components/python/pytest-ignore-flaky/pkg5 +++ b/components/python/pytest-ignore-flaky/pkg5 @@ -1,11 +1,13 @@ { "dependencies": [ "library/python/pytest-39", + "library/python/setuptools-39", + "library/python/wheel-39", "runtime/python-39" ], "fmris": [ - "library/python/pytest-ignore-flaky-39", - "library/python/pytest-ignore-flaky" + "library/python/pytest-ignore-flaky", + "library/python/pytest-ignore-flaky-39" ], "name": "pytest-ignore-flaky" -} \ No newline at end of file +} diff --git a/components/python/pytest-ignore-flaky/pytest-ignore-flaky-PYVER.p5m b/components/python/pytest-ignore-flaky/pytest-ignore-flaky-PYVER.p5m index c7e5a81..89ea090 100644 --- a/components/python/pytest-ignore-flaky/pytest-ignore-flaky-PYVER.p5m +++ b/components/python/pytest-ignore-flaky/pytest-ignore-flaky-PYVER.p5m @@ -23,12 +23,11 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/LICENSE +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/METADATA +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/WHEEL +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/entry_points.txt +file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky-$(HUMAN_VERSION).dist-info/top_level.txt file path=usr/lib/python$(PYVER)/vendor-packages/pytest_ignore_flaky.py # python modules are unusable without python runtime binary diff --git a/components/python/pytest-ignore-flaky/python-integrate-project.conf b/components/python/pytest-ignore-flaky/python-integrate-project.conf index f8659e5..dfbf803 100644 --- a/components/python/pytest-ignore-flaky/python-integrate-project.conf +++ b/components/python/pytest-ignore-flaky/python-integrate-project.conf @@ -14,3 +14,12 @@ # %patch% 01-pytest-disable-plugins.patch + +%include-3% +# https://github.com/pytest-dev/pytest/issues/12186 +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-ignore-flaky +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-salt-factories +TEST_CONFLICTING_PACKAGES.python += library/python/pytest-system-statistics diff --git a/components/python/pytest-ignore-flaky/test/results-all.master b/components/python/pytest-ignore-flaky/test/results-all.master index 43a6d8b..e54fbf7 100644 --- a/components/python/pytest-ignore-flaky/test/results-all.master +++ b/components/python/pytest-ignore-flaky/test/results-all.master @@ -2,78 +2,17 @@ platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON) cachedir: .pytest_cache rootdir: $(@D) +configfile: pyproject.toml collecting ... collected 3 items -tests/test_functional.py::test_fail_flaky PASSED tests/test_functional.py::test_ignore_flaky PASSED -tests/test_functional.py::test_success_flaky PASSED +tests/test_functional.py::test_fail_flaky PASSED +tests/test_functional.py::test_success_flaky SKIPPED (fails with typ...) =============================== warnings summary =============================== tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pytest_reporter/__init__.py:1: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html - from pkg_resources import get_distribution, DistributionNotFound - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('paste')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('flufl')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze.sphinx')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2350: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(parent) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('sphinxcontrib')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py::test_ignore_flaky -tests/test_functional.py::test_fail_flaky -tests/test_functional.py::test_success_flaky - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zc')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) - -tests/test_functional.py: 45 warnings - $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zope')`. - Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages - declare_namespace(pkg) + $(PYTHON_DIR)/vendor-packages/pytest_benchmark/logger.py:46: PytestBenchmarkWarning: Benchmarks are automatically disabled because xdist plugin is active.Benchmarks cannot be performed reliably in a parallelized environment. + warner(PytestBenchmarkWarning(text)) -- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html -======== 3 passed, 75 warnings ======== +======== 2 passed, 1 skipped, 1 warning ======== -- Gitblit v1.9.3