python/python-ZEO
SHA256
15
0
Fork 0
forked from pool/python-ZEO
Code Pull Requests Activity

Accepting request 921257 from home:pgajdos:python

Browse Source 
- added patches
  fix https://github.com/zopefoundation/ZEO/issues/184
  + python-ZEO-no-mock.patch

- 
- added patches
  fix https://github.com/zopefoundation/ZEO/issues/184
  + python-ZEO-no-mock.patch

- version update to 5.2.3
  5.2.3 (2021-08-09)
  ------------------
  - Ensure ``ZEO`` satisfies the ``ZODB >= 5.6`` requirement that
    ``lastTransaction()`` changes only after invalidation processing.
    Violating this requirement can lead to race conditions and
    associated data corruption
    `#166 <https://github.com/zopefoundation/ZEO/issues/166>`_.
  - Add automated tests against the ZODB ``master`` branch
    see `issue 177 <https://github.com/zopefoundation/ZEO/issues/177>`_.
  - Fix data corruption due to race between load and external invalidations.
    See `issue 155 <https://github.com/zopefoundation/ZEO/issues/155>`_.
  - Improve log message when client cache is out of sync with server.
    See `issue 142 <https://github.com/zopefoundation/ZEO/issues/142>`_.
  
  5.2.2 (2020-08-11)
  ------------------
  - Remove support for Python 3.4
  - Provide proper CA test certificates to allow the SSL tests succeed for Py3
  - Replace deprecated occurrences of ``Thread.isAlive()`` by ``Thread.is_alive()``
    See `pull request 154 <https://github.com/zopefoundation/ZEO/pull/154>`_.

OBS-URL: https://build.opensuse.org/request/show/921257
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=23
This commit is contained in:
Matej Cepl
2021-09-24 21:21:32 +00:00
committed by Git OBS Bridge
parent 78d3ad570b
commit cdaaef8e35
5 changed files with 166 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ZEO-5.2.1.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd65379f3c231a411a000c352bb700c4a635d74be947b09b1ce84b514f16beb4
size 276884

3
ZEO-5.2.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f7e1039d3831f03089fd68cf9168fc0237410dcd52ee2668e4bcaec77f5f026
size 288885

113
python-ZEO-no-mock.patch Normal file
View File

