From 52632b3c8f88e0a59ad282f830410154a6c94952 Mon Sep 17 00:00:00 2001
From: Tatiana Al-Chueyr <tatiana.alchueyr@gmail.com>
Date: Mon, 9 Oct 2023 15:16:39 +0100
Subject: [PATCH] Resolve conflict with latest main

---
 pyproject.toml          | 9 +++------
 tests/dbt/test_graph.py | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index bdea4aa82..9f2c5ee4c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -165,8 +165,7 @@ test-integration-setup = """pip uninstall -y dbt-core dbt-databricks dbt-sqlite
 rm -rf airflow.*; \
 airflow db init; \
 pip install 'dbt-core==1.5.4' 'dbt-databricks<=1.5.4' 'dbt-postgres<=1.5.4' 'openlineage-airflow'"""
-test-integration = """rm -rf dbt/jaffle_shop/dbt_packages;
-pytest -x -vv \
+test-integration = """pytest -x -vv \
 --cov=cosmos \
 --cov-report=term-missing \
 --cov-report=xml \
@@ -174,9 +173,7 @@ pytest -x -vv \
 -m integration  \
 -k 'not (sqlite or example_cosmos_sources or example_cosmos_python_models or example_virtualenv)'
 """
-test-integration-expensive = """echo "example_cosmos_sources" >> dev/dags/.airflowignore
-rm -rf dbt/jaffle_shop/dbt_packages;
-pytest -vv \
+test-integration-expensive = """pytest -vv \
 --cov=cosmos \
 --cov-report=term-missing \
 --cov-report=xml \
@@ -187,7 +184,7 @@ test-integration-sqlite-setup = """pip uninstall -y dbt-core dbt-sqlite openline
 rm -rf airflow.*; \
 airflow db init; \
 pip install 'dbt-core==1.4' 'dbt-sqlite<=1.4' 'dbt-databricks<=1.4' 'dbt-postgres<=1.4' """
-test-integration-sqlite = """rm -rf dbt/jaffle_shop/dbt_packages;
+test-integration-sqlite = """
 pytest -vv \
 --cov=cosmos \
 --cov-report=term-missing \
diff --git a/tests/dbt/test_graph.py b/tests/dbt/test_graph.py
index 3a52b4e37..035a78a69 100644
--- a/tests/dbt/test_graph.py
+++ b/tests/dbt/test_graph.py
@@ -15,6 +15,7 @@
 DBT_PIPELINE_NAME = "jaffle_shop"
 SAMPLE_MANIFEST = Path(__file__).parent.parent / "sample/manifest.json"
 SAMPLE_MANIFEST_PY = Path(__file__).parent.parent / "sample/manifest_python.json"
+SAMPLE_MANIFEST_MODEL_VERSION = Path(__file__).parent.parent / "sample/manifest_model_version.json"
 SAMPLE_MANIFEST_SOURCE = Path(__file__).parent.parent / "sample/manifest_source.json"