Forráskód Böngészése

Install couchbase client when needed.

Omer Katz 6 éve
szülő
commit
a3708280da
2 módosított fájl, 35 hozzáadás és 9 törlés
  1. 30 9
      .travis.yml
  2. 5 0
      extra/install_couchbase_client.sh

+ 30 - 9
.travis.yml

@@ -33,7 +33,9 @@ matrix:
   - python: '2.7'
     env: MATRIX_TOXENV=integration-dynamodb
     stage: integration-test
-    before_install: ./extra/install_dynamodb.sh
+    before_install:
+      - ./extra/install_dynamodb.sh
+      - ./extra/install_couchbase_client.sh
   - python: '3.4'
     env: MATRIX_TOXENV=integration-rabbitmq
     stage: integration-test
@@ -47,7 +49,9 @@ matrix:
   - python: '3.4'
     env: MATRIX_TOXENV=integration-dynamodb
     stage: integration-test
-    before_install: ./extra/install_dynamodb.sh
+    before_install:
+      - ./extra/install_dynamodb.sh
+      - ./extra/install_couchbase_client.sh
   - python: '3.5'
     env: MATRIX_TOXENV=integration-rabbitmq
     stage: integration-test
@@ -61,7 +65,9 @@ matrix:
   - python: '3.5'
     env: MATRIX_TOXENV=integration-dynamodb
     stage: integration-test
-    before_install: ./extra/install_dynamodb.sh
+    before_install:
+      - ./extra/install_dynamodb.sh
+      - ./extra/install_couchbase_client.sh
   - python: '3.6'
     env: MATRIX_TOXENV=integration-rabbitmq
     stage: integration-test
@@ -75,7 +81,9 @@ matrix:
   - python: '3.6'
     env: MATRIX_TOXENV=integration-dynamodb
     stage: integration-test
-    before_install: ./extra/install_dynamodb.sh
+    before_install:
+      - ./extra/install_dynamodb.sh
+      - ./extra/install_couchbase_client.sh
   - python: '3.6'
     env: TOXENV=pypy-integration-rabbitmq PYPY_VERSION="pypy2.7-5.8.0"
     stage: integration-test
@@ -89,7 +97,23 @@ matrix:
   - python: '3.6'
     env: TOXENV=pypy-integration-dynamodb PYPY_VERSION="pypy2.7-5.8.0"
     stage: integration-test
-    before_install: ./extra/install_dynamodb.sh
+    before_install:
+      - ./extra/install_dynamodb.sh
+      - if [[ -v MATRIX_TOXENV ]]; then export TOXENV=${TRAVIS_PYTHON_VERSION}-${MATRIX_TOXENV}; fi; env
+      - |
+            if [[ "$TOXENV" =~ "pypy" ]]; then
+              export PYENV_ROOT="$HOME/.pyenv"
+              if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
+                cd "$PYENV_ROOT" && git pull
+              else
+                rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/pyenv/pyenv.git "$PYENV_ROOT"
+              fi
+              "$PYENV_ROOT/bin/pyenv" install "$PYPY_VERSION"
+              virtualenv --python="$PYENV_ROOT/versions/$PYPY_VERSION/bin/python" "$HOME/virtualenvs/$PYPY_VERSION"
+              source "$HOME/virtualenvs/$PYPY_VERSION/bin/activate"
+              which python
+            fi
+      - ./extra/install_couchbase_client.sh
   - python: '3.6'
     env: TOXENV=pypy-unit PYPY_VERSION="pypy2.7-5.8.0"
     stage: test
@@ -129,10 +153,7 @@ before_install:
             source "$HOME/virtualenvs/$PYPY_VERSION/bin/activate"
             which python
           fi
-    - |
-          wget -qO - https://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
-          sudo apt-add-repository -y 'deb http://packages.couchbase.com/ubuntu trusty trusty/main'
-          sudo apt-get update && sudo apt-get install -y libcouchbase-dev
+    - ./extra/install_couchbase_client.sh
 after_success:
   - |
           if [[ -v MATRIX_TOXENV || "$TOXENV" =~ "pypy" ]]; then

+ 5 - 0
extra/install_couchbase_client.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+wget -qO - https://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
+sudo apt-add-repository -y 'deb http://packages.couchbase.com/ubuntu trusty trusty/main'
+sudo apt-get update && sudo apt-get install -y libcouchbase-dev