diff --git a/3.25.0.tar.gz b/3.25.0.tar.gz deleted file mode 100644 index 11c05d1..0000000 --- a/3.25.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dda20f8c57fb227b44b65252c318c78d0edeb4956b19466f7161a936a70a2953 -size 780970 diff --git a/3.26.0.tar.gz b/3.26.0.tar.gz new file mode 100644 index 0000000..4462499 --- /dev/null +++ b/3.26.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f90ec2bb776ded6697a14c577ca44aeeabdf6b783f7f807333d4bf0cf1cb50e4 +size 784073 diff --git a/python-cassandra-driver-no-mock.patch b/python-cassandra-driver-no-mock.patch index 2f9b2e3..19bbc13 100644 --- a/python-cassandra-driver-no-mock.patch +++ b/python-cassandra-driver-no-mock.patch @@ -1,8 +1,8 @@ -Index: python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py +Index: python-driver-3.26.0/tests/unit/advanced/cloud/test_cloud.py =================================================================== ---- 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 -@@ -19,7 +19,7 @@ except ImportError: +--- python-driver-3.26.0.orig/tests/unit/advanced/cloud/test_cloud.py ++++ python-driver-3.26.0/tests/unit/advanced/cloud/test_cloud.py +@@ -16,7 +16,7 @@ import unittest from cassandra import DriverException from cassandra.datastax import cloud @@ -11,12 +11,12 @@ Index: python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py from tests import notwindows -Index: python-driver-3.25.0/tests/unit/advanced/test_insights.py +Index: python-driver-3.26.0/tests/unit/advanced/test_insights.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/advanced/test_insights.py -+++ python-driver-3.25.0/tests/unit/advanced/test_insights.py -@@ -19,7 +19,7 @@ except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/advanced/test_insights.py ++++ python-driver-3.26.0/tests/unit/advanced/test_insights.py +@@ -16,7 +16,7 @@ + import unittest import logging -from mock import sentinel @@ -24,24 +24,24 @@ Index: python-driver-3.25.0/tests/unit/advanced/test_insights.py import sys from cassandra import ConsistencyLevel -Index: python-driver-3.25.0/tests/unit/advanced/test_policies.py +Index: python-driver-3.26.0/tests/unit/advanced/test_policies.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/advanced/test_policies.py -+++ python-driver-3.25.0/tests/unit/advanced/test_policies.py -@@ -16,7 +16,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/advanced/test_policies.py ++++ python-driver-3.26.0/tests/unit/advanced/test_policies.py +@@ -13,7 +13,7 @@ + # limitations under the License. + import unittest -from mock import Mock +from unittest.mock import Mock from cassandra.pool import Host from cassandra.policies import RoundRobinPolicy -Index: python-driver-3.25.0/tests/unit/cqlengine/test_connection.py +Index: python-driver-3.26.0/tests/unit/cqlengine/test_connection.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/cqlengine/test_connection.py -+++ python-driver-3.25.0/tests/unit/cqlengine/test_connection.py -@@ -21,7 +21,7 @@ from cassandra.cluster import _ConfigMod +--- python-driver-3.26.0.orig/tests/unit/cqlengine/test_connection.py ++++ python-driver-3.26.0/tests/unit/cqlengine/test_connection.py +@@ -20,7 +20,7 @@ from cassandra.cluster import _ConfigMod from cassandra.cqlengine import connection from cassandra.query import dict_factory @@ -50,10 +50,10 @@ Index: python-driver-3.25.0/tests/unit/cqlengine/test_connection.py class ConnectionTest(unittest.TestCase): -Index: python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py +Index: python-driver-3.26.0/tests/unit/io/test_asyncioreactor.py =================================================================== ---- 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.26.0.orig/tests/unit/io/test_asyncioreactor.py ++++ python-driver-3.26.0/tests/unit/io/test_asyncioreactor.py @@ -10,7 +10,7 @@ except (ImportError, SyntaxError): from tests import is_monkey_patched, connection_class from tests.unit.io.utils import TimerCallback, TimerTestMixin @@ -63,24 +63,24 @@ Index: python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py import unittest import time -Index: python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py +Index: python-driver-3.26.0/tests/unit/io/test_asyncorereactor.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/test_asyncorereactor.py -+++ python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py -@@ -16,7 +16,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/io/test_asyncorereactor.py ++++ python-driver-3.26.0/tests/unit/io/test_asyncorereactor.py +@@ -13,7 +13,7 @@ + # limitations under the License. + import unittest -from mock import patch +from unittest.mock import patch import socket import cassandra.io.asyncorereactor as asyncorereactor from cassandra.io.asyncorereactor import AsyncoreConnection -Index: python-driver-3.25.0/tests/unit/io/test_eventletreactor.py +Index: python-driver-3.26.0/tests/unit/io/test_eventletreactor.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/test_eventletreactor.py -+++ python-driver-3.25.0/tests/unit/io/test_eventletreactor.py -@@ -22,7 +22,7 @@ from tests.unit.io.utils import TimerTes +--- python-driver-3.26.0.orig/tests/unit/io/test_eventletreactor.py ++++ python-driver-3.26.0/tests/unit/io/test_eventletreactor.py +@@ -19,7 +19,7 @@ from tests.unit.io.utils import TimerTes from tests import notpypy, EVENT_LOOP_MANAGER from eventlet import monkey_patch @@ -89,11 +89,11 @@ Index: python-driver-3.25.0/tests/unit/io/test_eventletreactor.py try: from cassandra.io.eventletreactor import EventletConnection -Index: python-driver-3.25.0/tests/unit/io/test_geventreactor.py +Index: python-driver-3.26.0/tests/unit/io/test_geventreactor.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/test_geventreactor.py -+++ python-driver-3.25.0/tests/unit/io/test_geventreactor.py -@@ -26,7 +26,7 @@ try: +--- python-driver-3.26.0.orig/tests/unit/io/test_geventreactor.py ++++ python-driver-3.26.0/tests/unit/io/test_geventreactor.py +@@ -23,7 +23,7 @@ try: except ImportError: GeventConnection = None # noqa @@ -102,36 +102,36 @@ Index: python-driver-3.25.0/tests/unit/io/test_geventreactor.py skip_condition = GeventConnection is None or EVENT_LOOP_MANAGER != "gevent" -Index: python-driver-3.25.0/tests/unit/io/test_libevreactor.py +Index: python-driver-3.26.0/tests/unit/io/test_libevreactor.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/test_libevreactor.py -+++ python-driver-3.25.0/tests/unit/io/test_libevreactor.py -@@ -16,7 +16,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/io/test_libevreactor.py ++++ python-driver-3.26.0/tests/unit/io/test_libevreactor.py +@@ -13,7 +13,7 @@ + # limitations under the License. + import unittest -from mock import patch, Mock +from unittest.mock import patch, Mock import weakref import socket -Index: python-driver-3.25.0/tests/unit/io/test_twistedreactor.py +Index: python-driver-3.26.0/tests/unit/io/test_twistedreactor.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/test_twistedreactor.py -+++ python-driver-3.25.0/tests/unit/io/test_twistedreactor.py -@@ -16,7 +16,7 @@ try: - import unittest2 as unittest - except ImportError: - import unittest +--- python-driver-3.26.0.orig/tests/unit/io/test_twistedreactor.py ++++ python-driver-3.26.0/tests/unit/io/test_twistedreactor.py +@@ -13,7 +13,7 @@ + # limitations under the License. + + import unittest -from mock import Mock, patch +from unittest.mock import Mock, patch from cassandra.connection import DefaultEndPoint -Index: python-driver-3.25.0/tests/unit/io/utils.py +Index: python-driver-3.26.0/tests/unit/io/utils.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/io/utils.py -+++ python-driver-3.25.0/tests/unit/io/utils.py +--- python-driver-3.26.0.orig/tests/unit/io/utils.py ++++ python-driver-3.26.0/tests/unit/io/utils.py @@ -28,7 +28,7 @@ from functools import wraps from itertools import cycle import six @@ -141,11 +141,11 @@ Index: python-driver-3.25.0/tests/unit/io/utils.py import errno import logging -Index: python-driver-3.25.0/tests/unit/test_cluster.py +Index: python-driver-3.26.0/tests/unit/test_cluster.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_cluster.py -+++ python-driver-3.25.0/tests/unit/test_cluster.py -@@ -19,7 +19,7 @@ except ImportError: +--- python-driver-3.26.0.orig/tests/unit/test_cluster.py ++++ python-driver-3.26.0/tests/unit/test_cluster.py +@@ -16,7 +16,7 @@ import unittest import logging import six @@ -154,12 +154,12 @@ Index: python-driver-3.25.0/tests/unit/test_cluster.py from cassandra import ConsistencyLevel, DriverException, Timeout, Unavailable, RequestExecutionException, ReadTimeout, WriteTimeout, CoordinationFailure, ReadFailure, WriteFailure, FunctionFailure, AlreadyExists,\ InvalidRequest, Unauthorized, AuthenticationFailed, OperationTimedOut, UnsupportedOperation, RequestValidationException, ConfigurationException, ProtocolVersion -Index: python-driver-3.25.0/tests/unit/test_concurrent.py +Index: python-driver-3.26.0/tests/unit/test_concurrent.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_concurrent.py -+++ python-driver-3.25.0/tests/unit/test_concurrent.py -@@ -19,7 +19,7 @@ except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_concurrent.py ++++ python-driver-3.26.0/tests/unit/test_concurrent.py +@@ -16,7 +16,7 @@ + import unittest from itertools import cycle -from mock import Mock @@ -167,24 +167,24 @@ Index: python-driver-3.25.0/tests/unit/test_concurrent.py import time import threading from six.moves.queue import PriorityQueue -Index: python-driver-3.25.0/tests/unit/test_connection.py +Index: python-driver-3.26.0/tests/unit/test_connection.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_connection.py -+++ python-driver-3.25.0/tests/unit/test_connection.py -@@ -16,7 +16,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_connection.py ++++ python-driver-3.26.0/tests/unit/test_connection.py +@@ -13,7 +13,7 @@ + # limitations under the License. + import unittest -from mock import Mock, ANY, call, patch +from unittest.mock import Mock, ANY, call, patch import six from six import BytesIO import time -Index: python-driver-3.25.0/tests/unit/test_control_connection.py +Index: python-driver-3.26.0/tests/unit/test_control_connection.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_control_connection.py -+++ python-driver-3.25.0/tests/unit/test_control_connection.py -@@ -20,7 +20,7 @@ except ImportError: +--- python-driver-3.26.0.orig/tests/unit/test_control_connection.py ++++ python-driver-3.26.0/tests/unit/test_control_connection.py +@@ -17,7 +17,7 @@ import unittest import six from concurrent.futures import ThreadPoolExecutor @@ -193,11 +193,11 @@ Index: python-driver-3.25.0/tests/unit/test_control_connection.py from cassandra import OperationTimedOut, SchemaTargetType, SchemaChangeType from cassandra.protocol import ResultMessage, RESULT_KIND_ROWS -Index: python-driver-3.25.0/tests/unit/test_endpoints.py +Index: python-driver-3.26.0/tests/unit/test_endpoints.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_endpoints.py -+++ python-driver-3.25.0/tests/unit/test_endpoints.py -@@ -15,7 +15,7 @@ import itertools +--- python-driver-3.26.0.orig/tests/unit/test_endpoints.py ++++ python-driver-3.26.0/tests/unit/test_endpoints.py +@@ -12,7 +12,7 @@ import itertools from cassandra.connection import DefaultEndPoint, SniEndPoint, SniEndPointFactory @@ -206,11 +206,11 @@ Index: python-driver-3.25.0/tests/unit/test_endpoints.py def socket_getaddrinfo(*args): -Index: python-driver-3.25.0/tests/unit/test_metadata.py +Index: python-driver-3.26.0/tests/unit/test_metadata.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_metadata.py -+++ python-driver-3.25.0/tests/unit/test_metadata.py -@@ -18,7 +18,7 @@ except ImportError: +--- python-driver-3.26.0.orig/tests/unit/test_metadata.py ++++ python-driver-3.26.0/tests/unit/test_metadata.py +@@ -15,7 +15,7 @@ import unittest from binascii import unhexlify import logging @@ -219,12 +219,12 @@ Index: python-driver-3.25.0/tests/unit/test_metadata.py import os import six import timeit -Index: python-driver-3.25.0/tests/unit/test_policies.py +Index: python-driver-3.26.0/tests/unit/test_policies.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_policies.py -+++ python-driver-3.25.0/tests/unit/test_policies.py -@@ -18,7 +18,7 @@ except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_policies.py ++++ python-driver-3.26.0/tests/unit/test_policies.py +@@ -15,7 +15,7 @@ + import unittest from itertools import islice, cycle -from mock import Mock, patch, call @@ -232,62 +232,62 @@ Index: python-driver-3.25.0/tests/unit/test_policies.py from random import randint import six from six.moves._thread import LockType -Index: python-driver-3.25.0/tests/unit/test_protocol.py +Index: python-driver-3.26.0/tests/unit/test_protocol.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_protocol.py -+++ python-driver-3.25.0/tests/unit/test_protocol.py -@@ -17,7 +17,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_protocol.py ++++ python-driver-3.26.0/tests/unit/test_protocol.py +@@ -15,7 +15,7 @@ + import unittest + import six -from mock import Mock +from unittest.mock import Mock from cassandra import ProtocolVersion, UnsupportedOperation from cassandra.protocol import ( -Index: python-driver-3.25.0/tests/unit/test_response_future.py +Index: python-driver-3.26.0/tests/unit/test_response_future.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_response_future.py -+++ python-driver-3.25.0/tests/unit/test_response_future.py -@@ -17,7 +17,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_response_future.py ++++ python-driver-3.26.0/tests/unit/test_response_future.py +@@ -18,7 +18,7 @@ from collections import deque + from threading import RLock + import six -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 -Index: python-driver-3.25.0/tests/unit/test_resultset.py +Index: python-driver-3.26.0/tests/unit/test_resultset.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_resultset.py -+++ python-driver-3.25.0/tests/unit/test_resultset.py -@@ -18,7 +18,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_resultset.py ++++ python-driver-3.26.0/tests/unit/test_resultset.py +@@ -15,7 +15,7 @@ from cassandra.query import named_tuple_ + + import unittest -from mock import Mock, PropertyMock, patch +from unittest.mock import Mock, PropertyMock, patch from cassandra.cluster import ResultSet -Index: python-driver-3.25.0/tests/unit/test_timestamps.py +Index: python-driver-3.26.0/tests/unit/test_timestamps.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_timestamps.py -+++ python-driver-3.25.0/tests/unit/test_timestamps.py -@@ -17,7 +17,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_timestamps.py ++++ python-driver-3.26.0/tests/unit/test_timestamps.py +@@ -14,7 +14,7 @@ + + import unittest -import mock +from unittest import mock + import six from cassandra import timestamps - from threading import Thread, Lock -Index: python-driver-3.25.0/tests/unit/utils.py +Index: python-driver-3.26.0/tests/unit/utils.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/utils.py -+++ python-driver-3.25.0/tests/unit/utils.py +--- python-driver-3.26.0.orig/tests/unit/utils.py ++++ python-driver-3.26.0/tests/unit/utils.py @@ -15,7 +15,7 @@ from concurrent.futures import Future from functools import wraps @@ -297,13 +297,13 @@ Index: python-driver-3.25.0/tests/unit/utils.py def mock_session_pools(f): -Index: python-driver-3.25.0/tests/unit/test_host_connection_pool.py +Index: python-driver-3.26.0/tests/unit/test_host_connection_pool.py =================================================================== ---- python-driver-3.25.0.orig/tests/unit/test_host_connection_pool.py -+++ python-driver-3.25.0/tests/unit/test_host_connection_pool.py -@@ -17,7 +17,7 @@ try: - except ImportError: - import unittest # noqa +--- python-driver-3.26.0.orig/tests/unit/test_host_connection_pool.py ++++ python-driver-3.26.0/tests/unit/test_host_connection_pool.py +@@ -14,7 +14,7 @@ + + import unittest -from mock import Mock, NonCallableMagicMock +from unittest.mock import Mock, NonCallableMagicMock diff --git a/python-cassandra-driver.changes b/python-cassandra-driver.changes index 17e8a29..101df36 100644 --- a/python-cassandra-driver.changes +++ b/python-cassandra-driver.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Mar 22 08:48:30 UTC 2023 - Daniel Garcia + +- Update to 3.26.0 + Features + -------- + * Add support for execution profiles in execute_concurrent (PR 1122) + Bug Fixes + --------- + * Handle empty non-final result pages (PR 1110) + * Do not re-use stream IDs for in-flight requests (PR 1114) + * Asyncore race condition cause logging exception on shutdown (PYTHON-1266) + Others + ------ + * Fix deprecation warning in query tracing (PR 1103) + * Remove mutable default values from some tests (PR 1116) + * Remove dependency on unittest2 (PYTHON-1289) + * Fix deprecation warnings for asyncio.coroutine annotation in asyncioreactor (PYTTHON-1290) + * Fix typos in source files (PR 1126) + * HostFilterPolicyInitTest fix for Python 3.11 (PR 1131) + * Fix for DontPrepareOnIgnoredHostsTest (PYTHON-1287) + * tests.integration.simulacron.test_connection failures (PYTHON-1304) + * tests.integration.standard.test_single_interface.py appears to be failing for C* 4.0 (PYTHON-1329) + * Authentication tests appear to be failing fraudulently (PYTHON-1328) + * PreparedStatementTests.test_fail_if_different_query_id_on_reprepare() failing unexpectedly (PTYHON-1327) + * Refactor deprecated unittest aliases for Python 3.11 compatibility (PR 1112) + Deprecations + ------------ + * This release removes support for Python 2.7.x as well as Python 3.5.x and 3.6.x + ------------------------------------------------------------------- Thu May 19 07:49:12 UTC 2022 - pgajdos@suse.com diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec index e175e51..231aeaa 100644 --- a/python-cassandra-driver.spec +++ b/python-cassandra-driver.spec @@ -1,7 +1,7 @@ # # spec file for package python-cassandra-driver # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,9 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without python2 Name: python-cassandra-driver -Version: 3.25.0 +Version: 3.26.0 Release: 0 Summary: Python driver for Cassandra License: Apache-2.0 @@ -65,8 +64,7 @@ protocol and Cassandra Query Language v3. A list of features may be found at https://github.com/datastax/python-driver#features . %prep -%setup -q -n python-driver-%{version} -%patch0 -p1 +%autosetup -p1 -n python-driver-%{version} # do not run integration tests rm -rf tests/integration rm -rf tests/stress_tests