Hello community,

here is the log from the commit of package python-pytest for openSUSE:Factory 
checked in at 2019-02-26 22:16:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest (Old)
 and      /work/SRC/openSUSE:Factory/.python-pytest.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pytest"

Tue Feb 26 22:16:26 2019 rev:45 rq:679255 version:3.10.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest/python-pytest.changes      
2019-01-15 13:13:16.932503204 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest.new.28833/python-pytest.changes   
2019-02-26 22:16:34.970187231 +0100
@@ -1,0 +2,6 @@
+Tue Feb 26 13:05:11 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Add patch to build with new pluggy:
+  * new-pluggy.patch
+
+-------------------------------------------------------------------

New:
----
  new-pluggy.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-pytest.spec ++++++
--- /var/tmp/diff_new_pack.wxt5qr/_old  2019-02-26 22:16:35.506187048 +0100
+++ /var/tmp/diff_new_pack.wxt5qr/_new  2019-02-26 22:16:35.510187047 +0100
@@ -37,6 +37,8 @@
 Source:         
https://files.pythonhosted.org/packages/source/p/pytest/pytest-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM fix_test_raises_exception_looks_iterable.patch 
gh#pytest-dev/pytest#4525 mc...@suse.com
 Patch0:         fix_test_raises_exception_looks_iterable.patch
+# PATCH-FIX-UPSTREAM taken from master
+Patch1:         new-pluggy.patch
 BuildRequires:  %{python_module setuptools >= 40.0}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  fdupes

++++++ new-pluggy.patch ++++++
>From a68f4fd2b9e99c82476d0e04ebcf561aeddbcb2e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicodde...@gmail.com>
Date: Fri, 22 Feb 2019 18:49:56 -0300
Subject: [PATCH] Fix test failures after pluggy 1.8 release

pluggy now calls iter_entry_points with different arguments, and tests
which mocked that call need to be updated accordingly.
---
 testing/test_assertion.py |  2 +-
 testing/test_config.py    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: pytest-3.10.1/testing/test_assertion.py
===================================================================
--- pytest-3.10.1.orig/testing/test_assertion.py
+++ pytest-3.10.1/testing/test_assertion.py
@@ -208,7 +208,7 @@ class TestImportHookInstallation(object)
                     import spamplugin
                     return spamplugin
 
-            def iter_entry_points(name):
+            def iter_entry_points(group, name=None):
                 yield DummyEntryPoint()
 
             pkg_resources.iter_entry_points = iter_entry_points
Index: pytest-3.10.1/testing/test_config.py
===================================================================
--- pytest-3.10.1.orig/testing/test_config.py
+++ pytest-3.10.1/testing/test_config.py
@@ -511,8 +511,8 @@ def test_options_on_small_file_do_not_bl
 def test_preparse_ordering_with_setuptools(testdir, monkeypatch):
     pkg_resources = pytest.importorskip("pkg_resources")
 
-    def my_iter(name):
-        assert name == "pytest11"
+    def my_iter(group, name=None):
+        assert group == "pytest11"
 
         class Dist(object):
             project_name = "spam"
@@ -548,8 +548,8 @@ def test_preparse_ordering_with_setuptoo
 def test_setuptools_importerror_issue1479(testdir, monkeypatch):
     pkg_resources = pytest.importorskip("pkg_resources")
 
-    def my_iter(name):
-        assert name == "pytest11"
+    def my_iter(group, name=None):
+        assert group == "pytest11"
 
         class Dist(object):
             project_name = "spam"
@@ -578,8 +578,8 @@ def test_plugin_preparse_prevents_setupt
 
     plugin_module_placeholder = object()
 
-    def my_iter(name):
-        assert name == "pytest11"
+    def my_iter(group, name=None):
+        assert group == "pytest11"
 
         class Dist(object):
             project_name = "spam"
@@ -616,7 +616,7 @@ def test_plugin_preparse_prevents_setupt
 def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, 
should_load):
     pkg_resources = pytest.importorskip("pkg_resources")
 
-    def my_iter(name):
+    def my_iter(group, name=None):
         raise AssertionError("Should not be called")
 
     class PseudoPlugin(object):

Reply via email to