From b48232f167bdae54e561dc1f77d3f2d373281461 Mon Sep 17 00:00:00 2001 From: Alberto Vara Date: Fri, 13 Dec 2019 19:41:03 +0100 Subject: [PATCH] Updated tox and dependencies (#77) --- .travis.yml | 2 - Pipfile | 1 - Pipfile.lock | 29 ++++--------- requirements-tests.txt | 93 ------------------------------------------ tox.ini | 21 ++++++---- 5 files changed, 19 insertions(+), 127 deletions(-) delete mode 100644 requirements-tests.txt diff --git a/.travis.yml b/.travis.yml index 1600ad0..411ea87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ install: - pip install -U tox coverage==4.0.3 coveralls==1.8.2 script: - - pipenv install --dev - - pipenv run pip freeze > requirements-tests.txt - coverage erase - tox after_success: diff --git a/Pipfile b/Pipfile index f5e7fe9..236eef4 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,6 @@ pytest-cov = "*" pylint = "*" flake8 = "*" tox = "*" -safety = "*" bandit = "*" mkdocs = "*" lightstep = "==4.3.0" diff --git a/Pipfile.lock b/Pipfile.lock index 6f63dce..e44eaf6 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "95b636988dfda2dfabd3c256558afb93045854dfefffb1eafa823c9357533ce8" + "sha256": "9079938e085a7a10b53424f93b9b8a672d21f4e85dff2b9f714c5d18019fb1dc" }, "pipfile-spec": 6, "requires": { @@ -106,11 +106,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:3a8b2dfd0a2c6a3636e7c016a7e54ae04b997d30e69d5eacdca7a6c2221a1402", - "sha256:41e688146d000891f32b1669e8573c57e39e5060e7f5f647aa617cd9a9568278" + "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45", + "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f" ], "markers": "python_version < '3.8'", - "version": "==1.2.0" + "version": "==1.3.0" }, "inflection": { "hashes": [ @@ -410,13 +410,6 @@ "index": "pypi", "version": "==4.5.4" }, - "dparse": { - "hashes": [ - "sha256:00a5fdfa900629e5159bf3600d44905b333f4059a3366f28e0dbd13eeab17b19", - "sha256:cef95156fa0adedaf042cd42f9990974bec76f25dfeca4dc01f381a243d5aa5b" - ], - "version": "==0.4.1" - }, "entrypoints": { "hashes": [ "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", @@ -468,11 +461,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:3a8b2dfd0a2c6a3636e7c016a7e54ae04b997d30e69d5eacdca7a6c2221a1402", - "sha256:41e688146d000891f32b1669e8573c57e39e5060e7f5f647aa617cd9a9568278" + "sha256:073a852570f92da5f744a3472af1b61e28e9f78ccf0c9117658dc32b15de7b45", + "sha256:d95141fbfa7ef2ec65cfd945e2af7e5a6ddbd7c8d9a25e66ff3be8e3daf9f60f" ], "markers": "python_version < '3.8'", - "version": "==1.2.0" + "version": "==1.3.0" }, "isort": { "hashes": [ @@ -731,14 +724,6 @@ "index": "pypi", "version": "==1.7.0" }, - "safety": { - "hashes": [ - "sha256:0a3a8a178a9c96242b224f033ee8d1d130c0448b0e6622d12deaf37f6c3b4e59", - "sha256:5059f3ffab3648330548ea9c7403405bbfaf085b11235770825d14c58f24cb78" - ], - "index": "pypi", - "version": "==1.8.5" - }, "six": { "hashes": [ "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", diff --git a/requirements-tests.txt b/requirements-tests.txt deleted file mode 100644 index 760e841..0000000 --- a/requirements-tests.txt +++ /dev/null @@ -1,93 +0,0 @@ -anyconfig==0.9.10 -astroid==2.3.3 -atomicwrites==1.3.0 -attrs==19.3.0 -bandit==1.6.2 -basictracer==3.0.0 -bleach==3.1.0 -certifi==2019.11.28 -chardet==3.0.4 -Click==7.0 -clickclick==1.2.2 -connexion==2.4.0 -contextlib2==0.6.0.post1 -coverage==4.4 -coveralls==1.8.2 -docopt==0.6.2 -docutils==0.14 -dparse==0.4.1 -entrypoints==0.3 -filelock==3.0.12 -flake8==3.7.9 -Flask==1.1.1 -Flask-OpenTracing==1.1.0 -future==0.18.2 -gitdb2==2.0.6 -GitPython==3.0.5 -googleapis-common-protos==1.6.0 -idna==2.8 -importlib-metadata==1.1.0 -inflection==0.3.1 -isort==4.3.21 -itsdangerous==1.1.0 -jaeger-client==4.1.0 -Jinja2==2.10.3 -jsonpickle==1.2 -jsonschema==3.2.0 -lazy-object-proxy==1.4.3 -lightstep==4.1.0 -livereload==2.6.1 -Markdown==3.1.1 -MarkupSafe==1.1.1 -mccabe==0.6.1 -mkdocs==1.0.4 -mock==2.0.0 -more-itertools==8.0.0 -nose==1.3.7 -numpy==1.13.3 -openapi-spec-validator==0.2.8 -opentracing==2.2.0 -opentracing-instrumentation==3.2.1 -packaging==19.2 -pbr==5.4.4 -pkginfo==1.5.0.1 -pluggy==0.13.1 -prometheus-client==0.7.1 -protobuf==3.11.0 -py==1.8.0 -py-ms==1.0.0 -pycodestyle==2.5.0 -pyflakes==2.1.1 -Pygments==2.3.1 -pylint==2.4.4 -pyparsing==2.4.5 -pyrsistent==0.15.6 -pytest==5.3.1 -pytest-cov==2.8.1 -python-coveralls==2.9.1 -python-json-logger==0.1.11 -PyYAML==5.2b1 -readme-renderer==24.0 -requests==2.22.0 -requests-mock==1.7.0 -requests-toolbelt==0.8.0 -safety==1.8.5 -six==1.13.0 -smmap2==2.0.5 -stevedore==1.31.0 -swagger-ui-bundle==0.0.6 -threadloop==1.0.2 -thrift==0.13.0 -toml==0.10.0 -tornado==5.1.1 -tox==3.14.1 -tqdm==4.30.0 -twine==1.12.1 -typed-ast==1.4.0 -urllib3==1.25.7 -virtualenv==16.7.8 -wcwidth==0.1.7 -webencodings==0.5.1 -Werkzeug==0.16.0 -wrapt==1.11.2 -zipp==0.6.0 diff --git a/tox.ini b/tox.ini index 8a38ae0..17363f7 100644 --- a/tox.ini +++ b/tox.ini @@ -2,12 +2,11 @@ envlist = py36,pylint,flake8,safety,bandit,docs [testenv] -deps = -rrequirements-tests.txt -commands = +deps = pipenv +commands_pre= + pipenv install --dev --ignore-pipfile +commands= pytest --cov=pyms --cov=tests tests/ -install_command = - pip install {opts} {packages} - [testenv:py36] basepython = python3.6 [testenv:py37] @@ -16,16 +15,20 @@ basepython = python3.7 basepython = python3.5 [testenv:bandit] basepython = python3.6 -commands = bandit -r pyms/ +commands = + bandit -r pyms/ [testenv:safety] basepython = python3.6 -commands = safety check -r requirements-tests.txt +commands = + pipenv check -vvvv [testenv:pylint] basepython = python3.6 -commands = pylint --rcfile={toxinidir}/pylintrc {toxinidir}/pyms +commands = + pylint --rcfile={toxinidir}/pylintrc {toxinidir}/pyms [testenv:flake8] basepython = python3.6 -commands = flake8 --ignore=E501 {toxinidir}/pyms +commands = + flake8 --ignore=E501 {toxinidir}/pyms [testenv:docs] basepython = python3.6 skipsdist = True