Merge branch 'master' into update-readme-install-instructions

.travis.yml

@@ -1,15 +1,14 @@
-sudo: false
+sudo: required
 language: python
 python: 3.5
 
-env:
-  - TOX_ENV=py34
-  - TOX_ENV=py35
+services:
+  - docker
 
-install:
-  - pip install tox
+before_install:
+  - pip install codecov
+  - docker-compose build
 
-script: tox -e $TOX_ENV
+script: docker-compose run --rm bigchain py.test -v --cov=bigchaindb
 
-after_success:
-  - codecov
+after_success: codecov

Dockerfile

@@ -1,13 +1,12 @@
 FROM python:3.5
 
-RUN apt-get update && apt-get -y install vim
+RUN apt-get update
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 RUN pip install --upgrade pip
 RUN pip install --no-cache-dir pytest pytest-cov
-RUN pip install --no-cache-dir ipython ipdb
 
 COPY . /usr/src/app/
 

README.md

@@ -1,8 +1,6 @@
 # BigchainDB
-[![Codeship Status for
-ascribe/bigchain](https://codeship.com/projects/2e292f40-6b4b-0133-3a9c-4e7d03b9bb62/status?branch=master)
-](https://codeship.com/projects/115150) [![codecov.io](https://codecov.io/github/ascribe/bigchain/coverage.svg?token=GEwKioPPu9&branch=master)](https://codecov.io/github/ascribe/bigchain?branch=master)
 
+[![Build Status](https://travis-ci.org/bigchaindb/bigchaindb.svg?branch=develop)](https://travis-ci.org/bigchaindb/bigchaindb)
 
 ## Documentation
 

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py34, py35
+envlist = py35
 
 [testenv]
 commands = py.test -v --cov=bigchaindb