From 7baf16ffb49c647c88ae9e1aa6bc8bab321b40b2 Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Mon, 4 Dec 2017 02:35:54 +0700 Subject: [PATCH] .travis.yml: Install using pip once The default `install:` phase of Travis CI does `pip install -r requirements.txt`, which was duplicated by the custom `before_script:` block. Place `coala-bears` at the top of requirements.txt to ensure that its pins are respected. Closes https://github.com/coala/corobo/issues/496 Related to https://github.com/coala/meta/issues/123 --- .travis.yml | 12 +++++++----- requirements.txt | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f72154b1..0daee47a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,15 @@ addons: - libssl-dev - python3-dev -before_script: - - pip install coala-bears - - pip install -r requirements.txt - - pip install -r test-requirements.txt +before_install: + - printf '%s\n%s\n%s\n%s\n' + "git+https://github.com/coala/coala" + "git+https://github.com/coala/coala-bears" + "$(cat test-requirements.txt)" + "$(cat requirements.txt)" + > requirements.txt script: - - sed -i.bak '/bears = GitCommitBear/d' .coafile - coala --non-interactive -V - python -m pytest - docker build -t "corobo" . diff --git a/requirements.txt b/requirements.txt index a7ba6735..06aa21f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -pyopenssl git+https://github.com/errbotio/errbot@a0f35732484c8c0692e123c48653517cffa21a42 wolframalpha github3.py~=1.0.0