Skip to content

Commit 1a72a86

Browse files
committed
Fix tox.ini to support the latest tox. (#234)
### Description Fixes `tox.ini` to support the latest `tox`.
1 parent 4eea700 commit 1a72a86

File tree

1 file changed

+56
-33
lines changed

1 file changed

+56
-33
lines changed

tox.ini

+56-33
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,84 @@ envlist = linter, unit
44

55
[testenv:linter]
66
basepython = python3
7-
commands = /bin/bash -c '$(which black) --config black.ini --check .'
8-
/bin/bash -c '$(which flake8) --select=E,W,F --ignore=E203,W503 --max-line-length=100 .'
9-
/bin/bash -c '$(which mypy) --config-file mypy.ini --namespace-packages --explicit-package-bases dbt tests'
10-
passenv = DBT_* PYTEST_ADDOPTS
7+
commands =
8+
{envpython} -m black --config black.ini --check .
9+
{envpython} -m flake8 --select=E,W,F --ignore=E203,W503 --max-line-length=100 .
10+
{envpython} -m mypy --config-file mypy.ini --namespace-packages --explicit-package-bases dbt tests
11+
passenv =
12+
DBT_*
13+
PYTEST_ADDOPTS
1114
deps =
12-
-r{toxinidir}/dev-requirements.txt
13-
-r{toxinidir}/requirements.txt
15+
-r{toxinidir}/dev-requirements.txt
16+
-r{toxinidir}/requirements.txt
1417

1518
[testenv:black]
1619
basepython = python3
17-
commands = /bin/bash -c '$(which black) --config black.ini .'
18-
passenv = DBT_* PYTEST_ADDOPTS
20+
commands = {envpython} -m black --config black.ini .
21+
passenv =
22+
DBT_*
23+
PYTEST_ADDOPTS
1924
deps =
20-
-r{toxinidir}/dev-requirements.txt
25+
-r{toxinidir}/dev-requirements.txt
2126

2227
[testenv:unit]
2328
basepython = python3
24-
commands = /bin/bash -c '{envpython} -m pytest -v {posargs} tests/unit'
25-
passenv = DBT_* PYTEST_ADDOPTS
29+
commands = {envpython} -m pytest --color=yes -v {posargs} tests/unit
30+
passenv =
31+
DBT_*
32+
PYTEST_ADDOPTS
2633
deps =
27-
-r{toxinidir}/dev-requirements.txt
28-
-r{toxinidir}/requirements.txt
34+
-r{toxinidir}/dev-requirements.txt
35+
-r{toxinidir}/requirements.txt
2936

3037
[testenv:integration-databricks-cluster]
3138
basepython = python3
32-
commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_cluster -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
33-
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_cluster -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
34-
passenv = DBT_* PYTEST_ADDOPTS
39+
commands =
40+
/bin/bash -c '{envpython} -m pytest -v --profile databricks_cluster -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
41+
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_cluster -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
42+
passenv =
43+
DBT_*
44+
PYTEST_ADDOPTS
3545
deps =
36-
-r{toxinidir}/dev-requirements.txt
37-
-r{toxinidir}/requirements.txt
46+
-r{toxinidir}/dev-requirements.txt
47+
-r{toxinidir}/requirements.txt
48+
allowlist_externals = /bin/bash
3849

3950
[testenv:integration-databricks-uc-cluster]
4051
basepython = python3
41-
commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_uc_cluster -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
42-
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_uc_cluster -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
43-
passenv = DBT_* PYTEST_ADDOPTS
52+
commands =
53+
/bin/bash -c '{envpython} -m pytest -v --profile databricks_uc_cluster -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
54+
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_uc_cluster -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
55+
passenv =
56+
DBT_*
57+
PYTEST_ADDOPTS
4458
deps =
45-
-r{toxinidir}/dev-requirements.txt
46-
-r{toxinidir}/requirements.txt
59+
-r{toxinidir}/dev-requirements.txt
60+
-r{toxinidir}/requirements.txt
61+
allowlist_externals = /bin/bash
4762

4863
[testenv:integration-databricks-sql-endpoint]
4964
basepython = python3
50-
commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_sql_endpoint -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
51-
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_sql_endpoint -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
52-
passenv = DBT_* PYTEST_ADDOPTS
65+
commands =
66+
/bin/bash -c '{envpython} -m pytest -v --profile databricks_sql_endpoint -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
67+
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_sql_endpoint -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
68+
passenv =
69+
DBT_*
70+
PYTEST_ADDOPTS
5371
deps =
54-
-r{toxinidir}/dev-requirements.txt
55-
-r{toxinidir}/requirements.txt
72+
-r{toxinidir}/dev-requirements.txt
73+
-r{toxinidir}/requirements.txt
74+
allowlist_externals = /bin/bash
5675

5776
[testenv:integration-databricks-uc-sql-endpoint]
5877
basepython = python3
59-
commands = /bin/bash -c '{envpython} -m pytest -v --profile databricks_uc_sql_endpoint -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
60-
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_uc_sql_endpoint -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
61-
passenv = DBT_* PYTEST_ADDOPTS
78+
commands =
79+
/bin/bash -c '{envpython} -m pytest -v --profile databricks_uc_sql_endpoint -n4 tests/functional/adapter/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
80+
/bin/bash -c '{envpython} -m pytest -v -m profile_databricks_uc_sql_endpoint -n4 tests/integration/* {posargs}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret'
81+
passenv =
82+
DBT_*
83+
PYTEST_ADDOPTS
6284
deps =
63-
-r{toxinidir}/dev-requirements.txt
64-
-r{toxinidir}/requirements.txt
85+
-r{toxinidir}/dev-requirements.txt
86+
-r{toxinidir}/requirements.txt
87+
allowlist_externals = /bin/bash

0 commit comments

Comments
 (0)