mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
95a38461fe
This is the simplest method of preserving the commit history for each file from the salt-cloud repository, although the --follow flag must be given to git log in order to view the full history. This change allows for performing a regular git merge from within the Salt repo without any merge conflicts occuring (since the salt_cloud dir doesn't exist there).
29 lines
539 B
INI
29 lines
539 B
INI
[tox]
|
|
envlist = py26,py27,py32
|
|
|
|
[testenv:py26]
|
|
setenv = VIRTUAL_ENV={envdir}
|
|
deps = -r{toxinidir}/requirements.txt
|
|
unittest2
|
|
mock
|
|
coverage
|
|
commands =
|
|
coverage run ./tests/runtests.py
|
|
|
|
[testenv:py27]
|
|
setenv = VIRTUAL_ENV={envdir}
|
|
deps = -r{toxinidir}/requirements.txt
|
|
mock
|
|
coverage
|
|
commands =
|
|
coverage run ./tests/runtests.py
|
|
|
|
[testenv:py32]
|
|
basepython = python3.2
|
|
setenv = VIRTUAL_ENV={envdir}
|
|
deps =
|
|
-r{toxinidir}/requirements.txt
|
|
mock
|
|
coverage
|
|
commands =
|
|
coverage run ./tests/runtests.py |