Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-server-fixtures for
openSUSE:Factory checked in at 2022-04-22 21:54:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-server-fixtures (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.1538
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-server-fixtures"
Fri Apr 22 21:54:39 2022 rev:7 rq:971975 version:1.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-server-fixtures/python-pytest-server-fixtures.changes
2022-03-21 20:11:29.776408393 +0100
+++
/work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.1538/python-pytest-server-fixtures.changes
2022-04-22 21:55:52.138916392 +0200
@@ -1,0 +2,6 @@
+Thu Apr 21 20:21:33 UTC 2022 - Ben Greiner <[email protected]>
+
+- Add remove-mock.patch because mock WAS required and is not pulled
+ in anymore by something else -- gh#man-group/pytest-plugins#171
+
+-------------------------------------------------------------------
New:
----
remove-mock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-server-fixtures.spec ++++++
--- /var/tmp/diff_new_pack.4KZHTF/_old 2022-04-22 21:55:52.714917049 +0200
+++ /var/tmp/diff_new_pack.4KZHTF/_new 2022-04-22 21:55:52.718917053 +0200
@@ -17,16 +17,19 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-pytest-server-fixtures
Version: 1.7.0
Release: 0
-Summary: Extensible server fixures for py.test
+Summary: Extensible server fixtures for pytest
License: MIT
Group: Development/Languages/Python
URL: https://github.com/man-group/pytest-plugins
Source:
https://files.pythonhosted.org/packages/source/p/pytest-server-fixtures/pytest-server-fixtures-%{version}.tar.gz
# PATCH-FIX-UPSTREAM pytest-plugins-pr186-fix-psycopg29.patch --
gh#man-group/pytest-plugins#186
Patch0:
https://github.com/man-group/pytest-plugins/pull/186.patch#/pytest-plugins-pr186-fix-psycopg29.patch
+# PATCH-FEATURE-UPSTREAM remove-mock.patch -- gh#man-group#pytest-plugins#171
+Patch1: remove-mock.patch
BuildRequires: %{python_module setuptools-git}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -75,6 +78,9 @@
BuildRequires: %{python_module rethinkdb}
BuildRequires: %{python_module retry}
BuildRequires: %{python_module six}
+%if %{with python2}
+BuildRequires: python2-mock
+%endif
BuildRequires: apache2
BuildRequires: lsof
BuildRequires: net-tools-deprecated
@@ -87,7 +93,7 @@
%python_subpackages
%description
-Extensible server fixures for py.test.
+Extensible server fixtures for pytest
%prep
%autosetup -p2 -n pytest-server-fixtures-%{version}
@@ -120,6 +126,7 @@
%files %{python_files}
%doc CHANGES.md README.md
%license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/pytest_server_fixtures
+%{python_sitelib}/pytest_server_fixtures-%{version}*-info
%changelog
++++++ remove-mock.patch ++++++
Index: a/pytest-server-fixtures-1.7.0/tests/integration/test_xvfb_server.py
===================================================================
--- a/pytest-server-fixtures-1.7.0/tests/integration/test_xvfb_server.py
+++ b/pytest-server-fixtures-1.7.0/tests/integration/test_xvfb_server.py
@@ -4,7 +4,11 @@ import time
from itertools import chain, repeat
-from mock import patch
+try:
+ from unittest.mock import patch
+except ImportError:
+ from mock import patch
+
import pytest
from pytest import raises
Index: a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_docker_unit.py
===================================================================
--- a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_docker_unit.py
+++ b/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_docker_unit.py
@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
+ from unittest.mock import sentinel, patch, Mock
+except ImportError:
+ from mock import sentinel, patch, Mock
+
from pytest_server_fixtures.serverclass.docker import DockerServer
Index: a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_thread_unit.py
===================================================================
--- a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_thread_unit.py
+++ b/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_thread_unit.py
@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
+ from unittest.mock import sentinel, patch, Mock
+except ImportError:
+ from mock import sentinel, patch, Mock
+
from pytest_server_fixtures import CONFIG
from pytest_server_fixtures.serverclass.thread import ThreadServer
Index: a/pytest-server-fixtures-1.7.0/tests/unit/test_server_unit.py
===================================================================
--- a/pytest-server-fixtures-1.7.0/tests/unit/test_server_unit.py
+++ b/pytest-server-fixtures-1.7.0/tests/unit/test_server_unit.py
@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
+ from unittest.mock import create_autospec, sentinel, call, patch, Mock
+except ImportError:
+ from mock import create_autospec, sentinel, call, patch, Mock
+
from pytest_server_fixtures.base import TestServer as _TestServer # So that
pytest doesnt think this is a test case
Index: pytest-server-fixtures-1.7.0/tests/unit/test_server_v2_unit.py
===================================================================
--- a/pytest-server-fixtures-1.7.0/tests/unit/test_server_v2_unit.py
+++ b/pytest-server-fixtures-1.7.0/tests/unit/test_server_v2_unit.py
@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
+ from unittest.mock import create_autospec, sentinel, call, patch, Mock
+except ImportError:
+ from mock import create_autospec, sentinel, call, patch, Mock
+
from pytest_server_fixtures.base2 import TestServerV2 as _TestServerV2 # TODO:
why as _TestServerV2?
