Resolve conflict with latest main

astronomer · Oct 9, 2023 · 52632b3 · 52632b3
1 parent ea61ef7
commit 52632b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -165,18 +165,15 @@ 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 \
 --durations=0 \
 -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
@@ -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"