Clean up tox ini

.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:
@@ -26,18 +28,14 @@ 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 -e integration-sqlserver
+          command: tox -- -v test/integration/sqlserver.dbtspec
   connection-sqlserver:
     <<: *sqlserver
     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,25 +76,21 @@ jobs:
     steps:
       - run: *install-git
       - checkout
-      - python/install-packages:
-          pkg-manager: pip
       - 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 -e integration-azuresql
+          command: tox -- -v test/integration/azuresql.dbtspec
   connection-azuresql:
     docker: 
       - image: dataders/pyodbc:1.4
     executor: python/default 
     steps:
       - run: *install-git
       - checkout
-      - python/install-packages:
-          pkg-manager: pip
       - run:
           name: install gnupg
           command: apt-get install gnupg -y

requirements.txt → dev_requirements.txt

@@ -1,9 +1,6 @@
-dbt-core==0.19.0
-pyodbc>=4.0.27
-azure-identity>=1.4.0
 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
-.

tox.ini

@@ -1,18 +1,8 @@
 [tox]
-skipsdist = True
-envlist = unit, flake8, integration-sqlserver, integration-synapse
+envlist = py37,py38
 
-[testenv:integration-sqlserver]
-basepython = python3
-commands = /bin/bash -c '{envpython} -m pytest -v test/integration/sqlserver.dbtspec'
+[testenv]
+commands = pytest {posargs}
 deps =
-    -r{toxinidir}/requirements.txt
-    -e.
-
-[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.
+  pytest~=6.2.2
+  pytest-dbt-adapter~=0.4.0