@@ -0,0 +1,113 @@
Index: ZEO-5.2.3/src/ZEO/tests/testZEO.py
===================================================================
--- ZEO-5.2.3.orig/src/ZEO/tests/testZEO.py 2021-04-29 11:25:08.000000000 +0200
+++ ZEO-5.2.3/src/ZEO/tests/testZEO.py 2021-09-24 11:27:58.067122104 +0200
@@ -80,7 +80,10 @@ class CreativeGetState(persistent.Persis
class Test_convenience_functions(unittest.TestCase):
def test_ZEO_client_convenience(self):
- import mock
+ try:
+ from unittest import mock as mock
+ except ImportError:
+ import mock
import ZEO
client_thread = mock.Mock(
@@ -90,7 +93,10 @@ class Test_convenience_functions(unittes
self.assertIsInstance(client, ClientStorage)
def test_ZEO_DB_convenience_ok(self):
- import mock
+ try:
+ from unittest import mock as mock
+ except ImportError:
+ import mock
import ZEO
client_mock = mock.Mock(spec=['close'])
@@ -108,7 +114,10 @@ class Test_convenience_functions(unittes
client_mock.close.assert_not_called()
def test_ZEO_DB_convenience_error(self):
- import mock
+ try:
+ from unittest import mock as mock
+ except ImportError:
+ import mock
import ZEO
client_mock = mock.Mock(spec=['close'])
@@ -126,7 +135,10 @@ class Test_convenience_functions(unittes
client_mock.close.assert_called_once()
def test_ZEO_connection_convenience_ok(self):
- import mock
+ try:
+ from unittest import mock as mock
+ except ImportError:
+ import mock
import ZEO
ret = object()
@@ -145,7 +157,10 @@ class Test_convenience_functions(unittes
DB_mock.close.assert_not_called()
def test_ZEO_connection_convenience_value(self):
- import mock
+ try:
+ from unittest import mock as mock
+ except ImportError:
+ import mock
import ZEO
DB_mock = mock.Mock(spec=[
Index: ZEO-5.2.3/src/ZEO/tests/testZEOServer.py
===================================================================
--- ZEO-5.2.3.orig/src/ZEO/tests/testZEOServer.py 2020-07-24 12:54:40.000000000 +0200
+++ ZEO-5.2.3/src/ZEO/tests/testZEOServer.py 2021-09-24 11:28:21.655258841 +0200
@@ -1,6 +1,9 @@
import unittest
-import mock
+try:
+ from unittest import mock as mock
+except ImportError:
+ import mock
import os
from ZEO._compat import PY3
Index: ZEO-5.2.3/src/ZEO/tests/testssl.py
===================================================================
--- ZEO-5.2.3.orig/src/ZEO/tests/testssl.py 2020-07-24 12:54:40.000000000 +0200
+++ ZEO-5.2.3/src/ZEO/tests/testssl.py 2021-09-24 11:28:36.887347135 +0200
@@ -1,9 +1,12 @@
from .._compat import PY3
-import mock
import os
import ssl
import unittest
+try:
+ from unittest import mock as mock
+except ImportError:
+ import mock
from ZODB.config import storageFromString
from ..Exceptions import ClientDisconnected
Index: ZEO-5.2.3/src/ZEO/asyncio/tests.py
===================================================================
--- ZEO-5.2.3.orig/src/ZEO/asyncio/tests.py 2021-04-29 11:25:08.000000000 +0200
+++ ZEO-5.2.3/src/ZEO/asyncio/tests.py 2021-09-24 11:20:02.132363111 +0200
@@ -7,7 +7,10 @@ else:
from zope.testing import setupstack
from concurrent.futures import Future
-import mock
+try:
+ from unittest import mock as mock
+except ImportError:
+ import mock
from ZODB.POSException import ReadOnlyError
from ZODB.utils import maxtid, RLock

42
python-ZEO.changes
View File

@@ -1,3 +1,45 @@
-------------------------------------------------------------------
Fri Sep 24 09:30:12 UTC 2021 - pgajdos@suse.com
- added patches
fix https://github.com/zopefoundation/ZEO/issues/184
+ python-ZEO-no-mock.patch
-------------------------------------------------------------------
Fri Sep 24 09:30:04 UTC 2021 - pgajdos@suse.com
-
- added patches
fix https://github.com/zopefoundation/ZEO/issues/184
+ python-ZEO-no-mock.patch
-------------------------------------------------------------------
Fri Sep 24 08:39:06 UTC 2021 - pgajdos@suse.com
- version update to 5.2.3
5.2.3 (2021-08-09)
------------------
- Ensure ``ZEO`` satisfies the ``ZODB >= 5.6`` requirement that
``lastTransaction()`` changes only after invalidation processing.
Violating this requirement can lead to race conditions and
associated data corruption
`#166 <https://github.com/zopefoundation/ZEO/issues/166>`_.
- Add automated tests against the ZODB ``master`` branch
see `issue 177 <https://github.com/zopefoundation/ZEO/issues/177>`_.
- Fix data corruption due to race between load and external invalidations.
See `issue 155 <https://github.com/zopefoundation/ZEO/issues/155>`_.
- Improve log message when client cache is out of sync with server.
See `issue 142 <https://github.com/zopefoundation/ZEO/issues/142>`_.
5.2.2 (2020-08-11)
------------------
- Remove support for Python 3.4
- Provide proper CA test certificates to allow the SSL tests succeed for Py3
- Replace deprecated occurrences of ``Thread.isAlive()`` by ``Thread.is_alive()``
See `pull request 154 <https://github.com/zopefoundation/ZEO/pull/154>`_.
- Include both modified and just created objects into invalidations.
See `pull request 160 <https://github.com/zopefoundation/ZEO/pull/160>`_.
-------------------------------------------------------------------
Mon Mar 16 06:36:07 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

13
python-ZEO.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-ZEO
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2013 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -20,17 +20,18 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_without python2
Name: python-ZEO
Version: 5.2.1
Version: 5.2.3
Release: 0
Summary: Client-Server storage implementation for ZODB
License: ZPL-2.1
URL: https://github.com/zopefoundation/ZEO
Source: https://files.pythonhosted.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz
Source99: %{name}-rpmlintrc
# https://github.com/zopefoundation/ZEO/issues/184
Patch0: python-ZEO-no-mock.patch
BuildRequires: %{python_module ZConfig}
BuildRequires: %{python_module ZODB >= 5.5.1}
BuildRequires: %{python_module manuel}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module msgpack}
BuildRequires: %{python_module random2}
BuildRequires: %{python_module setuptools}
@@ -53,7 +54,7 @@ Requires: python-zc.lockfile
Requires: python-zdaemon
Requires: python-zope.interface
Requires(post): update-alternatives
Requires(preun): update-alternatives
Requires(preun):update-alternatives
BuildArch: noarch
%if %{with python2}
BuildRequires: python-futures
@@ -76,6 +77,7 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n ZEO-%{version}
%patch0 -p1
# delete backup files
find . -name "*~" -print -delete
# remove unwanted shebang
@@ -97,7 +99,8 @@ sed -i -e 's:msgpack < 0.6:msgpack:g' setup.py
%python_clone -a %{buildroot}%{_bindir}/zeo-nagios
%check
%python_exec setup.py test
pushd src
%pyunittest -v ZEO/tests/test*.py
%post
%python_install_alternative runzeo zeoctl zeopack zeo-nagios