Hello community, here is the log from the commit of package python-pytest4 for openSUSE:Factory checked in at 2019-09-30 15:53:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest4 (Old) and /work/SRC/openSUSE:Factory/.python-pytest4.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest4" Mon Sep 30 15:53:23 2019 rev:9 rq:733112 version:4.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest4/python-pytest4.changes 2019-09-19 15:49:45.387306549 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytest4.new.2352/python-pytest4.changes 2019-09-30 15:53:24.610172893 +0200 @@ -1,0 +2,7 @@ +Wed Sep 25 09:34:48 UTC 2019 - Tomáš Chvátal <tchva...@suse.com> + +- Update more the py38 compat patchset by taking more commits from + upstream: + * importlib-py38.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ importlib-py38.patch ++++++ --- /var/tmp/diff_new_pack.SLBg33/_old 2019-09-30 15:53:25.166171413 +0200 +++ /var/tmp/diff_new_pack.SLBg33/_new 2019-09-30 15:53:25.166171413 +0200 @@ -1,3 +1,21 @@ +From c54cbd63c8bc5db6626d26c0f3339a552a6b1a90 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <m...@hroncok.cz> +Date: Wed, 3 Jul 2019 01:46:44 +0200 +Subject: [PATCH] Replace importlib_metadata with importlib.metadata on Python + 3.8+ + +Fixes https://github.com/pytest-dev/pytest/issues/5537 +--- + setup.py | 2 +- + src/_pytest/compat.py | 6 ++++++ + src/_pytest/config/__init__.py | 2 +- + testing/acceptance_test.py | 2 +- + testing/test_assertion.py | 3 ++- + testing/test_config.py | 3 +-- + testing/test_entry_points.py | 2 +- + 8 files changed, 15 insertions(+), 7 deletions(-) + create mode 100644 changelog/5537.bugfix.rst + Index: pytest-4.6.5/setup.py =================================================================== --- pytest-4.6.5.orig/setup.py @@ -11,3 +29,100 @@ "wcwidth", ] +Index: pytest-4.6.5/src/_pytest/compat.py +=================================================================== +--- pytest-4.6.5.orig/src/_pytest/compat.py ++++ pytest-4.6.5/src/_pytest/compat.py +@@ -61,6 +61,12 @@ else: + return None + + ++if sys.version_info >= (3, 8): ++ from importlib import metadata as importlib_metadata # noqa ++else: ++ import importlib_metadata # noqa ++ ++ + def _format_args(func): + return str(signature(func)) + +Index: pytest-4.6.5/src/_pytest/config/__init__.py +=================================================================== +--- pytest-4.6.5.orig/src/_pytest/config/__init__.py ++++ pytest-4.6.5/src/_pytest/config/__init__.py +@@ -13,7 +13,6 @@ import sys + import types + import warnings + +-import importlib_metadata + import py + import six + from packaging.version import Version +@@ -33,6 +32,7 @@ from _pytest._code import ExceptionInfo + from _pytest._code import filter_traceback + from _pytest.compat import lru_cache + from _pytest.compat import safe_str ++from _pytest.compat import importlib_metadata + from _pytest.outcomes import fail + from _pytest.outcomes import Skipped + from _pytest.warning_types import PytestConfigWarning +Index: pytest-4.6.5/testing/acceptance_test.py +=================================================================== +--- pytest-4.6.5.orig/testing/acceptance_test.py ++++ pytest-4.6.5/testing/acceptance_test.py +@@ -9,11 +9,11 @@ import textwrap + import types + + import attr +-import importlib_metadata + import py + import six + + import pytest ++from _pytest.compat import importlib_metadata + from _pytest.main import EXIT_NOTESTSCOLLECTED + from _pytest.main import EXIT_USAGEERROR + from _pytest.warnings import SHOW_PYTEST_WARNINGS_ARG +Index: pytest-4.6.5/testing/test_assertion.py +=================================================================== +--- pytest-4.6.5.orig/testing/test_assertion.py ++++ pytest-4.6.5/testing/test_assertion.py +@@ -179,7 +179,8 @@ class TestImportHookInstallation(object) + return check + """, + "mainwrapper.py": """\ +- import pytest, importlib_metadata ++ import pytest ++ from _pytest.compat import importlib_metadata + + class DummyEntryPoint(object): + name = 'spam' +Index: pytest-4.6.5/testing/test_config.py +=================================================================== +--- pytest-4.6.5.orig/testing/test_config.py ++++ pytest-4.6.5/testing/test_config.py +@@ -6,10 +6,9 @@ from __future__ import print_function + import sys + import textwrap + +-import importlib_metadata +- + import _pytest._code + import pytest ++from _pytest.compat import importlib_metadata + from _pytest.config import _iter_rewritable_modules + from _pytest.config.exceptions import UsageError + from _pytest.config.findpaths import determine_setup +Index: pytest-4.6.5/testing/test_entry_points.py +=================================================================== +--- pytest-4.6.5.orig/testing/test_entry_points.py ++++ pytest-4.6.5/testing/test_entry_points.py +@@ -3,7 +3,7 @@ from __future__ import absolute_import + from __future__ import division + from __future__ import print_function + +-import importlib_metadata ++from _pytest.compat import importlib_metadata + + + def test_pytest_entry_points_are_identical():
