From 31ff407e4794889790362ae4128e8fc54ca88f24 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt <holger@nahrstaedt.de> Date: Wed, 11 Apr 2018 13:32:56 +0200 Subject: [PATCH] Update CI --- .travis.yml | 9 ++------- README.rst | 14 +++++--------- tox.ini | 16 ---------------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90d5d7b3..2d20241a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: language: objective-c env: - TRAVIS_PYTHON_VERSION=3.6 - - TOXENV=py36short + - TOXENV=short cache: pip @@ -56,12 +56,7 @@ before_install: - pip install --upgrade pip - pip install --upgrade wheel # Set numpy version first, other packages link against it - - pip install six nose coverage codecov tox-travis pytest pytest-cov coveralls codacy-coverage parameterized secp256k1 cryptography scrypt + - pip install six nose coverage codecov tox-travis pytest parameterized secp256k1 cryptography scrypt script: - tox - -after_success: - - codecov - - coveralls - - python-codacy-coverage -r coverage.xml \ No newline at end of file diff --git a/README.rst b/README.rst index 398cf13d..0fe3c43c 100644 --- a/README.rst +++ b/README.rst @@ -32,18 +32,14 @@ Current build status .. image:: https://circleci.com/gh/holgern/beem.svg?style=svg :target: https://circleci.com/gh/holgern/beem -.. image:: https://codecov.io/gh/holgern/beem/branch/master/graph/badge.svg - :target: https://codecov.io/gh/holgern/beem - -.. image:: https://coveralls.io/repos/github/holgern/beem/badge.svg - :target: https://coveralls.io/github/holgern/beem - +.. image:: https://readthedocs.org/projects/beem/badge/?version=latest + :target: http://beem.readthedocs.org/en/latest/?badge=latest .. image:: https://api.codacy.com/project/badge/Grade/e5476faf97df4c658697b8e7a7efebd7 :target: https://www.codacy.com/app/holgern/beem?utm_source=github.com&utm_medium=referral&utm_content=holgern/beem&utm_campaign=Badge_Grade - -.. image:: https://readthedocs.org/projects/beem/badge/?version=latest - :target: http://beem.readthedocs.org/en/latest/?badge=latest + +.. image:: https://api.codacy.com/project/badge/Coverage/e5476faf97df4c658697b8e7a7efebd7 + :target: https://www.codacy.com/app/holgern/beem?utm_source=github.com&utm_medium=referral&utm_content=holgern/beem&utm_campaign=Badge_Coverage .. image:: https://api.codeclimate.com/v1/badges/e7bdb5b4aa7ab160a780/test_coverage :target: https://codeclimate.com/github/holgern/beem/test_coverage diff --git a/tox.ini b/tox.ini index d72af8e9..e2f2f2d3 100644 --- a/tox.ini +++ b/tox.ini @@ -42,22 +42,6 @@ commands = coverage report -m coverage xml -[testenv:py36short] -deps = - mock>=2.0.0 - pytest - pytest-mock - parameterized - coverage - cryptography - secp256k1 - scrypt -commands = - coverage run --parallel-mode -m pytest tests/beemapi tests/beembase tests/beemgraphene {posargs} - coverage combine - coverage report -m - coverage xml - [testenv:flake8] deps= flake8 -- GitLab