diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index e285d798ef..979c748925 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -306,6 +306,7 @@ workflows: - "3.10" - "3.11" - "3.12" + - "3.13" - cicd_tests_windows - engine_tests_docker: name: engine_<< matrix.engine >> diff --git a/pyproject.toml b/pyproject.toml index 4db73d57c1..022b3fe9f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,7 @@ dev = [ "dbt-clickhouse", "dbt-databricks", "dbt-redshift", - "dbt-sqlserver>=1.7.0", + "dbt-sqlserver>=1.7.0;python_version<'3.13'", "dbt-trino", "Faker", "google-auth", @@ -79,6 +79,7 @@ dev = [ "pydantic", "PyAthena[Pandas]", "PyGithub>=2.6.0", + "pyodbc", "pyperf", "pyspark~=3.5.0", "pytest", diff --git a/tests/dbt/test_config.py b/tests/dbt/test_config.py index 9bdd7b0063..bb8806c657 100644 --- a/tests/dbt/test_config.py +++ b/tests/dbt/test_config.py @@ -1,5 +1,6 @@ import base64 import typing as t +import sys from pathlib import Path from shutil import copytree @@ -943,13 +944,18 @@ def test_db_type_to_column_class(): from dbt.adapters.bigquery import BigQueryColumn from dbt.adapters.databricks.column import DatabricksColumn from dbt.adapters.snowflake import SnowflakeColumn - from dbt.adapters.sqlserver.sqlserver_column import SQLServerColumn assert (TARGET_TYPE_TO_CONFIG_CLASS["bigquery"].column_class) == BigQueryColumn assert (TARGET_TYPE_TO_CONFIG_CLASS["databricks"].column_class) == DatabricksColumn assert (TARGET_TYPE_TO_CONFIG_CLASS["duckdb"].column_class) == Column assert (TARGET_TYPE_TO_CONFIG_CLASS["snowflake"].column_class) == SnowflakeColumn - assert (TARGET_TYPE_TO_CONFIG_CLASS["sqlserver"].column_class) == SQLServerColumn + + if sys.version_info < (3, 13): + # The dbt-sqlserver package is not currently compatible with Python 3.13 + + from dbt.adapters.sqlserver.sqlserver_column import SQLServerColumn + + assert (TARGET_TYPE_TO_CONFIG_CLASS["sqlserver"].column_class) == SQLServerColumn from dbt.adapters.clickhouse.column import ClickHouseColumn from dbt.adapters.trino.column import TrinoColumn diff --git a/tests/utils/test_metaprogramming.py b/tests/utils/test_metaprogramming.py index c7c22378ac..8cca48ac6e 100644 --- a/tests/utils/test_metaprogramming.py +++ b/tests/utils/test_metaprogramming.py @@ -49,9 +49,7 @@ def test_print_exception(mocker: MockerFixture): print_exception(ex, test_env, out_mock) expected_message = r""" File ".*?.tests.utils.test_metaprogramming\.py", line 47, in test_print_exception - eval\("test_fun\(\)", env\) - - File "", line 1, in + eval\("test_fun\(\)", env\).* File '/test/path.py' \(or imported file\), line 2, in test_fun def test_fun\(\):