From 7c29fbfa5e14c648eeb7c4147d1dc63e5fd0737a Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:07:22 +0100 Subject: [PATCH 01/71] Remove skipdist --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index e69afdeb..3b88b953 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,4 @@ [tox] -skipsdist = True envlist = unit, flake8, integration-sqlserver, integration-synapse [testenv:integration-sqlserver] From 90d0eaa540a6c66a8f4a69aba8680627ba60b450 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:07:42 +0100 Subject: [PATCH 02/71] Remove editable flag --- tox.ini | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 3b88b953..f33dc768 100644 --- a/tox.ini +++ b/tox.ini @@ -2,16 +2,13 @@ envlist = unit, flake8, integration-sqlserver, integration-synapse [testenv:integration-sqlserver] -basepython = python3 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/sqlserver.dbtspec' deps = - -r{toxinidir}/requirements.txt - -e. + -r {toxinidir}/requirements.txt [testenv:integration-azuresql] basepython = python3 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/azuresql.dbtspec' passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID deps = - -r{toxinidir}/requirements.txt - -e. \ No newline at end of file + -r{toxinidir}/requirements.txt \ No newline at end of file From a0f6098a2ebcd9b157724cc0c6abc6f94876d466 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:08:05 +0100 Subject: [PATCH 03/71] Add space after -r --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f33dc768..eb030f36 100644 --- a/tox.ini +++ b/tox.ini @@ -11,4 +11,4 @@ basepython = python3 commands = /bin/bash -c '{envpython} -m pytest -v test/integration/azuresql.dbtspec' passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID deps = - -r{toxinidir}/requirements.txt \ No newline at end of file + -r {toxinidir}/requirements.txt \ No newline at end of file From 089a303c3b5a5ac521495b438c5880fc1ed0a9b2 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:08:40 +0100 Subject: [PATCH 04/71] Remove redundancy of command --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index eb030f36..94e11da2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,13 +2,13 @@ envlist = unit, flake8, integration-sqlserver, integration-synapse [testenv:integration-sqlserver] -commands = /bin/bash -c '{envpython} -m pytest -v test/integration/sqlserver.dbtspec' +commands = pytest -v test/integration/sqlserver.dbtspec deps = -r {toxinidir}/requirements.txt [testenv:integration-azuresql] basepython = python3 -commands = /bin/bash -c '{envpython} -m pytest -v test/integration/azuresql.dbtspec' +commands = pytest -v test/integration/azuresql.dbtspec passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID deps = -r {toxinidir}/requirements.txt \ No newline at end of file From 95ef130e62babbf3d9bbee85d83e2c560117c4d2 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:08:57 +0100 Subject: [PATCH 05/71] Remove basepython --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 94e11da2..c8f50f5c 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ deps = -r {toxinidir}/requirements.txt [testenv:integration-azuresql] -basepython = python3 commands = pytest -v test/integration/azuresql.dbtspec passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID deps = From 128b36bcdb6aeb92636fe318a5787a6dfee6336f Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:11:28 +0100 Subject: [PATCH 06/71] Update dependencies --- tox.ini | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index c8f50f5c..04e6919b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,11 +3,9 @@ envlist = unit, flake8, integration-sqlserver, integration-synapse [testenv:integration-sqlserver] commands = pytest -v test/integration/sqlserver.dbtspec -deps = - -r {toxinidir}/requirements.txt +deps = pytest==6.2.2 pytest-dbt-adapter~=0.4.0 [testenv:integration-azuresql] commands = pytest -v test/integration/azuresql.dbtspec passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID -deps = - -r {toxinidir}/requirements.txt \ No newline at end of file +deps = pytest==6.2.2 pytest-dbt-adapter~=0.4.0 \ No newline at end of file From 769948a02d1e7d1252dfd27a65c7b9e0c29a1402 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:19:08 +0100 Subject: [PATCH 07/71] Remove duplicate requirements --- requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 417ca28b..b9b8ab74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,5 @@ -dbt-core==0.19.0 -pyodbc>=4.0.27 -azure-identity>=1.4.0 black~=20.8b1 pytest-dbt-adapter~=0.4.0 tox==3.2.0 flake8>=3.5.0 certifi==2020.6.20 -. \ No newline at end of file From f272aaca5aad94a15eebfe0007529182d12740cc Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:20:09 +0100 Subject: [PATCH 08/71] Install requirements.txt in deps --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 04e6919b..eb61d7ee 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ envlist = unit, flake8, integration-sqlserver, integration-synapse [testenv:integration-sqlserver] commands = pytest -v test/integration/sqlserver.dbtspec -deps = pytest==6.2.2 pytest-dbt-adapter~=0.4.0 +deps = -r requirements.txt [testenv:integration-azuresql] commands = pytest -v test/integration/azuresql.dbtspec passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID -deps = pytest==6.2.2 pytest-dbt-adapter~=0.4.0 \ No newline at end of file +deps = -r requirements.txt \ No newline at end of file From b24d54e54f167fd3bea56a60ac5ee3b50e7a2b26 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:30:43 +0100 Subject: [PATCH 09/71] Have test env only --- tox.ini | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index eb61d7ee..745c0710 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,6 @@ [tox] -envlist = unit, flake8, integration-sqlserver, integration-synapse +envlist = py37,py38 -[testenv:integration-sqlserver] -commands = pytest -v test/integration/sqlserver.dbtspec +[testenv] +commands = pytest {posargs} deps = -r requirements.txt - -[testenv:integration-azuresql] -commands = pytest -v test/integration/azuresql.dbtspec -passenv = DBT_AZURESQL_DB DBT_AZURESQL_PWD DBT_AZURESQL_SERVER DBT_AZURESQL_UID -deps = -r requirements.txt \ No newline at end of file From e78bd18de00b14a089cd195249da7b23db686dca Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:32:05 +0100 Subject: [PATCH 10/71] Use posargs in circleci --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64d32051..3dc17c84 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: pkg-manager: pip - run: name: Test adapter on SQL Server against dbt-adapter-tests - command: tox -e integration-sqlserver + command: tox -- -v test/integration/sqlserver.dbtspec connection-sqlserver: <<: *sqlserver steps: @@ -87,7 +87,7 @@ jobs: dbt debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests - command: tox -e integration-azuresql + command: tox -- -v test/integration/azuresql.dbtspec connection-azuresql: docker: - image: dataders/pyodbc:1.4 From 17f7bdad37d7b2e329de63c6f88730ae42f4a5f5 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:34:17 +0100 Subject: [PATCH 11/71] Add pytest to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b9b8ab74..5b20f55d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ black~=20.8b1 pytest-dbt-adapter~=0.4.0 +pytest~=6.2.2 tox==3.2.0 flake8>=3.5.0 certifi==2020.6.20 From a4f740ad886f278f7d8b0e1255f6454945cb83ab Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:34:58 +0100 Subject: [PATCH 12/71] Install minimally needed packages in tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 745c0710..572fdc31 100644 --- a/tox.ini +++ b/tox.ini @@ -3,4 +3,4 @@ envlist = py37,py38 [testenv] commands = pytest {posargs} -deps = -r requirements.txt +deps = pytest-dbt-adapter~=0.4.0 pytest~=6.2.2 \ No newline at end of file From 8b73ad0e62b0e5cdc0f23548c05124eaff92c282 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:36:00 +0100 Subject: [PATCH 13/71] Rename requirements to dev_requirements --- requirements.txt => dev_requirements.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename requirements.txt => dev_requirements.txt (100%) diff --git a/requirements.txt b/dev_requirements.txt similarity index 100% rename from requirements.txt rename to dev_requirements.txt From 01188996ca78da7dd42987332d0bf78b97bb68c6 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:36:29 +0100 Subject: [PATCH 14/71] Change order of deps --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 572fdc31..574d0718 100644 --- a/tox.ini +++ b/tox.ini @@ -3,4 +3,4 @@ envlist = py37,py38 [testenv] commands = pytest {posargs} -deps = pytest-dbt-adapter~=0.4.0 pytest~=6.2.2 \ No newline at end of file +deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 \ No newline at end of file From 0ee10f34cd99fc2ebe0e21104228f1ed832126c4 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:45:25 +0100 Subject: [PATCH 15/71] Remove pip install from circle ci --- .circleci/config.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dc17c84..dafc74fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,8 +26,6 @@ jobs: - run: name: test connection via SQL CMD command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - - python/install-packages: - pkg-manager: pip - run: name: Test adapter on SQL Server against dbt-adapter-tests command: tox -- -v test/integration/sqlserver.dbtspec @@ -36,8 +34,6 @@ jobs: steps: - run: *install-git - checkout - - python/install-packages: - pkg-manager: pip - run: name: wait for SQL Server container to set up command: sleep 30 @@ -78,8 +74,6 @@ jobs: steps: - run: *install-git - checkout - - python/install-packages: - pkg-manager: pip - run: name: wake up serverless db command: | @@ -95,8 +89,6 @@ jobs: steps: - run: *install-git - checkout - - python/install-packages: - pkg-manager: pip - run: name: install gnupg command: apt-get install gnupg -y From f0cbaa0b9b0af93dcce0218577882d04d958c192 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:50:02 +0100 Subject: [PATCH 16/71] Make deps multiline --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 574d0718..efd2e1a6 100644 --- a/tox.ini +++ b/tox.ini @@ -3,4 +3,6 @@ envlist = py37,py38 [testenv] commands = pytest {posargs} -deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 \ No newline at end of file +deps = + pytest~=6.2.2 + pytest-dbt-adapter~=0.4.0 \ No newline at end of file From 7dec7534064a7982630a083439b1510b40d80812 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:56:18 +0100 Subject: [PATCH 17/71] Add python images to be sure multiple versions are available --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dafc74fe..7fec23f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,9 @@ orbs: jobs: integration-sqlserver: &sqlserver - docker: + docker: + - image: cimg/python:3.7 + - image: cimg/python:3.8 - image: dataders/pyodbc:1.4 - image: mcr.microsoft.com/mssql/server:2019-latest environment: From b6c831732a6113cd2d56c947be144d4651eac604 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 21:59:46 +0100 Subject: [PATCH 18/71] Move images down --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fec23f9..22346507 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,10 +7,10 @@ orbs: jobs: integration-sqlserver: &sqlserver docker: - - image: cimg/python:3.7 - - image: cimg/python:3.8 - image: dataders/pyodbc:1.4 - image: mcr.microsoft.com/mssql/server:2019-latest + - image: cimg/python:3.7 + - image: cimg/python:3.8 environment: ACCEPT_EULA: 'yes' MSSQL_SA_PASSWORD: 5atyaNadella From ce4cd67c401b672e642bb5337b87c3110393c5ab Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Thu, 11 Feb 2021 22:02:42 +0100 Subject: [PATCH 19/71] Run only for python 37 --- .circleci/config.yml | 2 -- tox.ini | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22346507..aa8909f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,6 @@ jobs: docker: - image: dataders/pyodbc:1.4 - image: mcr.microsoft.com/mssql/server:2019-latest - - image: cimg/python:3.7 - - image: cimg/python:3.8 environment: ACCEPT_EULA: 'yes' MSSQL_SA_PASSWORD: 5atyaNadella diff --git a/tox.ini b/tox.ini index efd2e1a6..66968738 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py38 +envlist = py37 [testenv] commands = pytest {posargs} From 85f33c4cd9f6e4f63e34c3022b8816ec8e677ca4 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sat, 13 Feb 2021 09:19:25 +0100 Subject: [PATCH 20/71] Fix versions in dev_requirements --- dev_requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 5b20f55d..fc97afee 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,6 +1,6 @@ -black~=20.8b1 -pytest-dbt-adapter~=0.4.0 -pytest~=6.2.2 +black==20.8b1 +pytest-dbt-adapter==0.4.0 +pytest==6.2.2 tox==3.2.0 -flake8>=3.5.0 +flake8==3.5.0 certifi==2020.6.20 From 0b02e098f8470295d5c7e1271175c3998768db14 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sat, 13 Feb 2021 09:20:06 +0100 Subject: [PATCH 21/71] Let version in setup.py be lower bounded --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 68ba819a..fad79100 100644 --- a/setup.py +++ b/setup.py @@ -57,8 +57,8 @@ def _dbt_sqlserver_version(): ] }, install_requires=[ - 'dbt-core~=0.19.0', + "dbt-core>=0.19.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0", ] -) \ No newline at end of file +) From a727d7efcd4c9311b99c2ed309445644f6b77ded Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:00:27 +0100 Subject: [PATCH 22/71] Change dbt version to allow for patches only --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fad79100..3b5e7560 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def _dbt_sqlserver_version(): ] }, install_requires=[ - "dbt-core>=0.19.0", + "dbt-core~=0.19.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0", ] From b83ede588faba94d2b573f6d38e7fa0607cc4337 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:23:51 +0100 Subject: [PATCH 23/71] Remove certifi --- dev_requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index fc97afee..34409954 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -3,4 +3,3 @@ pytest-dbt-adapter==0.4.0 pytest==6.2.2 tox==3.2.0 flake8==3.5.0 -certifi==2020.6.20 From bceaaaa8d93404fa6a5ed26ff7d052677ff14842 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:34:11 +0100 Subject: [PATCH 24/71] Remove dbt debug --- .circleci/config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa8909f9..ed04ae58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,14 +71,9 @@ jobs: docker: - image: dataders/pyodbc:1.4 executor: python/default - steps: + steps: - run: *install-git - checkout - - run: - name: wake up serverless db - command: | - cd test/integration - dbt debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests command: tox -- -v test/integration/azuresql.dbtspec From 4bf9a26a5292e3949cb7405c7b15696bf1da0975 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:37:08 +0100 Subject: [PATCH 25/71] Fix indentation --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed04ae58..3dd6779a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,7 @@ jobs: docker: - image: dataders/pyodbc:1.4 executor: python/default - steps: + steps: - run: *install-git - checkout - run: From e64f5d0f3491c932eadf3c86b891becd318edb1f Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:39:30 +0100 Subject: [PATCH 26/71] Set back dbt debug --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dd6779a..aa8909f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,6 +74,11 @@ jobs: steps: - run: *install-git - checkout + - run: + name: wake up serverless db + command: | + cd test/integration + dbt debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests command: tox -- -v test/integration/azuresql.dbtspec From f3ca75a6950644aaedc37518f1e39cca3c19b792 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:39:41 +0100 Subject: [PATCH 27/71] Add dbt env to tox --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 66968738..deb66c63 100644 --- a/tox.ini +++ b/tox.ini @@ -5,4 +5,7 @@ envlist = py37 commands = pytest {posargs} deps = pytest~=6.2.2 - pytest-dbt-adapter~=0.4.0 \ No newline at end of file + pytest-dbt-adapter~=0.4.0 + +[dbt] +commands = dbt {posargs} \ No newline at end of file From 6036a7d7161b3b9cea3d04e082e1ca69b31b0e92 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:55:21 +0100 Subject: [PATCH 28/71] Add dbt environment --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index deb66c63..9bde443d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] -envlist = py37 +envlist = py37, + dbt [testenv] commands = pytest {posargs} @@ -7,5 +8,6 @@ deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 -[dbt] +[testenv:dbt] +basepython = python3.7 commands = dbt {posargs} \ No newline at end of file From 1cac631a4b6eb112062a1990b63e93768998d527 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 08:57:20 +0100 Subject: [PATCH 29/71] Try dbt env in circleci --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa8909f9..f42cd802 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,8 +46,7 @@ jobs: - run: name: cnxn -- SQL Server - local sql cred command: | - cd test/integration - dbt compile --target sqlserver_local_userpass + tox --workdir test/integration -e dbt -- compile --target sqlserver_local_userpass - run: name: cnxn -- SQL Server - local sql cred encrypt command: | From bf656fa3b703cdbffb9326ca761b1ca442f33153 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:02:31 +0100 Subject: [PATCH 30/71] Update unit test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb3f447a..bde933cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - image: dataders/pyodbc:1.4 steps: - checkout - - run: tox -e unit + - run: tox -- -v test/unit integration-sqlserver: &sqlserver docker: - image: dataders/pyodbc:1.4 From b586e56ca65c0c0b3c2050dff843770818db0d8f Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:03:58 +0100 Subject: [PATCH 31/71] Use dbt env --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bde933cf..bf7b8819 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,8 +47,7 @@ jobs: name: prep for connecting command: | mkdir -p ~/.dbt - cd test/integration - cp sample.profiles.yml ~/.dbt/profiles.yml + cp test/integration/sample.profiles.yml ~/.dbt/profiles.yml - run: name: cnxn -- SQL Server - local sql cred command: | @@ -56,13 +55,11 @@ jobs: - run: name: cnxn -- SQL Server - local sql cred encrypt command: | - cd test/integration - dbt compile --target sqlserver_local_encrypt + tox --workdir test/integration -e dbt -- compile --target sqlserver_local_encrypt - run: name: cnxn -- Azure SQL - SQL cred command: | - cd test/integration - dbt compile --target azuresql_sqlcred + tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred # TODO drop support for this method in favor of # https://github.com/dbt-msft/dbt-sqlserver/pull/71 From a17bb8ff9a52c9d29020d966faa99525f32fa4ce Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:06:12 +0100 Subject: [PATCH 32/71] Add change log entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab8157d7..3a44001f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Under the hood: - This adapter has separate CI tests to ensure all the connection methods are working as they should [#75](https://github.com/dbt-msft/dbt-sqlserver/pull/75) - This adapter has a CI job for running unit tests [#103](https://github.com/dbt-msft/dbt-sqlserver/pull/103) +- Update the tox setup [#105](https://github.com/dbt-msft/dbt-sqlserver/pull/105) ### v0.18.1 #### New Features: From 6e12defb5cd204f1453bf6d81d8837c31d69023c Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:08:57 +0100 Subject: [PATCH 33/71] Use tox dbt environment --- .circleci/config.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf7b8819..94f3891c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,8 +78,7 @@ jobs: - run: name: wake up serverless db command: | - cd test/integration - dbt debug --target azuresql_sqlcred + tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests command: tox -- -v test/integration/azuresql.dbtspec @@ -98,8 +97,7 @@ jobs: - run: name: cnxn -- Azure SQL - SQL CRED user+pass command: | - cd test/integration - dbt compile --target azuresql_sqlcred + tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred - azure-cli/login-with-user: azure-username: DBT_AZURE_USERNAME azure-password: DBT_AZURE_PASSWORD @@ -108,8 +106,7 @@ jobs: - run: name: cnxn -- Azure SQL - AZ CLI User command: | - cd test/integration - dbt compile --target azuresql_azcli + tox --workdir test/integration -e dbt -- compile --target azuresql_azcli - azure-cli/login-with-service-principal: azure-sp: DBT_AZURE_SP_NAME azure-sp-password: DBT_AZURE_SP_SECRET @@ -117,8 +114,7 @@ jobs: - run: name: cnxn -- Azure SQL - AZ CLI ServicePrincipal command: | - cd test/integration - dbt compile --target azuresql_azcli + tox --workdir test/integration -e dbt -- compile --target azuresql_azcli workflows: main: From cf2f40c8b6abf11c17b0f926bd1bd53496a86d88 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:10:26 +0100 Subject: [PATCH 34/71] Add environment to tox tests --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94f3891c..e3a52b39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - image: dataders/pyodbc:1.4 steps: - checkout - - run: tox -- -v test/unit + - run: tox -e testenv -- -v test/unit integration-sqlserver: &sqlserver docker: - image: dataders/pyodbc:1.4 @@ -34,7 +34,7 @@ jobs: command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - run: name: Test adapter on SQL Server against dbt-adapter-tests - command: tox -- -v test/integration/sqlserver.dbtspec + command: tox -e testenv -- -v test/integration/sqlserver.dbtspec connection-sqlserver: <<: *sqlserver steps: @@ -81,7 +81,8 @@ jobs: tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests - command: tox -- -v test/integration/azuresql.dbtspec + command: | + tox -e testenv -- -v test/integration/azuresql.dbtspec connection-azuresql: docker: - image: dataders/pyodbc:1.4 From e3c21c17af27532e5c17a402f7bc93b2ce10c9a1 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:12:22 +0100 Subject: [PATCH 35/71] Make single line commands compose one line --- .circleci/config.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e3a52b39..4d2f8f1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,16 +50,13 @@ jobs: cp test/integration/sample.profiles.yml ~/.dbt/profiles.yml - run: name: cnxn -- SQL Server - local sql cred - command: | - tox --workdir test/integration -e dbt -- compile --target sqlserver_local_userpass + command: tox --workdir test/integration -e dbt -- compile --target sqlserver_local_userpass - run: name: cnxn -- SQL Server - local sql cred encrypt - command: | - tox --workdir test/integration -e dbt -- compile --target sqlserver_local_encrypt + command: tox --workdir test/integration -e dbt -- compile --target sqlserver_local_encrypt - run: name: cnxn -- Azure SQL - SQL cred - command: | - tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred + command: tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred # TODO drop support for this method in favor of # https://github.com/dbt-msft/dbt-sqlserver/pull/71 @@ -77,12 +74,10 @@ jobs: - checkout - run: name: wake up serverless db - command: | - tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred + command: tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests - command: | - tox -e testenv -- -v test/integration/azuresql.dbtspec + command: tox -e testenv -- -v test/integration/azuresql.dbtspec connection-azuresql: docker: - image: dataders/pyodbc:1.4 @@ -97,8 +92,7 @@ jobs: - run: *prep=connect - run: name: cnxn -- Azure SQL - SQL CRED user+pass - command: | - tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred + command: tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred - azure-cli/login-with-user: azure-username: DBT_AZURE_USERNAME azure-password: DBT_AZURE_PASSWORD @@ -106,16 +100,14 @@ jobs: azure-tenant: DBT_AZURE_TENANT - run: name: cnxn -- Azure SQL - AZ CLI User - command: | - tox --workdir test/integration -e dbt -- compile --target azuresql_azcli + command: tox --workdir test/integration -e dbt -- compile --target azuresql_azcli - azure-cli/login-with-service-principal: azure-sp: DBT_AZURE_SP_NAME azure-sp-password: DBT_AZURE_SP_SECRET azure-sp-tenant: DBT_AZURE_TENANT - run: name: cnxn -- Azure SQL - AZ CLI ServicePrincipal - command: | - tox --workdir test/integration -e dbt -- compile --target azuresql_azcli + command: tox --workdir test/integration -e dbt -- compile --target azuresql_azcli workflows: main: From 9b5f93f0aef37fdcb2e25f5936c6079ce54290fa Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:14:01 +0100 Subject: [PATCH 36/71] Rename py37 to testenv --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d2f8f1e..6e535e75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - image: dataders/pyodbc:1.4 steps: - checkout - - run: tox -e testenv -- -v test/unit + - run: tox -e py37 -- -v test/unit integration-sqlserver: &sqlserver docker: - image: dataders/pyodbc:1.4 @@ -34,7 +34,7 @@ jobs: command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - run: name: Test adapter on SQL Server against dbt-adapter-tests - command: tox -e testenv -- -v test/integration/sqlserver.dbtspec + command: tox -e py37 -- -v test/integration/sqlserver.dbtspec connection-sqlserver: <<: *sqlserver steps: @@ -77,7 +77,7 @@ jobs: command: tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests - command: tox -e testenv -- -v test/integration/azuresql.dbtspec + command: tox -e py37 -- -v test/integration/azuresql.dbtspec connection-azuresql: docker: - image: dataders/pyodbc:1.4 From 932fb43896b7f821d8905308b0e9eb22313a7ff5 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:57:37 +0100 Subject: [PATCH 37/71] Remove tox dbt env --- .circleci/config.yml | 30 +++++++++++++++++++++--------- tox.ini | 7 +------ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e535e75..13650c8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - image: dataders/pyodbc:1.4 steps: - checkout - - run: tox -e py37 -- -v test/unit + - run: tox -- -v test/unit integration-sqlserver: &sqlserver docker: - image: dataders/pyodbc:1.4 @@ -34,7 +34,7 @@ jobs: command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - run: name: Test adapter on SQL Server against dbt-adapter-tests - command: tox -e py37 -- -v test/integration/sqlserver.dbtspec + command: tox -- -v test/integration/sqlserver.dbtspec connection-sqlserver: <<: *sqlserver steps: @@ -50,13 +50,19 @@ jobs: cp test/integration/sample.profiles.yml ~/.dbt/profiles.yml - run: name: cnxn -- SQL Server - local sql cred - command: tox --workdir test/integration -e dbt -- compile --target sqlserver_local_userpass + command: | + cd test/integration + dbt compile --target sqlserver_local_userpass - run: name: cnxn -- SQL Server - local sql cred encrypt - command: tox --workdir test/integration -e dbt -- compile --target sqlserver_local_encrypt + command: | + cd test/integration + dbt compile --target sqlserver_local_encrypt - run: name: cnxn -- Azure SQL - SQL cred - command: tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred + command: | + cd test/integration + dbt compile --target azuresql_sqlcred # TODO drop support for this method in favor of # https://github.com/dbt-msft/dbt-sqlserver/pull/71 @@ -74,10 +80,12 @@ jobs: - checkout - run: name: wake up serverless db - command: tox --workdir test/integration -e dbt -- debug --target azuresql_sqlcred + command: | + cd test/integration + dbt debug --target azuresql_sqlcred - run: name: Test adapter on Azure SQL against dbt-adapter-tests - command: tox -e py37 -- -v test/integration/azuresql.dbtspec + command: tox -- -v test/integration/azuresql.dbtspec connection-azuresql: docker: - image: dataders/pyodbc:1.4 @@ -92,7 +100,9 @@ jobs: - run: *prep=connect - run: name: cnxn -- Azure SQL - SQL CRED user+pass - command: tox --workdir test/integration -e dbt -- compile --target azuresql_sqlcred + command: | + cd test/integration + dbt compile --target azuresql_azcli - azure-cli/login-with-user: azure-username: DBT_AZURE_USERNAME azure-password: DBT_AZURE_PASSWORD @@ -100,7 +110,9 @@ jobs: azure-tenant: DBT_AZURE_TENANT - run: name: cnxn -- Azure SQL - AZ CLI User - command: tox --workdir test/integration -e dbt -- compile --target azuresql_azcli + command: | + cd test/integration + dbt compile --target azuresql_azcli - azure-cli/login-with-service-principal: azure-sp: DBT_AZURE_SP_NAME azure-sp-password: DBT_AZURE_SP_SECRET diff --git a/tox.ini b/tox.ini index 003283e8..e4e2dc37 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,8 @@ [tox] -envlist = py37, - dbt +envlist = py37 [testenv] commands = pytest {posargs} deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 - -[testenv:dbt] -basepython = python3.7 -commands = dbt {posargs} From 9aac92d7959c85dcb380dfe838d27b389f22b57b Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 09:58:57 +0100 Subject: [PATCH 38/71] Add install dbt-sqlserver --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13650c8d..c703ca8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,9 @@ jobs: command: | apt-get install -y git - checkout + - run: &install-dbt-sqlserver + name: "install dbt-sqlserver" + command: python setup.py install - run: name: wait for SQL Server container to set up command: sleep 30 @@ -40,6 +43,7 @@ jobs: steps: - run: *install-git - checkout + - run: *install-dbt-sqlserver - run: name: wait for SQL Server container to set up command: sleep 30 @@ -78,6 +82,7 @@ jobs: steps: - run: *install-git - checkout + - run: *install-dbt-sqlserver - run: name: wake up serverless db command: | @@ -93,6 +98,7 @@ jobs: steps: - run: *install-git - checkout + - run: *install-dbt-sqlserver - run: name: install gnupg command: apt-get install gnupg -y From 4d24878a9bc9e692112fe084bd3695144ba8f2eb Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:00:08 +0100 Subject: [PATCH 39/71] Move install dbt-sqlserver down --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c703ca8f..41c91765 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,9 +26,6 @@ jobs: command: | apt-get install -y git - checkout - - run: &install-dbt-sqlserver - name: "install dbt-sqlserver" - command: python setup.py install - run: name: wait for SQL Server container to set up command: sleep 30 @@ -43,7 +40,9 @@ jobs: steps: - run: *install-git - checkout - - run: *install-dbt-sqlserver + - run: &install-dbt-sqlserver + name: "install dbt-sqlserver" + command: python setup.py install - run: name: wait for SQL Server container to set up command: sleep 30 From e90a6ebf35efac10b17b54191d7e56e9f3eb8e66 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:05:37 +0100 Subject: [PATCH 40/71] Add passenv --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index e4e2dc37..98e0cdd8 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,8 @@ envlist = py37 [testenv] commands = pytest {posargs} +passenv = + DBT_AZURESQL_DB deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 From 794a6c92658ca391beb072de1e98eb2f61668910 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:41:24 +0100 Subject: [PATCH 41/71] Print dbt version --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41c91765..fdddcd62 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,8 @@ jobs: connection-sqlserver: <<: *sqlserver steps: + - run: "dbt version" + command: dbt --version - run: *install-git - checkout - run: &install-dbt-sqlserver From e652ba074881ebe0662973357f78f56fb9571a93 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:42:09 +0100 Subject: [PATCH 42/71] Fix circleci --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fdddcd62..bcf641c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,8 +38,9 @@ jobs: connection-sqlserver: <<: *sqlserver steps: - - run: "dbt version" - command: dbt --version + - run: + name: "dbt version" + command: dbt --version - run: *install-git - checkout - run: &install-dbt-sqlserver From 26f27806c0fe8a18472cb0e562119bc5824efcc4 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:43:41 +0100 Subject: [PATCH 43/71] Print dbt version sooner --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bcf641c0..5525daca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,9 @@ jobs: MSSQL_IP_ADDRESS: 0.0.0.0 executor: python/default steps: + - run: + name: "dbt version" + command: dbt --version - run: &install-git name: "TEMP: install Git" command: | @@ -38,9 +41,6 @@ jobs: connection-sqlserver: <<: *sqlserver steps: - - run: - name: "dbt version" - command: dbt --version - run: *install-git - checkout - run: &install-dbt-sqlserver From 88f6b7deae4ddf9a9fcbc0ddbadc61275ec61fa6 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:47:52 +0100 Subject: [PATCH 44/71] Run uninstall dbt --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5525daca..4629202e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,8 +22,8 @@ jobs: executor: python/default steps: - run: - name: "dbt version" - command: dbt --version + name: "uninstall dbt" + command: pip uninstall dbt - run: &install-git name: "TEMP: install Git" command: | From 6495a251a5c0e83872ed87cb0af8651ae54502a8 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:50:06 +0100 Subject: [PATCH 45/71] Add which dbt --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4629202e..aff53b41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,8 +22,8 @@ jobs: executor: python/default steps: - run: - name: "uninstall dbt" - command: pip uninstall dbt + name: "run which dbt" + command: which dbt - run: &install-git name: "TEMP: install Git" command: | From 1cc601f9deec1f4ac3861ecaf773c490bb28fe91 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 10:54:02 +0100 Subject: [PATCH 46/71] Add DBT_AZURESQL_SERVER env --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 98e0cdd8..69683765 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = py37 commands = pytest {posargs} passenv = DBT_AZURESQL_DB + DBT_AZURESQL_SERVER deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 From 6f55f8be83a623ab0073bcb45f9892feddd107ae Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Sun, 14 Feb 2021 11:00:07 +0100 Subject: [PATCH 47/71] Add PWD and UID envs --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 69683765..7100edd5 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,8 @@ commands = pytest {posargs} passenv = DBT_AZURESQL_DB DBT_AZURESQL_SERVER + DBT_AZURESQL_PWD + DBT_AZURESQL_UID deps = pytest~=6.2.2 pytest-dbt-adapter~=0.4.0 From 29316eabdf74faafa62da7fb4c5ab6f592c73f5d Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Sun, 14 Feb 2021 11:13:18 -0800 Subject: [PATCH 48/71] correct category --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aff53b41..43f06250 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,11 +64,6 @@ jobs: command: | cd test/integration dbt compile --target sqlserver_local_encrypt - - run: - name: cnxn -- Azure SQL - SQL cred - command: | - cd test/integration - dbt compile --target azuresql_sqlcred # TODO drop support for this method in favor of # https://github.com/dbt-msft/dbt-sqlserver/pull/71 @@ -106,6 +101,11 @@ jobs: command: apt-get install gnupg -y - azure-cli/install - run: *prep=connect + - run: + name: cnxn -- Azure SQL - SQL cred + command: | + cd test/integration + dbt compile --target azuresql_sqlcred - run: name: cnxn -- Azure SQL - SQL CRED user+pass command: | From 226f35c4ddfd94c969d4566f5a8a8a2408750ea7 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Sun, 14 Feb 2021 11:13:44 -0800 Subject: [PATCH 49/71] deprecated --- .circleci/config.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 43f06250..95f35935 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,13 +65,6 @@ jobs: cd test/integration dbt compile --target sqlserver_local_encrypt - # TODO drop support for this method in favor of - # https://github.com/dbt-msft/dbt-sqlserver/pull/71 - # - run: - # name: cnxn -- Azure SQL - AAD Password - # command: | - # cd test/integration - # dbt compile --target azuresql_aad integration-azuresql: docker: - image: dataders/pyodbc:1.4 From 6bf6542bf0b3cbdc9f230d160ea777ef1258895e Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 15 Feb 2021 00:09:49 -0800 Subject: [PATCH 50/71] extraneous check --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 95f35935..f073bb7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,9 +21,6 @@ jobs: MSSQL_IP_ADDRESS: 0.0.0.0 executor: python/default steps: - - run: - name: "run which dbt" - command: which dbt - run: &install-git name: "TEMP: install Git" command: | From 4bf8887314a62aef0cb82b9b88e1ce276198f034 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 10:14:32 +0100 Subject: [PATCH 51/71] Change base image to debian latetst --- pyodbc.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyodbc.Dockerfile b/pyodbc.Dockerfile index 81144b02..badf90fb 100644 --- a/pyodbc.Dockerfile +++ b/pyodbc.Dockerfile @@ -1,5 +1,5 @@ -FROM python:3.7-slim AS base +FROM debian:latest ADD requirements.txt ./ From 2745bd855fe5c5591589ba1a8bbae1d905a1ba87 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 10:15:02 +0100 Subject: [PATCH 52/71] Remove requirements --- pyodbc.Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pyodbc.Dockerfile b/pyodbc.Dockerfile index badf90fb..b9cbc98b 100644 --- a/pyodbc.Dockerfile +++ b/pyodbc.Dockerfile @@ -1,8 +1,6 @@ FROM debian:latest -ADD requirements.txt ./ - # Setup dependencies for pyodbc RUN \ apt-get update && \ @@ -27,11 +25,7 @@ ENV PATH="$PATH:/opt/mssql-tools/bin" RUN \ sed 's/Driver=psql/Driver=\/usr\/lib\/x86_64-linux-gnu\/odbc\/psql/' /etc/odbcinst.ini > /tmp/temp.ini && \ mv -f /tmp/temp.ini /etc/odbcinst.ini -# Install pip -RUN \ - pip install --upgrade pip && \ - pip install -r requirements.txt && \ - rm requirements.txt + # permission management RUN \ chmod +rwx /etc/ssl/openssl.cnf && \ From c72119cc6d07dbfacfe63a5f03ca813b194c8dff Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 12:42:06 +0100 Subject: [PATCH 53/71] Revert changes to docker file --- pyodbc.Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pyodbc.Dockerfile b/pyodbc.Dockerfile index b9cbc98b..81144b02 100644 --- a/pyodbc.Dockerfile +++ b/pyodbc.Dockerfile @@ -1,5 +1,7 @@ -FROM debian:latest +FROM python:3.7-slim AS base + +ADD requirements.txt ./ # Setup dependencies for pyodbc RUN \ @@ -25,7 +27,11 @@ ENV PATH="$PATH:/opt/mssql-tools/bin" RUN \ sed 's/Driver=psql/Driver=\/usr\/lib\/x86_64-linux-gnu\/odbc\/psql/' /etc/odbcinst.ini > /tmp/temp.ini && \ mv -f /tmp/temp.ini /etc/odbcinst.ini - +# Install pip +RUN \ + pip install --upgrade pip && \ + pip install -r requirements.txt && \ + rm requirements.txt # permission management RUN \ chmod +rwx /etc/ssl/openssl.cnf && \ From cb25c02cbd1d13f1aa165261c9e752e685d42635 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 12:44:14 +0100 Subject: [PATCH 54/71] Add upgrade dbt step --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f073bb7f..30fc2a04 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,10 @@ jobs: name: "TEMP: install Git" command: | apt-get install -y git + - run: + name: "TEMP: upgrade dbt" # hot fix: dbt is installed in the pyodbc docker image, it should be removed there + command: | + pip install --upgrade dbt - checkout - run: name: wait for SQL Server container to set up From d9d1717be65b7c9f8232c97e34c6f82510596b1b Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:03:31 +0100 Subject: [PATCH 55/71] Remove pyodbc image --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30fc2a04..3f1adde7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,6 @@ jobs: - run: tox -- -v test/unit integration-sqlserver: &sqlserver docker: - - image: dataders/pyodbc:1.4 - image: mcr.microsoft.com/mssql/server:2019-latest environment: ACCEPT_EULA: 'yes' From adf4e450b13496929481e6b953562adddfb056c7 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:03:43 +0100 Subject: [PATCH 56/71] Remove upgrade dbt --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f1adde7..ca87201d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,10 +24,6 @@ jobs: name: "TEMP: install Git" command: | apt-get install -y git - - run: - name: "TEMP: upgrade dbt" # hot fix: dbt is installed in the pyodbc docker image, it should be removed there - command: | - pip install --upgrade dbt - checkout - run: name: wait for SQL Server container to set up From 80c4dd221bb446ffd2e08162f64a2e0564bd1e45 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:05:35 +0100 Subject: [PATCH 57/71] Remove pyodbc from unit job --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca87201d..8d8e982b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,8 +6,6 @@ orbs: jobs: unit: - docker: - - image: dataders/pyodbc:1.4 steps: - checkout - run: tox -- -v test/unit From d12a1e2c60038a439074b2ccadc56e68e5b6b12c Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:08:36 +0100 Subject: [PATCH 58/71] Add python image --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d8e982b..1cc10546 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,8 @@ orbs: jobs: unit: + docker: + - image: circleci/python:3.7 steps: - checkout - run: tox -- -v test/unit From de0a9e822163d4e43b961e4aebb3a96aa6f7bab3 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:10:03 +0100 Subject: [PATCH 59/71] Add pip install tox to unit test --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cc10546..65562ed2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: - image: circleci/python:3.7 steps: - checkout + - run: pip install tox - run: tox -- -v test/unit integration-sqlserver: &sqlserver docker: From 04681ba39f05ca8a91501b1befe687b2a0e8cb16 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:12:43 +0100 Subject: [PATCH 60/71] Add sql server to unit job --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65562ed2..92f5f75a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,11 @@ jobs: unit: docker: - image: circleci/python:3.7 + - image: mcr.microsoft.com/mssql/server:2019-latest + environment: + ACCEPT_EULA: 'yes' + MSSQL_SA_PASSWORD: 5atyaNadella + MSSQL_IP_ADDRESS: 0.0.0.0 steps: - checkout - run: pip install tox From 8127bb22e09f82310f633fc85f110c9a38641005 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:16:41 +0100 Subject: [PATCH 61/71] Install odbc --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92f5f75a..ab573a37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,12 @@ jobs: MSSQL_IP_ADDRESS: 0.0.0.0 steps: - checkout + - run: + name: "Install ODBC" + command: | + apt-get update + apt-get install g++ + apt-get install unixodbc-dev - run: pip install tox - run: tox -- -v test/unit integration-sqlserver: &sqlserver From 66994192e6f22c8e997cd05a077a531521f3f2a4 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:19:57 +0100 Subject: [PATCH 62/71] Add sudo --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab573a37..14b1753e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,9 +18,9 @@ jobs: - run: name: "Install ODBC" command: | - apt-get update - apt-get install g++ - apt-get install unixodbc-dev + sudo apt-get update + sudo apt-get install g++ + sudo apt-get install unixodbc-dev - run: pip install tox - run: tox -- -v test/unit integration-sqlserver: &sqlserver From 870b28322639a9160a58242117236c9d3e4366eb Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:26:57 +0100 Subject: [PATCH 63/71] Reuse parts of other jobs --- .circleci/config.yml | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14b1753e..f83ad79b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ orbs: azure-cli: circleci/azure-cli@1.1.0 jobs: - unit: + unit: &unit docker: - image: circleci/python:3.7 - image: mcr.microsoft.com/mssql/server:2019-latest @@ -15,7 +15,7 @@ jobs: MSSQL_IP_ADDRESS: 0.0.0.0 steps: - checkout - - run: + - run: &install-odbc name: "Install ODBC" command: | sudo apt-get update @@ -23,20 +23,12 @@ jobs: sudo apt-get install unixodbc-dev - run: pip install tox - run: tox -- -v test/unit - integration-sqlserver: &sqlserver - docker: - - image: mcr.microsoft.com/mssql/server:2019-latest - environment: - ACCEPT_EULA: 'yes' - MSSQL_SA_PASSWORD: 5atyaNadella - MSSQL_IP_ADDRESS: 0.0.0.0 + integration-sqlserver: + <<: *unit executor: python/default steps: - - run: &install-git - name: "TEMP: install Git" - command: | - apt-get install -y git - checkout + - run: *install-odbc - run: name: wait for SQL Server container to set up command: sleep 30 @@ -47,10 +39,10 @@ jobs: name: Test adapter on SQL Server against dbt-adapter-tests command: tox -- -v test/integration/sqlserver.dbtspec connection-sqlserver: - <<: *sqlserver + <<: *unit steps: - - run: *install-git - checkout + - run: *install-odbc - run: &install-dbt-sqlserver name: "install dbt-sqlserver" command: python setup.py install @@ -72,15 +64,12 @@ jobs: command: | cd test/integration dbt compile --target sqlserver_local_encrypt - integration-azuresql: - docker: - - image: dataders/pyodbc:1.4 + <<: *unit executor: python/default steps: - - run: *install-git - checkout - - run: *install-dbt-sqlserver + - run: *install-odbc - run: name: wake up serverless db command: | @@ -90,13 +79,11 @@ jobs: name: Test adapter on Azure SQL against dbt-adapter-tests command: tox -- -v test/integration/azuresql.dbtspec connection-azuresql: - docker: - - image: dataders/pyodbc:1.4 + <<: *unit executor: python/default steps: - - run: *install-git - checkout - - run: *install-dbt-sqlserver + - run: *install-odbc - run: name: install gnupg command: apt-get install gnupg -y From 1ded9d7566f494bd49a89f3bced68f9767da2596 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:28:50 +0100 Subject: [PATCH 64/71] Add sudo to python install --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f83ad79b..9b29d9b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ jobs: - run: *install-odbc - run: &install-dbt-sqlserver name: "install dbt-sqlserver" - command: python setup.py install + command: sudo python setup.py install - run: name: wait for SQL Server container to set up command: sleep 30 From 50c41faf193bdd1d698b1cb39f160043c2a9df3c Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:32:30 +0100 Subject: [PATCH 65/71] Reset circleci --- .circleci/config.yml | 50 +++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b29d9b2..30fc2a04 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,30 +5,31 @@ orbs: azure-cli: circleci/azure-cli@1.1.0 jobs: - unit: &unit + unit: docker: - - image: circleci/python:3.7 + - image: dataders/pyodbc:1.4 + steps: + - checkout + - run: tox -- -v test/unit + integration-sqlserver: &sqlserver + docker: + - image: dataders/pyodbc:1.4 - image: mcr.microsoft.com/mssql/server:2019-latest environment: ACCEPT_EULA: 'yes' MSSQL_SA_PASSWORD: 5atyaNadella MSSQL_IP_ADDRESS: 0.0.0.0 - steps: - - checkout - - run: &install-odbc - name: "Install ODBC" - command: | - sudo apt-get update - sudo apt-get install g++ - sudo apt-get install unixodbc-dev - - run: pip install tox - - run: tox -- -v test/unit - integration-sqlserver: - <<: *unit executor: python/default steps: + - run: &install-git + name: "TEMP: install Git" + command: | + apt-get install -y git + - run: + name: "TEMP: upgrade dbt" # hot fix: dbt is installed in the pyodbc docker image, it should be removed there + command: | + pip install --upgrade dbt - checkout - - run: *install-odbc - run: name: wait for SQL Server container to set up command: sleep 30 @@ -39,13 +40,13 @@ jobs: name: Test adapter on SQL Server against dbt-adapter-tests command: tox -- -v test/integration/sqlserver.dbtspec connection-sqlserver: - <<: *unit + <<: *sqlserver steps: + - run: *install-git - checkout - - run: *install-odbc - run: &install-dbt-sqlserver name: "install dbt-sqlserver" - command: sudo python setup.py install + command: python setup.py install - run: name: wait for SQL Server container to set up command: sleep 30 @@ -64,12 +65,15 @@ jobs: command: | cd test/integration dbt compile --target sqlserver_local_encrypt + integration-azuresql: - <<: *unit + docker: + - image: dataders/pyodbc:1.4 executor: python/default steps: + - run: *install-git - checkout - - run: *install-odbc + - run: *install-dbt-sqlserver - run: name: wake up serverless db command: | @@ -79,11 +83,13 @@ jobs: name: Test adapter on Azure SQL against dbt-adapter-tests command: tox -- -v test/integration/azuresql.dbtspec connection-azuresql: - <<: *unit + docker: + - image: dataders/pyodbc:1.4 executor: python/default steps: + - run: *install-git - checkout - - run: *install-odbc + - run: *install-dbt-sqlserver - run: name: install gnupg command: apt-get install gnupg -y From 41f391934c3cd85afb2e751fef1f1d4bcc24dc9f Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:35:02 +0100 Subject: [PATCH 66/71] Upgrade dbt in other jobs --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30fc2a04..801efa2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: name: "TEMP: install Git" command: | apt-get install -y git - - run: + - run: &upgrade-dbt name: "TEMP: upgrade dbt" # hot fix: dbt is installed in the pyodbc docker image, it should be removed there command: | pip install --upgrade dbt @@ -43,6 +43,7 @@ jobs: <<: *sqlserver steps: - run: *install-git + - run: *upgrade-dbt - checkout - run: &install-dbt-sqlserver name: "install dbt-sqlserver" @@ -72,6 +73,7 @@ jobs: executor: python/default steps: - run: *install-git + - run: *upgrade-dbt - checkout - run: *install-dbt-sqlserver - run: @@ -88,6 +90,7 @@ jobs: executor: python/default steps: - run: *install-git + - run: *upgrade-dbt - checkout - run: *install-dbt-sqlserver - run: From aa9f4aceb0d6a2fc62cb1be168c57320ceb77147 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:43:37 +0100 Subject: [PATCH 67/71] Remove wrongly pasted step --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 801efa2b..f6732e1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,11 +103,6 @@ jobs: command: | cd test/integration dbt compile --target azuresql_sqlcred - - run: - name: cnxn -- Azure SQL - SQL CRED user+pass - command: | - cd test/integration - dbt compile --target azuresql_azcli - azure-cli/login-with-user: azure-username: DBT_AZURE_USERNAME azure-password: DBT_AZURE_PASSWORD From 5cab4d4563912a63794ae7d0558976923287ca55 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:45:17 +0100 Subject: [PATCH 68/71] Rename step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6732e1e..b16c19d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -99,7 +99,7 @@ jobs: - azure-cli/install - run: *prep=connect - run: - name: cnxn -- Azure SQL - SQL cred + name: cnxn -- Azure SQL - SQL CRED user+pass command: | cd test/integration dbt compile --target azuresql_sqlcred From fc8e23357c7e745a0fa7c2fb828e27a91beeec41 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:47:59 +0100 Subject: [PATCH 69/71] Fix dbt compile --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b16c19d2..2ff23b70 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,7 +119,7 @@ jobs: azure-sp-tenant: DBT_AZURE_TENANT - run: name: cnxn -- Azure SQL - AZ CLI ServicePrincipal - command: tox --workdir test/integration -e dbt -- compile --target azuresql_azcli + command: dbt compile --target azuresql_azcli workflows: main: From aa8771ad337535eb1961d5ec621b4513f59cc58d Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 17:48:56 +0100 Subject: [PATCH 70/71] Set back cd --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ff23b70..cb6abb2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,7 +119,9 @@ jobs: azure-sp-tenant: DBT_AZURE_TENANT - run: name: cnxn -- Azure SQL - AZ CLI ServicePrincipal - command: dbt compile --target azuresql_azcli + command: | + cd test/integration + dbt compile --target azuresql_azcli workflows: main: From 5f0bfd2fe76325de8d443dec1d267bc56aad65a7 Mon Sep 17 00:00:00 2001 From: Cor Zuurmond Date: Mon, 15 Feb 2021 19:54:07 +0100 Subject: [PATCH 71/71] Remove executors --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb6abb2a..fb2e77aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,6 @@ jobs: ACCEPT_EULA: 'yes' MSSQL_SA_PASSWORD: 5atyaNadella MSSQL_IP_ADDRESS: 0.0.0.0 - executor: python/default steps: - run: &install-git name: "TEMP: install Git" @@ -70,7 +69,6 @@ jobs: integration-azuresql: docker: - image: dataders/pyodbc:1.4 - executor: python/default steps: - run: *install-git - run: *upgrade-dbt @@ -87,7 +85,6 @@ jobs: connection-azuresql: docker: - image: dataders/pyodbc:1.4 - executor: python/default steps: - run: *install-git - run: *upgrade-dbt