From e313cc02700d42def148953ddbea709f16d6baf4565e9e8975ca246d1b7b8c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 17 May 2022 11:14:33 +0000 Subject: [PATCH] Accepting request 977734 from home:pgajdos:python - version update to 3.25.0 3.25.0 ====== Features -------- * Ensure the driver can connect when invalid peer hosts are in system.peers (PYTHON-1260) * Implement protocol v5 checksumming (PYTHON-1258) * Fix the default cqlengine connection mechanism to work with Astra (PYTHON-1265) Bug Fixes --------- * Asyncore race condition cause logging exception on shutdown (PYTHON-1266) * Update list of reserved keywords (PYTHON-1269) Others ------ * Drop Python 3.4 support (PYTHON-1220) * Update security documentation and examples to use PROTOCOL_TLS (PYTHON-1264) 3.24.0 ====== Features -------- * Make geomet an optional dependency at runtime (PYTHON-1237) * Add use_default_tempdir cloud config options (PYTHON-1245) * Tcp flow control for libevreactor (PYTHON-1248) Bug Fixes --------- * Unable to connect to a cloud cluster using Ubuntu 20.04 (PYTHON-1238) * PlainTextAuthProvider fails with unicode chars and Python3 (PYTHON-1241) * [GRAPH] Graph execution profiles consistency level are not set to LOCAL_QUORUM with a cloud cluster (PYTHON-1240) * [GRAPH] Can't write data in a Boolean field using the Fluent API (PYTHON-1239) * [GRAPH] Fix elementMap() result deserialization (PYTHON-1233) OBS-URL: https://build.opensuse.org/request/show/977734 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cassandra-driver?expand=0&rev=45 --- 3.23.0.tar.gz | 3 - 3.25.0.tar.gz | 3 + python-cassandra-driver-no-mock.patch | 276 ++++++++++++++++++++++++++ python-cassandra-driver.changes | 42 ++++ python-cassandra-driver.spec | 8 +- 5 files changed, 327 insertions(+), 5 deletions(-) delete mode 100644 3.23.0.tar.gz create mode 100644 3.25.0.tar.gz create mode 100644 python-cassandra-driver-no-mock.patch diff --git a/3.23.0.tar.gz b/3.23.0.tar.gz deleted file mode 100644 index e9c564f..0000000 --- a/3.23.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f51ad2f63fa2f70f4e76c753d415bad239fb92f29a487a834abdb32feb93495 -size 758086 diff --git a/3.25.0.tar.gz b/3.25.0.tar.gz new file mode 100644 index 0000000..11c05d1 --- /dev/null +++ b/3.25.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dda20f8c57fb227b44b65252c318c78d0edeb4956b19466f7161a936a70a2953 +size 780970 diff --git a/python-cassandra-driver-no-mock.patch b/python-cassandra-driver-no-mock.patch new file mode 100644 index 0000000..da0595f --- /dev/null +++ b/python-cassandra-driver-no-mock.patch @@ -0,0 +1,276 @@ +diff -upr python-driver-3.25.0.orig/tests/unit/advanced/cloud/test_cloud.py python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py +--- python-driver-3.25.0.orig/tests/unit/advanced/cloud/test_cloud.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py 2022-05-17 12:54:41.654450817 +0200 +@@ -19,7 +19,7 @@ except ImportError: + from cassandra import DriverException + from cassandra.datastax import cloud + +-from mock import patch ++from unittest.mock import patch + + from tests import notwindows + +diff -upr python-driver-3.25.0.orig/tests/unit/advanced/test_insights.py python-driver-3.25.0/tests/unit/advanced/test_insights.py +--- python-driver-3.25.0.orig/tests/unit/advanced/test_insights.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/advanced/test_insights.py 2022-05-17 12:54:41.658450843 +0200 +@@ -19,7 +19,7 @@ except ImportError: + import unittest # noqa + + import logging +-from mock import sentinel ++from unittest.mock import sentinel + import sys + + from cassandra import ConsistencyLevel +diff -upr python-driver-3.25.0.orig/tests/unit/advanced/test_policies.py python-driver-3.25.0/tests/unit/advanced/test_policies.py +--- python-driver-3.25.0.orig/tests/unit/advanced/test_policies.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/advanced/test_policies.py 2022-05-17 12:54:41.658450843 +0200 +@@ -16,7 +16,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import Mock ++from unittest.mock import Mock + + from cassandra.pool import Host + from cassandra.policies import RoundRobinPolicy +diff -upr python-driver-3.25.0.orig/tests/unit/cqlengine/test_connection.py python-driver-3.25.0/tests/unit/cqlengine/test_connection.py +--- python-driver-3.25.0.orig/tests/unit/cqlengine/test_connection.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/cqlengine/test_connection.py 2022-05-17 12:54:41.658450843 +0200 +@@ -21,7 +21,7 @@ from cassandra.cluster import _ConfigMod + from cassandra.cqlengine import connection + from cassandra.query import dict_factory + +-from mock import Mock ++from unittest.mock import Mock + + + class ConnectionTest(unittest.TestCase): +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_asyncioreactor.py python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_asyncioreactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -10,7 +10,7 @@ except (ImportError, SyntaxError): + from tests import is_monkey_patched, connection_class + from tests.unit.io.utils import TimerCallback, TimerTestMixin + +-from mock import patch ++from unittest.mock import patch + + import unittest + import time +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_asyncorereactor.py python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_asyncorereactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -16,7 +16,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import patch ++from unittest.mock import patch + import socket + import cassandra.io.asyncorereactor as asyncorereactor + from cassandra.io.asyncorereactor import AsyncoreConnection +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_eventletreactor.py python-driver-3.25.0/tests/unit/io/test_eventletreactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_eventletreactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_eventletreactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -22,7 +22,7 @@ from tests.unit.io.utils import TimerTes + from tests import notpypy, EVENT_LOOP_MANAGER + + from eventlet import monkey_patch +-from mock import patch ++from unittest.mock import patch + + try: + from cassandra.io.eventletreactor import EventletConnection +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_geventreactor.py python-driver-3.25.0/tests/unit/io/test_geventreactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_geventreactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_geventreactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -26,7 +26,7 @@ try: + except ImportError: + GeventConnection = None # noqa + +-from mock import patch ++from unittest.mock import patch + + + skip_condition = GeventConnection is None or EVENT_LOOP_MANAGER != "gevent" +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_libevreactor.py python-driver-3.25.0/tests/unit/io/test_libevreactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_libevreactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_libevreactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -16,7 +16,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import patch, Mock ++from unittest.mock import patch, Mock + import weakref + import socket + +diff -upr python-driver-3.25.0.orig/tests/unit/io/test_twistedreactor.py python-driver-3.25.0/tests/unit/io/test_twistedreactor.py +--- python-driver-3.25.0.orig/tests/unit/io/test_twistedreactor.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/test_twistedreactor.py 2022-05-17 12:54:41.658450843 +0200 +@@ -16,7 +16,7 @@ try: + import unittest2 as unittest + except ImportError: + import unittest +-from mock import Mock, patch ++from unittest.mock import Mock, patch + + from cassandra.connection import DefaultEndPoint + +diff -upr python-driver-3.25.0.orig/tests/unit/io/utils.py python-driver-3.25.0/tests/unit/io/utils.py +--- python-driver-3.25.0.orig/tests/unit/io/utils.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/io/utils.py 2022-05-17 12:54:41.658450843 +0200 +@@ -28,7 +28,7 @@ from functools import wraps + from itertools import cycle + import six + from six import binary_type, BytesIO +-from mock import Mock ++from unittest.mock import Mock + + import errno + import logging +diff -upr python-driver-3.25.0.orig/tests/unit/test_cluster.py python-driver-3.25.0/tests/unit/test_cluster.py +--- python-driver-3.25.0.orig/tests/unit/test_cluster.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_cluster.py 2022-05-17 12:54:41.658450843 +0200 +@@ -19,7 +19,7 @@ except ImportError: + import logging + import six + +-from mock import patch, Mock ++from unittest.mock import patch, Mock + + from cassandra import ConsistencyLevel, DriverException, Timeout, Unavailable, RequestExecutionException, ReadTimeout, WriteTimeout, CoordinationFailure, ReadFailure, WriteFailure, FunctionFailure, AlreadyExists,\ + InvalidRequest, Unauthorized, AuthenticationFailed, OperationTimedOut, UnsupportedOperation, RequestValidationException, ConfigurationException, ProtocolVersion +diff -upr python-driver-3.25.0.orig/tests/unit/test_concurrent.py python-driver-3.25.0/tests/unit/test_concurrent.py +--- python-driver-3.25.0.orig/tests/unit/test_concurrent.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_concurrent.py 2022-05-17 12:54:41.658450843 +0200 +@@ -19,7 +19,7 @@ except ImportError: + import unittest # noqa + + from itertools import cycle +-from mock import Mock ++from unittest.mock import Mock + import time + import threading + from six.moves.queue import PriorityQueue +diff -upr python-driver-3.25.0.orig/tests/unit/test_connection.py python-driver-3.25.0/tests/unit/test_connection.py +--- python-driver-3.25.0.orig/tests/unit/test_connection.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_connection.py 2022-05-17 12:54:41.658450843 +0200 +@@ -16,7 +16,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import Mock, ANY, call, patch ++from unittest.mock import Mock, ANY, call, patch + import six + from six import BytesIO + import time +diff -upr python-driver-3.25.0.orig/tests/unit/test_control_connection.py python-driver-3.25.0/tests/unit/test_control_connection.py +--- python-driver-3.25.0.orig/tests/unit/test_control_connection.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_control_connection.py 2022-05-17 12:54:41.658450843 +0200 +@@ -20,7 +20,7 @@ except ImportError: + import six + + from concurrent.futures import ThreadPoolExecutor +-from mock import Mock, ANY, call ++from unittest.mock import Mock, ANY, call + + from cassandra import OperationTimedOut, SchemaTargetType, SchemaChangeType + from cassandra.protocol import ResultMessage, RESULT_KIND_ROWS +diff -upr python-driver-3.25.0.orig/tests/unit/test_endpoints.py python-driver-3.25.0/tests/unit/test_endpoints.py +--- python-driver-3.25.0.orig/tests/unit/test_endpoints.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_endpoints.py 2022-05-17 12:54:41.658450843 +0200 +@@ -15,7 +15,7 @@ import itertools + + from cassandra.connection import DefaultEndPoint, SniEndPoint, SniEndPointFactory + +-from mock import patch ++from unittest.mock import patch + + + def socket_getaddrinfo(*args): +diff -upr python-driver-3.25.0.orig/tests/unit/test_metadata.py python-driver-3.25.0/tests/unit/test_metadata.py +--- python-driver-3.25.0.orig/tests/unit/test_metadata.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_metadata.py 2022-05-17 12:54:41.658450843 +0200 +@@ -18,7 +18,7 @@ except ImportError: + + from binascii import unhexlify + import logging +-from mock import Mock ++from unittest.mock import Mock + import os + import six + import timeit +diff -upr python-driver-3.25.0.orig/tests/unit/test_policies.py python-driver-3.25.0/tests/unit/test_policies.py +--- python-driver-3.25.0.orig/tests/unit/test_policies.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_policies.py 2022-05-17 12:54:41.662450867 +0200 +@@ -18,7 +18,7 @@ except ImportError: + import unittest # noqa + + from itertools import islice, cycle +-from mock import Mock, patch, call ++from unittest.mock import Mock, patch, call + from random import randint + import six + from six.moves._thread import LockType +diff -upr python-driver-3.25.0.orig/tests/unit/test_protocol.py python-driver-3.25.0/tests/unit/test_protocol.py +--- python-driver-3.25.0.orig/tests/unit/test_protocol.py 2022-05-17 12:54:41.626450646 +0200 ++++ python-driver-3.25.0/tests/unit/test_protocol.py 2022-05-17 12:54:41.662450867 +0200 +@@ -17,7 +17,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import Mock ++from unittest.mock import Mock + + from cassandra import ProtocolVersion, UnsupportedOperation + from cassandra.protocol import ( +diff -upr python-driver-3.25.0.orig/tests/unit/test_response_future.py python-driver-3.25.0/tests/unit/test_response_future.py +--- python-driver-3.25.0.orig/tests/unit/test_response_future.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/test_response_future.py 2022-05-17 12:54:41.662450867 +0200 +@@ -17,7 +17,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import Mock, MagicMock, ANY ++from unittest.mock import Mock, MagicMock, ANY + + from cassandra import ConsistencyLevel, Unavailable, SchemaTargetType, SchemaChangeType, OperationTimedOut + from cassandra.cluster import Session, ResponseFuture, NoHostAvailable, ProtocolVersion +diff -upr python-driver-3.25.0.orig/tests/unit/test_resultset.py python-driver-3.25.0/tests/unit/test_resultset.py +--- python-driver-3.25.0.orig/tests/unit/test_resultset.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/test_resultset.py 2022-05-17 12:54:41.662450867 +0200 +@@ -18,7 +18,7 @@ try: + except ImportError: + import unittest # noqa + +-from mock import Mock, PropertyMock, patch ++from unittest.mock import Mock, PropertyMock, patch + + from cassandra.cluster import ResultSet + +diff -upr python-driver-3.25.0.orig/tests/unit/test_timestamps.py python-driver-3.25.0/tests/unit/test_timestamps.py +--- python-driver-3.25.0.orig/tests/unit/test_timestamps.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/test_timestamps.py 2022-05-17 12:54:41.662450867 +0200 +@@ -17,7 +17,7 @@ try: + except ImportError: + import unittest # noqa + +-import mock ++from unittest import mock + + from cassandra import timestamps + from threading import Thread, Lock +diff -upr python-driver-3.25.0.orig/tests/unit/utils.py python-driver-3.25.0/tests/unit/utils.py +--- python-driver-3.25.0.orig/tests/unit/utils.py 2022-05-17 12:54:41.630450670 +0200 ++++ python-driver-3.25.0/tests/unit/utils.py 2022-05-17 12:54:41.662450867 +0200 +@@ -15,7 +15,7 @@ + from concurrent.futures import Future + from functools import wraps + from cassandra.cluster import Session +-from mock import patch ++from unittest.mock import patch + + + def mock_session_pools(f): diff --git a/python-cassandra-driver.changes b/python-cassandra-driver.changes index d268a68..93737e1 100644 --- a/python-cassandra-driver.changes +++ b/python-cassandra-driver.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue May 17 10:56:36 UTC 2022 - pgajdos@suse.com + +- version update to 3.25.0 + 3.25.0 + ====== + Features + -------- + * Ensure the driver can connect when invalid peer hosts are in system.peers (PYTHON-1260) + * Implement protocol v5 checksumming (PYTHON-1258) + * Fix the default cqlengine connection mechanism to work with Astra (PYTHON-1265) + Bug Fixes + --------- + * Asyncore race condition cause logging exception on shutdown (PYTHON-1266) + * Update list of reserved keywords (PYTHON-1269) + Others + ------ + * Drop Python 3.4 support (PYTHON-1220) + * Update security documentation and examples to use PROTOCOL_TLS (PYTHON-1264) + 3.24.0 + ====== + Features + -------- + * Make geomet an optional dependency at runtime (PYTHON-1237) + * Add use_default_tempdir cloud config options (PYTHON-1245) + * Tcp flow control for libevreactor (PYTHON-1248) + Bug Fixes + --------- + * Unable to connect to a cloud cluster using Ubuntu 20.04 (PYTHON-1238) + * PlainTextAuthProvider fails with unicode chars and Python3 (PYTHON-1241) + * [GRAPH] Graph execution profiles consistency level are not set to LOCAL_QUORUM with a cloud cluster (PYTHON-1240) + * [GRAPH] Can't write data in a Boolean field using the Fluent API (PYTHON-1239) + * [GRAPH] Fix elementMap() result deserialization (PYTHON-1233) + Others + ------ + * Bump geomet dependency version to 0.2 (PYTHON-1243) + * Bump gremlinpython dependency version to 3.4.6 (PYTHON-1212) + * Improve fluent graph documentation for core graphs (PYTHON-1244) + - added patches + fix https://datastax-oss.atlassian.net/browse/PYTHON-1299 + + python-cassandra-driver-no-mock.patch + ------------------------------------------------------------------- Mon Jan 17 09:58:20 UTC 2022 - Dirk Müller diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec index 7d8c5e7..fc0dae6 100644 --- a/python-cassandra-driver.spec +++ b/python-cassandra-driver.spec @@ -19,12 +19,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-cassandra-driver -Version: 3.23.0 +Version: 3.25.0 Release: 0 Summary: Python driver for Cassandra License: Apache-2.0 URL: https://github.com/datastax/python-driver Source: https://github.com/datastax/python-driver/archive/%{version}.tar.gz +# https://datastax-oss.atlassian.net/browse/PYTHON-1299 +Patch0: python-cassandra-driver-no-mock.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module Twisted} @@ -32,7 +34,6 @@ BuildRequires: %{python_module devel} BuildRequires: %{python_module eventlet} BuildRequires: %{python_module geomet >= 0.1} BuildRequires: %{python_module gevent} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pure-sasl} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} @@ -65,6 +66,7 @@ A list of features may be found at https://github.com/datastax/python-driver#fea %prep %setup -q -n python-driver-%{version} +%patch0 -p1 # do not run integration tests rm -rf tests/integration rm -rf tests/stress_tests @@ -74,6 +76,8 @@ rm -rf tests/unit/cython rm -f tests/unit/test_types.py # fix hardcoded cython dep sed -i -e 's:Cython>=0.20,!=0.25,<0.29:Cython:g' setup.py +# https://datastax-oss.atlassian.net/browse/PYTHON-1300 +rm -f tests/unit/test_host_connection_pool.py %build export CFLAGS="%{optflags}"