Merge "Use them same versions of Influx or Cassandra"
This commit is contained in:
commit
984e0ab877
@ -17,8 +17,6 @@ pbr>=1.8 # Apache-2.0
|
|||||||
six>=1.9.0 # MIT
|
six>=1.9.0 # MIT
|
||||||
pyparsing>=2.1.0 # MIT
|
pyparsing>=2.1.0 # MIT
|
||||||
voluptuous>=0.8.9 # BSD License
|
voluptuous>=0.8.9 # BSD License
|
||||||
#influxdb
|
|
||||||
#cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0
|
|
||||||
eventlet!=0.18.3,>=0.18.2 # MIT
|
eventlet!=0.18.3,>=0.18.2 # MIT
|
||||||
simplejson>=2.2.0 # MIT
|
simplejson>=2.2.0 # MIT
|
||||||
monasca-common>=1.4.0 # Apache-2.0
|
monasca-common>=1.4.0 # Apache-2.0
|
||||||
|
@ -7,8 +7,10 @@ bashate>=0.2 # Apache-2.0
|
|||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
Babel>=2.3.4 # BSD
|
Babel>=2.3.4 # BSD
|
||||||
coverage>=4.0 # Apache-2.0
|
coverage>=4.0 # Apache-2.0
|
||||||
|
cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
httplib2>=0.7.5 # MIT
|
httplib2>=0.7.5 # MIT
|
||||||
|
influxdb>=2.9.2 # MIT
|
||||||
mock>=2.0 # BSD
|
mock>=2.0 # BSD
|
||||||
funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0
|
funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0
|
||||||
mox>=0.5.3 # Apache-2.0
|
mox>=0.5.3 # Apache-2.0
|
||||||
|
23
tox.ini
23
tox.ini
@ -1,5 +1,5 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py27,pep8
|
envlist = py27,pep8,cover
|
||||||
minversion = 2.1
|
minversion = 2.1
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
@ -27,21 +27,24 @@ commands =
|
|||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps = {[testenv:unit_deps]deps}
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
ostestr {posargs}
|
ostestr {posargs}
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
basepython = python3.5
|
basepython = python3.5
|
||||||
deps = {[testenv:unit_deps]deps}
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
ostestr {posargs}
|
ostestr {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
deps = {[testenv:unit_deps]deps}
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
coverage erase
|
coverage erase
|
||||||
@ -49,7 +52,8 @@ commands =
|
|||||||
coverage report
|
coverage report
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
deps = {[testenv:unit_deps]deps}
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
oslo_debug_helper -t ./monasca_api/tests {posargs}
|
oslo_debug_helper -t ./monasca_api/tests {posargs}
|
||||||
@ -84,15 +88,6 @@ commands =
|
|||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# note(trebskit): this is just placeholder to wrap all common dependencies
|
|
||||||
# needed to run tests, those dependencies won't likely
|
|
||||||
# be needed for every possible -e here, so extracted them here
|
|
||||||
[testenv:unit_deps]
|
|
||||||
deps =
|
|
||||||
{[testenv]deps}
|
|
||||||
influxdb==2.8.0
|
|
||||||
cassandra-driver>=2.1.4,!=3.6.0
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# TODO: ignored checks should be enabled in the future
|
# TODO: ignored checks should be enabled in the future
|
||||||
# H201 no 'except:' at least use 'except Exception:'
|
# H201 no 'except:' at least use 'except Exception:'
|
||||||
|
Loading…
Reference in New Issue
Block a user