projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix Bug #1088 Zipping packages using osm repo-index" into v7.0
[osm/osmclient.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index
a09288a
..
b02cab2
100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-15,35
+15,39
@@
# under the License.
#
[tox]
# under the License.
#
[tox]
-envlist = py3
5,flake8,py
flakes
+envlist = py3
6,
flakes
toxworkdir={toxinidir}/.tox
[testenv]
toxworkdir={toxinidir}/.tox
[testenv]
-deps = -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
commands=nosetests
commands=nosetests
-install_command = python -m pip install -r test-requirements.txt -U {opts} {packages}
-[testenv:flake
8
]
+[testenv:flake
s
]
basepython = python3
deps = flake8
basepython = python3
deps = flake8
+ pyflakes
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
commands =
flake8 setup.py
commands =
flake8 setup.py
-
-[testenv:pyflakes]
-basepython = python3
-deps = pyflakes
-commands =
pyflakes osmclient
[testenv:build]
pyflakes osmclient
[testenv:build]
-basepython = python
3
+basepython = python
deps = stdeb
setuptools-version-command
deps = stdeb
setuptools-version-command
-commands = python setup.py --command-packages=stdeb.command bdist_deb
+ -r{toxinidir}/requirements.txt
+install_command = python2 -m pip install -U {opts} {packages}
+commands = python2 setup.py --command-packages=stdeb.command bdist_deb
[testenv:build3]
basepython = python3
deps = stdeb
setuptools-version-command
[testenv:build3]
basepython = python3
deps = stdeb
setuptools-version-command
+ -r{toxinidir}/requirements.txt
+install_command = python3 -m pip install -U {opts} {packages}
commands = python3 setup.py --command-packages=stdeb.command bdist_deb
commands = python3 setup.py --command-packages=stdeb.command bdist_deb