From b6003da4a89ded4d1cec936098351192edb2c31f Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 30 Jan 2024 04:22:15 +0100 Subject: [PATCH] Testing: pandas 2.2 no longer supports SQLAlchemy 1.4 --- src/crate/client/sqlalchemy/tests/bulk_test.py | 6 +++--- src/crate/client/tests.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crate/client/sqlalchemy/tests/bulk_test.py b/src/crate/client/sqlalchemy/tests/bulk_test.py index 1cebe0c6..a628afa0 100644 --- a/src/crate/client/sqlalchemy/tests/bulk_test.py +++ b/src/crate/client/sqlalchemy/tests/bulk_test.py @@ -26,7 +26,7 @@ import sqlalchemy as sa from sqlalchemy.orm import Session -from crate.client.sqlalchemy.sa_version import SA_VERSION, SA_2_0, SA_1_4 +from crate.client.sqlalchemy.sa_version import SA_VERSION, SA_2_0 try: from sqlalchemy.orm import declarative_base @@ -170,7 +170,7 @@ def test_bulk_save_modern(self): self.assertSequenceEqual(expected_bulk_args, bulk_args) @skipIf(sys.version_info < (3, 8), "SQLAlchemy/pandas is not supported on Python <3.8") - @skipIf(SA_VERSION < SA_1_4, "SQLAlchemy 1.3 is not supported by pandas") + @skipIf(SA_VERSION < SA_2_0, "SQLAlchemy 1.4 is no longer supported by pandas 2.2") @patch('crate.client.connection.Cursor', mock_cursor=FakeCursor) def test_bulk_save_pandas(self, mock_cursor): """ @@ -209,7 +209,7 @@ def test_bulk_save_pandas(self, mock_cursor): self.assertEqual(effective_op_count, OPCOUNT) @skipIf(sys.version_info < (3, 8), "SQLAlchemy/Dask is not supported on Python <3.8") - @skipIf(SA_VERSION < SA_1_4, "SQLAlchemy 1.3 is not supported by pandas") + @skipIf(SA_VERSION < SA_2_0, "SQLAlchemy 1.4 is no longer supported by pandas 2.2") @patch('crate.client.connection.Cursor', mock_cursor=FakeCursor) def test_bulk_save_dask(self, mock_cursor): """ diff --git a/src/crate/client/tests.py b/src/crate/client/tests.py index 026fb56f..0f5878d7 100644 --- a/src/crate/client/tests.py +++ b/src/crate/client/tests.py @@ -41,7 +41,7 @@ crate_host, crate_path, crate_port, \ crate_transport_port, docs_path, localhost from crate.client import connect -from .sqlalchemy import SA_VERSION, SA_1_4 +from .sqlalchemy import SA_VERSION, SA_2_0 from .test_cursor import CursorTest from .test_connection import ConnectionTest @@ -395,7 +395,7 @@ def test_suite(): ] # Don't run DataFrame integration tests on SQLAlchemy 1.3 and Python 3.7. - skip_dataframe = SA_VERSION < SA_1_4 or sys.version_info < (3, 8) + skip_dataframe = SA_VERSION < SA_2_0 or sys.version_info < (3, 8) if not skip_dataframe: sqlalchemy_integration_tests += [ 'docs/by-example/sqlalchemy/dataframe.rst',