From 244716c97534d1cd081baacf39a9c71531c92dab Mon Sep 17 00:00:00 2001 From: Sebastian Sassi Date: Wed, 29 May 2024 14:07:03 -0300 Subject: [PATCH] Fix tests. --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a7c3caf..477c9eb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makes it easy to create virtual environments for different versions of dbt ADAPTERS = sqlite duckdb -everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt13/bin/python .venv-dbt14/bin/python +everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt13/bin/python .venv-dbt14/bin/python .venv-dbt15/bin/python .PHONY: everything .venv-dbt10/bin/python: @@ -9,7 +9,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt10/bin/pip install --upgrade wheel setuptools pip .venv-dbt10/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt10/bin/pip install "dbt-$$adapter>=1.0.0,<1.1.0"; \ + .venv-dbt10/bin/pip install "dbt-$$adapter>=1.0.0,<1.1.0" "dbt-core>=1.0,<1.1.0"; \ done .venv-dbt11/bin/python: @@ -17,7 +17,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt11/bin/pip install --upgrade wheel setuptools pip .venv-dbt11/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt11/bin/pip install "dbt-$$adapter>=1.1.0,<1.2.0"; \ + .venv-dbt11/bin/pip install "dbt-$$adapter>=1.1.0,<1.2.0" "dbt-core>=1.1.0,<1.2.0"; \ done .venv-dbt12/bin/python: @@ -25,7 +25,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt12/bin/pip install --upgrade wheel setuptools pip .venv-dbt12/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt12/bin/pip install "dbt-$$adapter>=1.2.0,<1.3.0"; \ + .venv-dbt12/bin/pip install "dbt-$$adapter>=1.2.0,<1.3.0" "dbt-core>=1.2.0,<1.3.0"; \ done .venv-dbt13/bin/python: @@ -33,7 +33,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt13/bin/pip install --upgrade wheel setuptools pip .venv-dbt13/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt13/bin/pip install "dbt-$$adapter>=1.3.0,<1.4.0"; \ + .venv-dbt13/bin/pip install "dbt-$$adapter>=1.3.0,<1.4.0" "dbt-core>=1.3.0,<1.4.0"; \ done .venv-dbt14/bin/python: @@ -41,7 +41,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt14/bin/pip install --upgrade wheel setuptools pip .venv-dbt14/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt14/bin/pip install "dbt-$$adapter>=1.4.0,<1.5.0"; \ + .venv-dbt14/bin/pip install "dbt-$$adapter>=1.4.0,<1.5.0" "dbt-core>=1.4.0,<1.5.0"; \ done # Relaxed constraint to allow testing dbt-core 1.5.0 with sqlite @@ -50,8 +50,7 @@ everything: .venv-dbt10/bin/python .venv-dbt11/bin/python .venv-dbt12/bin/python .venv-dbt15/bin/pip install --upgrade wheel setuptools pip .venv-dbt15/bin/pip install pytest WebTest . for adapter in $(ADAPTERS); do \ - .venv-dbt15/bin/pip install "dbt-$$adapter>=1.4.0,<1.6.0"; \ - .venv-dbt15/bin/pip install "dbt-core>=1.5.0,<1.6.0"; \ + .venv-dbt15/bin/pip install "dbt-$$adapter>=1.4.0,<1.6.0" "dbt-core>=1.5.0,<1.6.0"; \ done clean: