General cleanup
- Remove unused Dockerfiles
- Simplify Makefile
- Use tox.ini to store nose config
- Bump version of voltha-protos and fix test
Change-Id: I8d6a1e8dfafd84bd21f495b0f6b96885f829c208
diff --git a/tox.ini b/tox.ini
index b32b8b6..60d0614 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,3 @@
-;
; Copyright 2017 the original author or authors.
;
; Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,74 +11,24 @@
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
-;
+
[tox]
-;envlist = py27, py36, py3-analysis, py3-test
envlist = py27
-minversion = 2.5.0
-
-[package]
-name = pyvoltha
-
-[cov]
-xml = --cov-report xml:{toxworkdir}/{envname}coverage.xml
-term = --cov-report term-missing
-html = --cov-report html:{toxworkdir}/{envname}cov
-branch = --cov-branch
-directory =--cov {envsitepackagesdir}/{[package]name}
-coverage = {[cov]xml} {[cov]term} {[cov]html} {[cov]branch} {[cov]directory}
-cov_fail_under=100
-
-[pylama]
-format = pylint
-skip = */.tox/*,*/.env/*
-linters = pep8,pylint
-analysis_dirs = {[package]name} test
-analysis = pylama {[pylama]analysis_dirs}
-
-[pylama:pep8]
-max_line_length=99
-ignore = E203, W503, R0903
-
-[pylama:test/*]
-ignore = C0111,R0201,R0903
-
-[pytest]
-passenv = {env:PYTEST_ARGS}
-flags =-vvl {env:PYTEST_ARGS:}
-cov-fail-under=100
-unit_results =--junitxml={toxworkdir}/{envname}_results.xml
-test = py.test {[pytest]flags} {[pytest]unit_results}
-with_metrics = {[pytest]test} {[cov]coverage}
-
-[nosetests]
-passenv =
[testenv]
-changedir = test/unit
-basepython =
- py27: python2.7
- ;py3: python3
-envdir =
- py27: {toxworkdir}/.py27
- ;py3: {toxworkdir}/.py3
-setenv =
- COVERAGE_FILE = {envdir}/.coverage
- PYTHONPATH = {toxinidir}:{toxinidir}/pyvoltha/protos/third_party
-
commands =
- py27: nosetests {posargs}
-; py3-test: {[pytest]with_metrics} test
-; py3-no-coverage: {[pytest]test} test
-; py3-unit: {[pytest]with_metrics} test/unit
-; py3-component: {[pytest]with_metrics} test/component
-; py3-adhoc: {posargs: bash -c 'echo must provide posargs with "tox args -- posargs"'}
-; py3-analysis: {[pylama]analysis}
-; py3-analysis: black --check {[pylama]analysis_dirs}
-; py3-black: black {[pylama]analysis_dirs}
-; py3-docs: sphinx-build -b html docs docs_out
+ nosetests -c tox.ini
deps =
nose
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
\ No newline at end of file
+ mock
+ coverage
+ -r requirements.txt
+
+[nosetests]
+with-xunit=1
+xunit-file=nose-results.xml
+with-coverage=1
+cover-xml=1
+cover-xml-file=coverage.xml
+cover-package=pyvoltha