Commit ba472772 authored by Felipe Jin's avatar Felipe Jin Committed by George Kadianakis
Browse files

Removing tox for clarity in CI and tests

parent 95bd0831

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ pip-delete-this-directory.txt 


# Unit test / coverage reports

htmlcov/

.tox/

.coverage

.cache

nosetests.xml

.travis.yml

+13 −9
Original line number Diff line number Diff line 
language: python

sudo: required

dist: bionic

python: 3.9

python: 3.7

env:

  - TOXENV=py39 TEST=unit

  - TOXENV=style

  - TOXENV=docs

  - TEST=unit

before_install:

  # Install tor and chutney if doing functional tests

  - if [[ $TEST == functional* ]]; then ./test/scripts/install-tor.sh; fi

  - if [[ $TEST == 'functional_v2' ]]; then source test/scripts/install-chutney-v2.sh; fi

  - if [[ $TEST == 'functional_v3' ]]; then source test/scripts/install-chutney-v3.sh; fi

install:

  - pip install tox coveralls

  - pip install -r requirements.txt

  - pip install -r test-requirements.txt

script:

  - if [[ $TEST == 'functional_v2' ]]; then tox ./test/functional/v2/;

   elif [[ $TEST == 'functional_v3' ]]; then tox ./test/functional/v3/;

   elif [[ $TEST == 'unit' ]]; then tox -- --ignore=./test/functional/;

   else tox; fi

  # Tests are run with linters

  - if [[ $TEST == functional* ]];

    then

      source ./test/scripts/run-functional-tests.sh;

    elif [[ $TEST == 'unit' ]];

    then

      source ./test/scripts/run-unit-tests.sh;

    fi

  - sphinx-build -W -b html -d ./docs/_build ./docs ./docs/_build/html

after_success:

  - coveralls

MANIFEST.in

+0 −1
Original line number Diff line number Diff line 
include README.rst

include COPYING

include requirements.txt

include tox.ini

recursive-include docs *.rst

recursive-include onionbalance/config_generator/data *

include versioneer.py

setup.cfg

+6 −2
Original line number Diff line number Diff line 
[tool:pytest]

norecursedirs = .tox _build tor chutney

norecursedirs = _build tor chutney



[bdist_wheel]

universal=1
@@ -11,3 +11,7 @@ versionfile_source = onionbalance/_version.py 
versionfile_build = onionbalance/_version.py

tag_prefix =''

parentdir_prefix = onionbalance-



[flake8]

ignore = E501, E302, E251, E305, E261

exclude = onionbalance/hs_v3/ext/
 
 No newline at end of file

setup.py

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ setup( 
        'setproctitle',

        'cryptography>=2.5',

    ],

    tests_require=['tox', 'pytest-mock', 'pytest', 'mock', 'pexpect'],

    tests_require=['pytest-mock', 'pytest', 'mock', 'pexpect', 'pylint', 'flake8', 'coveralls'],

    package_data={'onionbalance.config_generator': ['data/*']},

    include_package_data=True,

    classifiers=[