From f8fd4ebaf72e67007f34e66a967e7ebf8862cef4 Mon Sep 17 00:00:00 2001 From: Sylvain Bellemare Date: Wed, 10 Feb 2016 20:16:50 +0100 Subject: [PATCH] Add rethinkdb to travis.yml --- .travis.yml | 17 ++++++++--------- Dockerfile | 3 +-- README.md | 4 +--- tox.ini | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e9c8cf3..a3f85f70 100644 --- a/.travis.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 9afe007c..6ab83528 100644 --- a/Dockerfile +++ b/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/ diff --git a/README.md b/README.md index 3ae267d3..ed41066e 100644 --- a/README.md +++ b/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 diff --git a/tox.ini b/tox.ini index dc5017e0..3f18618a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py34, py35 +envlist = py35 [testenv] commands = py.test -v --cov=bigchaindb