Marcel Telka
2024-01-03 5646dd8074f3f2e8ce10e486b61350b40ddf06b3
python/pytest: update to 7.4.4

1 files deleted
7 files modified
226 ■■■■ changed files
components/python/pytest/Makefile 34 ●●●● patch | view | raw | blame | history
components/python/pytest/manifests/sample-manifest.p5m 2 ●●● patch | view | raw | blame | history
components/python/pytest/patches/01-pytest-disable-plugins.patch 135 ●●●●● patch | view | raw | blame | history
components/python/pytest/patches/02-test-rmtree.patch 4 ●●●● patch | view | raw | blame | history
components/python/pytest/patches/03-test-pdb+expect.patch 4 ●●●● patch | view | raw | blame | history
components/python/pytest/patches/04-test-pdb-randomly-fails.patch 4 ●●●● patch | view | raw | blame | history
components/python/pytest/python-integrate-project.conf 29 ●●●● patch | view | raw | blame | history
components/python/pytest/test/results-all.master 14 ●●●●● patch | view | raw | blame | history
components/python/pytest/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME =        pytest
HUMAN_VERSION =            7.4.3
HUMAN_VERSION =            7.4.4
COMPONENT_SUMMARY =        pytest - pytest: simple powerful testing with Python
COMPONENT_PROJECT_URL =        https://docs.pytest.org/en/latest/
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/38/d4/174f020da50c5afe9f5963ad0fc5b56a4287e3586e3de5b3c8bce9c547b4/pytest-7.4.3.tar.gz
    https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3/pytest-7.4.4.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5
    sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE
@@ -36,10 +36,30 @@
include $(WS_MAKE_RULES)/common.mk
# In a case the pytest-xprocess is installed we need the following workaround
COMPONENT_PRE_TEST_ACTION +=    $(RM) $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
COMPONENT_PRE_TEST_ACTION +=    $(SYMLINK) $(PYTHON_VENDOR_PACKAGES)/py $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
COMPONENT_POST_TEST_ACTION +=    $(RM) $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
# Workaround to run pytest indirectly (see tox.ini).
#
# This is needed because tox is unable to find pytest in proto area due to the
# following bug in tox-current-env:
# https://github.com/fedora-python/tox-current-env/issues/68
COMPONENT_TEST_ENV += _PYTEST_TOX_COVERAGE_RUN="python -m"
# https://github.com/pytest-dev/pluggy/issues/457
# https://github.com/bitprophet/pytest-relaxed/issues/28
# https://github.com/christiansandberg/pytest-reporter/issues/8
# https://github.com/jaraco/pytest-enabler/issues/10
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-metadata
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-perf
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-relaxed
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-reporter
TEST_CONFLICTING_PACKAGES.python += library/python/typeguard
# This is needed to get consistent test results.
# See also https://github.com/pytest-dev/pytest/issues/11761
TEST_REQUIRED_PACKAGES.python += library/python/pytest-xdist
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/exceptiongroup
components/python/pytest/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)
components/python/pytest/patches/01-pytest-disable-plugins.patch
File was deleted
components/python/pytest/patches/02-test-rmtree.patch
@@ -1,5 +1,5 @@
--- pytest-7.4.3/testing/_py/test_local.py.orig
+++ pytest-7.4.3/testing/_py/test_local.py
--- pytest-7.4.4/testing/_py/test_local.py.orig
+++ pytest-7.4.4/testing/_py/test_local.py
@@ -617,6 +617,7 @@
         assert str(local()) == os.getcwd()
 
components/python/pytest/patches/03-test-pdb+expect.patch
@@ -1,7 +1,7 @@
https://github.com/pytest-dev/pytest/issues/10042#issuecomment-1274655510
--- pytest-7.4.3/testing/test_debugging.py.orig
+++ pytest-7.4.3/testing/test_debugging.py
--- pytest-7.4.4/testing/test_debugging.py.orig
+++ pytest-7.4.4/testing/test_debugging.py
@@ -372,7 +372,6 @@
         result = pytester.runpytest_subprocess("--pdb", ".")
         result.stdout.fnmatch_lines(["-> import unknown"])
components/python/pytest/patches/04-test-pdb-randomly-fails.patch
@@ -1,5 +1,5 @@
--- pytest-7.4.3/testing/test_debugging.py.orig
+++ pytest-7.4.3/testing/test_debugging.py
--- pytest-7.4.4/testing/test_debugging.py.orig
+++ pytest-7.4.4/testing/test_debugging.py
@@ -667,6 +667,7 @@
         self.flush(child)
 
