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-12-10 21:17:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-server-fixtures (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.1835
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-server-fixtures"
Sat Dec 10 21:17:58 2022 rev:8 rq:1041859 version:1.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-server-fixtures/python-pytest-server-fixtures.changes
2022-04-22 21:55:52.138916392 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.1835/python-pytest-server-fixtures.changes
2022-12-10 21:18:18.349724006 +0100
@@ -1,0 +2,23 @@
+Fri Dec 9 12:03:36 UTC 2022 - Daniel Garcia <[email protected]>
+
+- Remove remote path for pytest-plugins-pr186-fix-psycopg29.patch to avoid
+ download that patch from github
+
+-------------------------------------------------------------------
+Fri Dec 9 11:57:05 UTC 2022 - Daniel Garcia <[email protected]>
+
+- Update source pytest-plugins-pr186-fix-psycopg29.patch
+
+-------------------------------------------------------------------
+Thu Dec 8 12:33:38 UTC 2022 - [email protected]
+
+- do not require six
+- use -p1 as quilt does not like higher
+- modified patches
+ % pytest-plugins-pr186-fix-psycopg29.patch (refreshed)
+ % remove-mock.patch (refreshed)
+- added patches
+ fix https://github.com/man-group/pytest-plugins/issues/209
+ + python-pytest-server-fixtures-no-six.patch
+
+-------------------------------------------------------------------
New:
----
python-pytest-server-fixtures-no-six.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-server-fixtures.spec ++++++
--- /var/tmp/diff_new_pack.gaWvJQ/_old 2022-12-10 21:18:18.877727093 +0100
+++ /var/tmp/diff_new_pack.gaWvJQ/_new 2022-12-10 21:18:18.889727163 +0100
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-pytest-server-fixtures
Version: 1.7.0
@@ -27,9 +26,11 @@
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
+Patch0: pytest-plugins-pr186-fix-psycopg29.patch
# PATCH-FEATURE-UPSTREAM remove-mock.patch -- gh#man-group#pytest-plugins#171
Patch1: remove-mock.patch
+# https://github.com/man-group/pytest-plugins/issues/209
+Patch2: python-pytest-server-fixtures-no-six.patch
BuildRequires: %{python_module setuptools-git}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -45,7 +46,6 @@
Requires: python-pytest-shutil
Requires: python-requests
Requires: python-retry
-Requires: python-six
Suggests: apache2
Suggests: postgresql-server-devel
Suggests: python-boto3
@@ -77,7 +77,6 @@
BuildRequires: %{python_module requests}
BuildRequires: %{python_module rethinkdb}
BuildRequires: %{python_module retry}
-BuildRequires: %{python_module six}
%if %{with python2}
BuildRequires: python2-mock
%endif
@@ -96,7 +95,7 @@
Extensible server fixtures for pytest
%prep
-%autosetup -p2 -n pytest-server-fixtures-%{version}
+%autosetup -p1 -n pytest-server-fixtures-%{version}
# Tests requiring a server
rm tests/integration/test_mongo_server.py
++++++ pytest-plugins-pr186-fix-psycopg29.patch ++++++
--- /var/tmp/diff_new_pack.gaWvJQ/_old 2022-12-10 21:18:18.909727280 +0100
+++ /var/tmp/diff_new_pack.gaWvJQ/_new 2022-12-10 21:18:18.913727303 +0100
@@ -11,9 +11,9 @@
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pytest-server-fixtures/pytest_server_fixtures/postgres.py
b/pytest-server-fixtures/pytest_server_fixtures/postgres.py
-index 7c6ea33..aeab36a 100644
---- a/pytest-server-fixtures/pytest_server_fixtures/postgres.py
-+++ b/pytest-server-fixtures/pytest_server_fixtures/postgres.py
+index 7c6ea33d..aeab36ad 100644
+--- a/pytest_server_fixtures/postgres.py
++++ b/pytest_server_fixtures/postgres.py
@@ -103,18 +103,22 @@ def run_cmd(self):
def check_server_up(self):
++++++ python-pytest-server-fixtures-no-six.patch ++++++
Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/base.py
===================================================================
--- pytest-server-fixtures-1.7.0.orig/pytest_server_fixtures/base.py
+++ pytest-server-fixtures-1.7.0/pytest_server_fixtures/base.py
@@ -14,8 +14,6 @@ import logging
import random
import errno
-from six import string_types
-
from pytest_server_fixtures import CONFIG
from pytest_shutil.workspace import Workspace
@@ -109,7 +107,7 @@ class ProcessReader(threading.Thread):
def run(self):
while self.process.poll() is None:
l = self.stream.readline()
- if not isinstance(l, string_types):
+ if not isinstance(l, str):
l = l.decode('utf-8')
if l.strip():
Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/http.py
===================================================================
--- pytest-server-fixtures-1.7.0.orig/pytest_server_fixtures/http.py
+++ pytest-server-fixtures-1.7.0/pytest_server_fixtures/http.py
@@ -9,7 +9,6 @@ import sys
import pytest
import requests
from contextlib import contextmanager
-from six.moves import http_client
from pytest_shutil.env import unset_env
from pytest_server_fixtures import CONFIG
@@ -83,7 +82,7 @@ class HTTPTestServer(TestServer):
with self.handle_proxy():
returned = requests.get('http://%s:%d/%s' %
(self.hostname, self.port, path))
return returned.json() if as_json else returned
- except (http_client.BadStatusLine, requests.ConnectionError) as e:
+ except (http.client.BadStatusLine, requests.ConnectionError) as e:
time.sleep(int(i) / 10)
pass
raise e
@@ -107,7 +106,7 @@ class HTTPTestServer(TestServer):
with self.handle_proxy():
returned = requests.post('http://%s:%d/%s' %
(self.hostname, self.port, path), data=data)
return returned.json() if as_json else returned
- except (http_client.BadStatusLine, requests.ConnectionError) as e:
+ except (http.client.BadStatusLine, requests.ConnectionError) as e:
time.sleep(int(i) / 10)
pass
raise e
Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/jenkins.py
===================================================================
--- pytest-server-fixtures-1.7.0.orig/pytest_server_fixtures/jenkins.py
+++ pytest-server-fixtures-1.7.0/pytest_server_fixtures/jenkins.py
@@ -9,7 +9,6 @@ import os.path
import shutil
import pytest
-import six
from pytest_server_fixtures import CONFIG
from pytest_fixture_config import yield_requires_config
@@ -95,7 +94,7 @@ class JenkinsTestServer(HTTPTestServer):
if plugins is None:
plugins = available_plugins.keys()
else:
- if isinstance(plugins, six.string_types):
+ if isinstance(plugins, str):
plugins = [plugins]
errors = []
Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/postgres.py
===================================================================
--- pytest-server-fixtures-1.7.0.orig/pytest_server_fixtures/postgres.py
+++ pytest-server-fixtures-1.7.0/pytest_server_fixtures/postgres.py
@@ -8,7 +8,6 @@ import subprocess
import errno
import pytest
-from six import text_type
from pytest_server_fixtures import CONFIG
from pytest_fixture_config import requires_config
@@ -65,7 +64,7 @@ class PostgresServer(TestServer):
try:
self.pg_bin =
subprocess.check_output([CONFIG.pg_config_executable,
"--bindir"]).decode('utf-8').rstrip()
except OSError as e:
- msg = "Failed to get pg_config --bindir: " + text_type(e)
+ msg = "Failed to get pg_config --bindir: " + str(e)
print(msg)
self._fail(msg)
initdb_path = self.pg_bin + '/initdb'
@@ -76,7 +75,7 @@ class PostgresServer(TestServer):
try:
subprocess.check_call([initdb_path, str(self.workspace / 'db')])
except OSError as e:
- msg = "Failed to launch postgres: " + text_type(e)
+ msg = "Failed to launch postgres: " + str(e)
print(msg)
self._fail(msg)
++++++ remove-mock.patch ++++++
--- /var/tmp/diff_new_pack.gaWvJQ/_old 2022-12-10 21:18:18.937727444 +0100
+++ /var/tmp/diff_new_pack.gaWvJQ/_new 2022-12-10 21:18:18.941727467 +0100
@@ -1,7 +1,7 @@
-Index: a/pytest-server-fixtures-1.7.0/tests/integration/test_xvfb_server.py
+Index: a/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
+--- a/tests/integration/test_xvfb_server.py
++++ b/tests/integration/test_xvfb_server.py
@@ -4,7 +4,11 @@ import time
from itertools import chain, repeat
@@ -15,10 +15,10 @@
import pytest
from pytest import raises
-Index:
a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_docker_unit.py
+Index: a/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
+--- a/tests/unit/serverclass/test_docker_unit.py
++++ b/tests/unit/serverclass/test_docker_unit.py
@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
@@ -29,10 +29,10 @@
from pytest_server_fixtures.serverclass.docker import DockerServer
-Index:
a/pytest-server-fixtures-1.7.0/tests/unit/serverclass/test_thread_unit.py
+Index: a/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
+--- a/tests/unit/serverclass/test_thread_unit.py
++++ b/tests/unit/serverclass/test_thread_unit.py
@@ -1,4 +1,8 @@
-from mock import sentinel, patch, Mock
+try:
@@ -43,10 +43,10 @@
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
+Index: a/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
+--- a/tests/unit/test_server_unit.py
++++ b/tests/unit/test_server_unit.py
@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
@@ -57,10 +57,10 @@
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
+Index: 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
+--- a/tests/unit/test_server_v2_unit.py
++++ b/tests/unit/test_server_v2_unit.py
@@ -1,4 +1,8 @@
-from mock import create_autospec, sentinel, call, patch, Mock
+try:
