From 44e6bd0848b34e96a3df116866bd0784276e44af Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 01:32:00 +0100 Subject: [PATCH 1/7] Use setup.py to list requirements --- requirements/ci.txt | 9 --------- requirements/common.txt | 9 --------- setup.py | 13 ++++++++++++- 3 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 requirements/ci.txt delete mode 100644 requirements/common.txt diff --git a/requirements/ci.txt b/requirements/ci.txt deleted file mode 100644 index 18ad1528..00000000 --- a/requirements/ci.txt +++ /dev/null @@ -1,9 +0,0 @@ --r common.txt - -pytest==2.8.2 -pytest-cov -coverage -codecov -pep8 -pyflakes -pylint diff --git a/requirements/common.txt b/requirements/common.txt deleted file mode 100644 index cf191327..00000000 --- a/requirements/common.txt +++ /dev/null @@ -1,9 +0,0 @@ -rethinkdb==2.2.0.post1 -pysha3==0.3 -pytz==2015.7 -cryptography==1.2.1 -statsd==3.2.1 -python-rapidjson==0.0.6 -logstats==0.2.1 -base58==0.2.2 -bitcoin==1.1.42 diff --git a/setup.py b/setup.py index 0cf0d835..3a3d0e88 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,16 @@ For full docs visit https://bigchaindb.readthedocs.org """ from setuptools import setup +tests_require = [ + 'pytest', + 'coverage', + 'pep8', + 'pyflakes', + 'pylint', + 'pytest', + 'pytest-cov', +] + setup( name='BigchainDB', version='0.0.0', @@ -45,5 +55,6 @@ setup( 'bitcoin==1.1.42', ], setup_requires=['pytest-runner'], - tests_require=['pytest'], + tests_require=tests_require, + extras_require={'test': tests_require}, ) From 5125e153cd4a0d901fd73faa40d61b4b47b501c5 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 01:14:07 +0100 Subject: [PATCH 2/7] Remove tox.ini - rely on travis built-in matrix --- tox.ini | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tox.ini diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 3f18618a..00000000 --- a/tox.ini +++ /dev/null @@ -1,7 +0,0 @@ -[tox] -skipsdist = true -envlist = py35 - -[testenv] -commands = py.test -v --cov=bigchaindb -deps = -rrequirements/ci.txt From e8917b6cdf2200042c0ad01c25a897e2b9c810ad Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 01:33:33 +0100 Subject: [PATCH 3/7] Install rethinkdb on travis via apt-get Although the docker setup worked, codecov could not find the report --- .travis.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4afe4079..bfd602e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,22 @@ sudo: required language: python -python: 3.5 - -services: - - docker +python: + - 3.4 + - 3.5 before_install: - - pip install codecov - - docker-compose build + - source /etc/lsb-release + - echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee -a /etc/apt/sources.list.d/rethinkdb.list + - wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - + - sudo apt-get update -qq -script: docker-compose run --rm bigchaindb py.test -v --cov=bigchaindb +install: + - sudo apt-get install rethinkdb + - pip install -e .[test] + - pip install codecov + +before_script: rethinkdb --daemon + +script: py.test -v --cov=bigchaindb after_success: codecov From 97a7e62ce014752adf95d6f0cd6246a8b93ba707 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 01:55:48 +0100 Subject: [PATCH 4/7] Add test coverage badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d61f0429..3ef93b94 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # BigchainDB [![Build Status](https://travis-ci.org/bigchaindb/bigchaindb.svg?branch=develop)](https://travis-ci.org/bigchaindb/bigchaindb) +[![codecov.io](https://codecov.io/github/bigchaindb/bigchaindb/coverage.svg?branch=develop)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop) ## Documentation From 87ae982a88b57bb6e2e80ebe530366f4597fe0f8 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 02:01:41 +0100 Subject: [PATCH 5/7] Use shields.io badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ef93b94..cd1864ec 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # BigchainDB -[![Build Status](https://travis-ci.org/bigchaindb/bigchaindb.svg?branch=develop)](https://travis-ci.org/bigchaindb/bigchaindb) -[![codecov.io](https://codecov.io/github/bigchaindb/bigchaindb/coverage.svg?branch=develop)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop) +[![Travis branch](https://img.shields.io/travis/bigchaindb/bigchaindb/develop.svg)](https://travis-ci.org/bigchaindb/bigchaindb) +[![Codecov branch](https://img.shields.io/codecov/c/github/codecov/bigchaindb/develop.svg)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop) ## Documentation From 576d55fe18c78cfa3014c4938baaf046d53015e8 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 02:26:59 +0100 Subject: [PATCH 6/7] Add PyPI badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd1864ec..f16ceadd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # BigchainDB +[![PyPI](https://img.shields.io/pypi/v/bigchaindb.svg)](https://pypi.python.org/pypi/BigchainDB) [![Travis branch](https://img.shields.io/travis/bigchaindb/bigchaindb/develop.svg)](https://travis-ci.org/bigchaindb/bigchaindb) [![Codecov branch](https://img.shields.io/codecov/c/github/codecov/bigchaindb/develop.svg)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop) From 7a96bce2062c96e36dfd99da1e899cae14190532 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Fri, 12 Feb 2016 02:37:18 +0100 Subject: [PATCH 7/7] Add badge for docs --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f16ceadd..f1f99d2f 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![PyPI](https://img.shields.io/pypi/v/bigchaindb.svg)](https://pypi.python.org/pypi/BigchainDB) [![Travis branch](https://img.shields.io/travis/bigchaindb/bigchaindb/develop.svg)](https://travis-ci.org/bigchaindb/bigchaindb) [![Codecov branch](https://img.shields.io/codecov/c/github/codecov/bigchaindb/develop.svg)](https://codecov.io/github/bigchaindb/bigchaindb?branch=develop) +[![Documentation Status](https://readthedocs.org/projects/bigchaindb/badge/?version=develop)](http://bigchaindb.readthedocs.org/en/develop/?badge=develop) ## Documentation