components/python/pytest/python-integrate-project.conf
@@ -13,7 +13,6 @@
# Copyright 2022 Marcel Telka
#
%patch% 01-pytest-disable-plugins.patch
%patch% 02-test-rmtree.patch
%patch% 03-test-pdb+expect.patch
%patch% 04-test-pdb-randomly-fails.patch
@@ -24,7 +23,27 @@
# - Userland testing framework (see setup.py.mk)
PYTHON_TEST_BOOTSTRAP = yes
%include-3%
# In a case the pytest-xprocess is installed we need the following workaround
COMPONENT_PRE_TEST_ACTION +=    $(RM) $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
COMPONENT_PRE_TEST_ACTION +=    $(SYMLINK) $(PYTHON_VENDOR_PACKAGES)/py $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
COMPONENT_POST_TEST_ACTION +=    $(RM) $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)/py ;
# Workaround to run pytest indirectly (see tox.ini).
#
# This is needed because tox is unable to find pytest in proto area due to the
# following bug in tox-current-env:
# https://github.com/fedora-python/tox-current-env/issues/68
COMPONENT_TEST_ENV += _PYTEST_TOX_COVERAGE_RUN="python -m"
# https://github.com/pytest-dev/pluggy/issues/457
# https://github.com/bitprophet/pytest-relaxed/issues/28
# https://github.com/christiansandberg/pytest-reporter/issues/8
# https://github.com/jaraco/pytest-enabler/issues/10
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-checkdocs
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-console-scripts
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-metadata
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-perf
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-randomly
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-relaxed
TEST_CONFLICTING_PACKAGES.python += library/python/pytest-reporter
TEST_CONFLICTING_PACKAGES.python += library/python/typeguard
# This is needed to get consistent test results.
# See also https://github.com/pytest-dev/pytest/issues/11761
TEST_REQUIRED_PACKAGES.python += library/python/pytest-xdist
components/python/pytest/test/results-all.master
@@ -1,13 +1,13 @@
py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
py$(PYV): commands[0]> pytest
py$(PYV): commands[0]> python -m pytest
============================= test session starts ==============================
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON)
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(@D)/.tox/py$(PYV)/bin/python
cachedir: .tox/py$(PYV)/.pytest_cache
hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase(PosixPath('$(@D)/.hypothesis/examples'))
rootdir: $(@D)
configfile: pyproject.toml
testpaths: testing
collecting ... collected 3468 items
collecting ... collected 3471 items
testing/_py/test_local.py::TestBinaryAndTextMethods::test_default_encoding PASSED
testing/_py/test_local.py::TestBinaryAndTextMethods::test_read_binwrite PASSED
@@ -99,7 +99,7 @@
testing/_py/test_local.py::TestLocalPath::test_listdir_sorted PASSED
testing/_py/test_local.py::TestLocalPath::test_load PASSED
testing/_py/test_local.py::TestLocalPath::test_long_filenames XFAIL
testing/_py/test_local.py::TestLocalPath::test_make_numbered_dir_multiprocess_safe PASSED
testing/_py/test_local.py::TestLocalPath::test_make_numbered_dir_multiprocess_safe XPASS
testing/_py/test_local.py::TestLocalPath::test_mkdir_and_remove PASSED
testing/_py/test_local.py::TestLocalPath::test_mkdtemp_creation PASSED
testing/_py/test_local.py::TestLocalPath::test_move_dir PASSED
@@ -1303,6 +1303,7 @@
testing/test_assertrewrite.py::TestAssertionPass::test_hook_not_called_without_hookimpl PASSED
testing/test_assertrewrite.py::TestAssertionPass::test_option_default PASSED
testing/test_assertrewrite.py::TestAssertionRewrite::test_assert_already_has_message PASSED
testing/test_assertrewrite.py::TestAssertionRewrite::test_assert_handling_raise_in__iter__ PASSED
testing/test_assertrewrite.py::TestAssertionRewrite::test_assert_raising__bool__in_comparison PASSED
testing/test_assertrewrite.py::TestAssertionRewrite::test_assertion_message PASSED
testing/test_assertrewrite.py::TestAssertionRewrite::test_assertion_message_escape PASSED
@@ -1362,6 +1363,7 @@
testing/test_assertrewrite.py::TestIssue11028::test_assertion_walrus_operator_gt_operand_function PASSED
testing/test_assertrewrite.py::TestIssue11028::test_assertion_walrus_operator_in_operand PASSED
testing/test_assertrewrite.py::TestIssue11028::test_assertion_walrus_operator_in_operand_json_dumps PASSED
testing/test_assertrewrite.py::TestIssue11140::test_constant_not_picked_as_module_docstring PASSED
testing/test_assertrewrite.py::TestIssue11239::test_assertion_walrus_different_test_cases PASSED
testing/test_assertrewrite.py::TestIssue2121::test_rewrite_python_files_contain_subdirs PASSED
testing/test_assertrewrite.py::TestIssue925::test_long_case PASSED
@@ -1643,6 +1645,7 @@
testing/test_collection.py::TestNodeKeywords::test_no_under PASSED
testing/test_collection.py::TestNodeKeywords::test_unpacked_marks_added_to_keywords PASSED
testing/test_collection.py::TestPrunetraceback::test_collect_report_postprocessing XFAIL
testing/test_collection.py::TestPrunetraceback::test_collection_error_traceback_is_clean PASSED
testing/test_collection.py::TestPrunetraceback::test_custom_repr_failure PASSED
testing/test_collection.py::TestSession::test_collect_custom_nodes_multi_id PASSED
testing/test_collection.py::TestSession::test_collect_protocol_method PASSED
@@ -3490,6 +3493,7 @@
    warner(PytestBenchmarkWarning(text))
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
======== 3399 passed, 57 skipped, 12 xfailed, 7 warnings ========
=========================== short test summary info ============================
======== 3401 passed, 57 skipped, 12 xfailed, 1 xpassed, 7 warnings ========
  py$(PYV): OK
  congratulations :)