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 2024-10-22 14:53:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-server-fixtures (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.26871
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-server-fixtures"
Tue Oct 22 14:53:00 2024 rev:10 rq:1216912 version:1.8.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-server-fixtures/python-pytest-server-fixtures.changes
2023-08-30 10:24:38.873066959 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.26871/python-pytest-server-fixtures.changes
2024-10-22 14:53:57.590507306 +0200
@@ -1,0 +2,23 @@
+Tue Oct 22 06:08:51 UTC 2024 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Update to 1.8.0:
+ * Drop support for Python 2 and <3.6, removing compatibility code.
+ * Use stdlib unittest.mock instead of mock package.
+ * Removed usage of path.py and path in favour of pathlib.
+ * BREAKING CHANGE: Removed RethinkDB support, as the mirror was no longer
+ available.
+ * Allowed passing through HTTP headers to the server.
+ * Fixed threading log debug messages.
+ * Removed usage of deprecated Thread.setDaemon.
+ * Explicitly close initial Mongo client.
+ * Don't use context manager for CREATE DATABASE
+- Drop patches, included upstream:
+ * pytest-plugins-pr186-fix-psycopg29.patch
+ * remove-mock.patch
+- Refreshed remove-six-and-future.patch
+- Add patch fix-httpd-fixture-path.patch:
+ * Attempt to run httpd with the correct config file
+- Add patch support-64-bit-pids-xvfb.patch:
+ * Support 64 bit PIDs when running Xvfb
+
+-------------------------------------------------------------------
Old:
----
pytest-plugins-pr186-fix-psycopg29.patch
pytest-server-fixtures-1.7.0.tar.gz
remove-mock.patch
New:
----
fix-httpd-fixture-path.patch
pytest-server-fixtures-1.8.0.tar.gz
support-64-bit-pids-xvfb.patch
BETA DEBUG BEGIN:
Old:- Drop patches, included upstream:
* pytest-plugins-pr186-fix-psycopg29.patch
* remove-mock.patch
Old: * pytest-plugins-pr186-fix-psycopg29.patch
* remove-mock.patch
- Refreshed remove-six-and-future.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New:- Refreshed remove-six-and-future.patch
- Add patch fix-httpd-fixture-path.patch:
* Attempt to run httpd with the correct config file
New: * Attempt to run httpd with the correct config file
- Add patch support-64-bit-pids-xvfb.patch:
* Support 64 bit PIDs when running Xvfb
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-server-fixtures.spec ++++++
--- /var/tmp/diff_new_pack.swzBIQ/_old 2024-10-22 14:53:58.338538508 +0200
+++ /var/tmp/diff_new_pack.swzBIQ/_new 2024-10-22 14:53:58.338538508 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-server-fixtures
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,18 @@
Name: python-pytest-server-fixtures
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Extensible server fixtures for pytest
License: MIT
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: pytest-plugins-pr186-fix-psycopg29.patch
-# PATCH-FIX-UPSTREAM remove-mock.patch -- gh#man-group#pytest-plugins#171
-Patch1: remove-mock.patch
# PATCH-FIX-UPSTREAM gh#github.com/man-group/pytest-plugins#221
-Patch2: remove-six-and-future.patch
+Patch0: remove-six-and-future.patch
+# PATCH-FIX-UPSTREAM gh#man-group/pytest-plugins#249
+Patch1: fix-httpd-fixture-path.patch
+# PATCH-FIX-UPSTREAM gh#man-group/pytest-plugins#250
+Patch2: support-64-bit-pids-xvfb.patch
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools-git}
BuildRequires: %{python_module setuptools}
@@ -54,7 +54,6 @@
Suggests: python-pymongo >= 3.6.0
Suggests: python-python-jenkins
Suggests: python-redis
-Suggests: python-rethinkdb
Suggests: redis
Suggests: xauth
Suggests: xdpyinfo
@@ -73,7 +72,6 @@
BuildRequires: %{python_module python-jenkins}
BuildRequires: %{python_module redis}
BuildRequires: %{python_module requests}
-BuildRequires: %{python_module rethinkdb}
BuildRequires: %{python_module retry}
BuildRequires: apache2
BuildRequires: lsof
@@ -95,7 +93,6 @@
# Tests requiring a server
rm tests/integration/test_mongo_server.py
rm tests/integration/test_jenkins_server.py
-rm tests/integration/test_rethink_server.py
rm tests/integration/test_s3_server.py
rm tests/unit/serverclass/test_kubernetes_unit.py
++++++ fix-httpd-fixture-path.patch ++++++
Index: pytest-server-fixtures-1.8.0/pytest_server_fixtures/httpd.py
===================================================================
--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/httpd.py
+++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/httpd.py
@@ -161,7 +161,7 @@ class HTTPDServer(HTTPTestServer):
@property
def run_cmd(self):
- return [CONFIG.httpd_executable, '-f', self.config]
+ return [CONFIG.httpd_executable, '-f', str(self.config)]
def kill(self, retries=5):
pid = self.pid
++++++ pytest-server-fixtures-1.7.0.tar.gz ->
pytest-server-fixtures-1.8.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-pytest-server-fixtures/pytest-server-fixtures-1.7.0.tar.gz
/work/SRC/openSUSE:Factory/.python-pytest-server-fixtures.new.26871/pytest-server-fixtures-1.8.0.tar.gz
differ: char 5, line 1
++++++ remove-six-and-future.patch ++++++
--- /var/tmp/diff_new_pack.swzBIQ/_old 2024-10-22 14:53:58.402541177 +0200
+++ /var/tmp/diff_new_pack.swzBIQ/_new 2024-10-22 14:53:58.406541344 +0200
@@ -14,10 +14,10 @@
pytest-server-fixtures/setup.py | 2 --
6 files changed, 10 insertions(+), 19 deletions(-)
-Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/base.py
+Index: pytest-server-fixtures-1.8.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
+--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/base.py
++++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/base.py
@@ -14,8 +14,6 @@ import logging
import random
import errno
@@ -27,26 +27,19 @@
from pytest_server_fixtures import CONFIG
from pytest_shutil.workspace import Workspace
-@@ -103,13 +101,13 @@ class ProcessReader(threading.Thread):
- self.stderr = stderr
- self.process = process
- self.stream = stream
-- super(ProcessReader, self).__init__()
-+ super().__init__()
- self.setDaemon(True)
-
+@@ -112,7 +110,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, six):
++ 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
+Index: pytest-server-fixtures-1.8.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
+--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/http.py
++++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/http.py
@@ -1,5 +1,4 @@
-from __future__ import print_function
-
@@ -71,19 +64,19 @@
time.sleep(int(i) / 10)
pass
raise e
-@@ -107,7 +105,7 @@ class HTTPTestServer(TestServer):
+@@ -109,7 +107,7 @@ class HTTPTestServer(TestServer):
with self.handle_proxy():
- returned = requests.post('http://%s:%d/%s' %
(self.hostname, self.port, path), data=data)
+ returned = requests.post('http://%s:%d/%s' %
(self.hostname, self.port, path), data=data, headers=headers)
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
+Index: pytest-server-fixtures-1.8.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
+--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/jenkins.py
++++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/jenkins.py
@@ -9,7 +9,6 @@ import os.path
import shutil
@@ -101,10 +94,10 @@
plugins = [plugins]
errors = []
-Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/postgres.py
+Index: pytest-server-fixtures-1.8.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
+--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/postgres.py
++++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/postgres.py
@@ -8,7 +8,6 @@ import subprocess
import errno
@@ -131,10 +124,10 @@
print(msg)
self._fail(msg)
-Index: pytest-server-fixtures-1.7.0/pytest_server_fixtures/s3.py
+Index: pytest-server-fixtures-1.8.0/pytest_server_fixtures/s3.py
===================================================================
---- pytest-server-fixtures-1.7.0.orig/pytest_server_fixtures/s3.py
-+++ pytest-server-fixtures-1.7.0/pytest_server_fixtures/s3.py
+--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/s3.py
++++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/s3.py
@@ -11,7 +11,6 @@ import logging
import os
@@ -160,11 +153,11 @@
+ str(self.datadir),
]
return cmdargs
-Index: pytest-server-fixtures-1.7.0/setup.py
+Index: pytest-server-fixtures-1.8.0/setup.py
===================================================================
---- pytest-server-fixtures-1.7.0.orig/setup.py
-+++ pytest-server-fixtures-1.7.0/setup.py
-@@ -25,8 +25,6 @@ classifiers = [
+--- pytest-server-fixtures-1.8.0.orig/setup.py
++++ pytest-server-fixtures-1.8.0/setup.py
+@@ -20,8 +20,6 @@ classifiers = [
install_requires = ['pytest',
'pytest-shutil',
'pytest-fixture-config',
++++++ support-64-bit-pids-xvfb.patch ++++++
Index: pytest-server-fixtures-1.8.0/pytest_server_fixtures/xvfb.py
===================================================================
--- pytest-server-fixtures-1.8.0.orig/pytest_server_fixtures/xvfb.py
+++ pytest-server-fixtures-1.8.0/pytest_server_fixtures/xvfb.py
@@ -43,7 +43,10 @@ class XvfbServer(object):
def __init__(self):
tmpdir = mkdtemp(prefix='XvfbServer.',
dir=Workspace.get_base_tempdir())
- for servernum in range(os.getpid(), 65536):
+ pid_max = 65536
+ with open('/proc/sys/kernel/pid_max') as pid_max_file:
+ pid_max = int(pid_max_file.read())
+ for servernum in range(os.getpid(), pid_max):
if os.path.exists('/tmp/.X{0}-lock'.format(servernum)):
continue
self.display = ':' + str(servernum)
