feat(dbt): remove support for dbt-core==1.3.*

dagster-io · Dec 8, 2023 · 59a7f1a · 59a7f1a
1 parent fca0e95
commit 59a7f1a
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 50 deletions.
diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt/asset_defs.py b/python_modules/libraries/dagster-dbt/dagster_dbt/asset_defs.py
@@ -107,18 +107,10 @@ def _load_manifest_for_project(
 
 def _can_stream_events(dbt_resource: Union[DbtCliClient, DbtCliResource]) -> bool:
     """Check if the installed dbt version supports streaming events."""
-    import dbt.version
-    from packaging import version
-
-    if version.parse(dbt.version.__version__) >= version.parse("1.4.0"):
-        # The json log format is required for streaming events. DbtCliResource always uses this format, but
-        # DbtCliClient has an option to disable it.
-        if isinstance(dbt_resource, DbtCliResource):
-            return True
-        else:
-            return dbt_resource._json_log_format  # noqa: SLF001
+    if isinstance(dbt_resource, DbtCliResource):
+        return True
     else:
-        return False
+        return dbt_resource._json_log_format  # noqa: SLF001
 
 
 def _batch_event_iterator(

diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_app.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_app.py
@@ -13,7 +13,6 @@
 if TYPE_CHECKING:
     from dagster import Definitions
 
-pytest.importorskip("dbt.version", minversion="1.4")
 
 test_dagster_metadata_dbt_project_path = (
     Path(__file__).joinpath("..", "..", "dbt_projects", "test_dagster_metadata").resolve()

diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/conftest.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/conftest.py
@@ -1,11 +1,9 @@
 import os
 import subprocess
 
-import dbt.version
 import pytest
 from dagster._utils import file_relative_path, pushd
 from dagster_dbt import DbtCliClientResource, DbtCliResource, dbt_cli_resource
-from packaging import version
 
 # ======= CONFIG ========
 DBT_EXECUTABLE = "dbt"
@@ -54,13 +52,7 @@ def dbt_python_config_dir():
     params=[
         pytest.param("legacy", marks=pytest.mark.legacy),
         pytest.param("DbtCliClientResource", marks=pytest.mark.legacy),
-        pytest.param(
-            "DbtCliResource",
-            marks=pytest.mark.skipif(
-                version.parse(dbt.version.__version__) < version.parse("1.4.0"),
-                reason="DbtCliResource only supports dbt 1.4+",
-            ),
-        ),
+        pytest.param("DbtCliResource"),
     ],
 )
 def dbt_cli_resource_factory(request):

diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/core/test_resources_v2.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/core/test_resources_v2.py
@@ -32,9 +32,6 @@
 
 from ..conftest import TEST_PROJECT_DIR
 
-pytest.importorskip("dbt.version", minversion="1.4")
-
-
 manifest_path = Path(TEST_PROJECT_DIR).joinpath("manifest.json")
 manifest = json.loads(manifest_path.read_bytes())
 

diff --git a/...ules/libraries/dagster-dbt/dagster_dbt_tests/core/test_resources_v2_version_validation.py b/...ules/libraries/dagster-dbt/dagster_dbt_tests/core/test_resources_v2_version_validation.py
diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/test_asset_checks.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/test_asset_checks.py
@@ -22,8 +22,6 @@
 from packaging import version
 from pytest_mock import MockerFixture
 
-pytest.importorskip("dbt.version", minversion="1.4")
-
 is_dbt_1_4 = version.parse("1.4.0") <= version.parse(dbt_version) < version.parse("1.5.0")
 
 

diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/test_asset_decorator.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/test_asset_decorator.py
@@ -27,9 +27,6 @@
 from dagster_dbt.dagster_dbt_translator import DagsterDbtTranslator
 from dagster_dbt.dbt_manifest import DbtManifestParam
 
-pytest.importorskip("dbt.version", minversion="1.4")
-
-
 manifest_path = Path(__file__).joinpath("..", "sample_manifest.json").resolve()
 manifest = json.loads(manifest_path.read_bytes())
 

diff --git a/python_modules/libraries/dagster-dbt/setup.py b/python_modules/libraries/dagster-dbt/setup.py
@@ -36,7 +36,7 @@ def get_version() -> str:
     install_requires=[
         f"dagster{pin}",
         # Follow the version support constraints for dbt Core: https://docs.getdbt.com/docs/dbt-versions/core
-        "dbt-core<1.8",
+        "dbt-core>=1.4,<1.8",
         "Jinja2",
         "networkx",
         "orjson",

diff --git a/python_modules/libraries/dagster-dbt/tox.ini b/python_modules/libraries/dagster-dbt/tox.ini
@@ -9,8 +9,6 @@ deps =
   -e ../../dagster-pipes
   -e ../dagster-duckdb
   -e ../dagster-duckdb-pandas
-  dbt_13X: dbt-core==1.3.*
-  dbt_13X: dbt-duckdb==1.3.*
   dbt_14X: dbt-core==1.4.*
   dbt_14X: dbt-duckdb==1.4.*
   dbt_15X: dbt-core==1.5.*
@@ -26,12 +24,10 @@ allowlist_externals =
   /bin/bash
 commands =
   !windows: /bin/bash -c '! pip list --exclude-editable | grep -e dagster'
-  dbt_13X_legacy: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "legacy" -vv {posargs}
   dbt_14X_legacy: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "legacy" -vv {posargs}
   dbt_15X_legacy: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "legacy" -vv {posargs}
   dbt_16X_legacy: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "legacy" -vv {posargs}
   dbt_17X_legacy: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "legacy" -vv {posargs}
-  dbt_13X: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "not legacy" -vv {posargs}
   dbt_14X: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "not legacy" -vv {posargs}
   dbt_15X: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "not legacy" -vv {posargs}
   dbt_16X: pytest --reruns 2 --durations 10 -c ../../../pyproject.toml -m "not legacy" -vv {posargs}