From 86b37fd4f88cd6a62be22855630a89fe955aa645 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 16 Feb 2016 14:35:50 +0200 Subject: [PATCH 1/6] Improved the build matrix. --- .travis.yml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0c40448..d045ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,16 @@ matrix: python: "2.6" compiler: gcc env: CC=gcc + - os: linux + language: python + python: "2.6" + compiler: clang + env: CC=clang + - os: linux + language: python + python: "2.7" + compiler: gcc + env: CC=gcc - os: linux language: python python: "2.7" @@ -20,13 +30,64 @@ matrix: python: "3.3" compiler: gcc env: CC=gcc + - os: linux + language: python + python: "3.3" + compiler: clang + env: CC=clang + - os: linux + language: python + python: "3.4" + compiler: gcc + env: CC=gcc - os: linux language: python python: "3.4" compiler: clang env: CC=clang + - os: linux + language: python + python: "3.5" + compiler: gcc + env: CC=gcc + - os: linux + language: python + python: "3.5" + compiler: clang + env: CC=clang + - os: linux + language: python + python: "pypy" + compiler: gcc + env: CC=gcc - os: linux language: python python: "pypy" compiler: clang env: CC=clang + - os: linux + language: python + python: "pypy" + compiler: gcc + env: + - CC=gcc + - PYENV_ROOT="$HOME/.pyenv" + - PATH="$PYENV_ROOT/bin:$PATH" + before_install: + - git clone https://github.com/yyuu/pyenv.git ~/.pyenv + - eval "$(pyenv init -)" + - pyenv install pypy-4.0.1 + - pyenv global pypy-4.0.1 + - os: linux + language: python + python: "pypy" + compiler: clang + env: + - CC=clang + - PYENV_ROOT="$HOME/.pyenv" + - PATH="$PYENV_ROOT/bin:$PATH" + before_install: + - git clone https://github.com/yyuu/pyenv.git ~/.pyenv + - eval "$(pyenv init -)" + - pyenv install pypy-4.0.1 + - pyenv global pypy-4.0.1 From 95fe52ee669c26fb480b0ffbf12526f2b97c18dc Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 16 Feb 2016 14:41:14 +0200 Subject: [PATCH 2/6] Don't use legacy infrastructure. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d045ace..de0460a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ script: make -f .travis.mk +sudo: required +dist: trusty matrix: include: From 1d83e6fe52d54d48f6e476d1c7d5706c6ff7003c Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 16 Feb 2016 14:44:15 +0200 Subject: [PATCH 3/6] Specify -y since it's not enabled by default. --- .travis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.mk b/.travis.mk index 349ade3..113f003 100644 --- a/.travis.mk +++ b/.travis.mk @@ -2,7 +2,7 @@ all: $(shell uname -s) Linux: sudo apt-get update - sudo apt-get install libasyncns-dev check memcached valgrind + sudo apt-get install libasyncns-dev check memcached valgrind -y pip install cffi pytest pylint $(MAKE) all # We don't need to run C unit tests under valgrind for every python From 8b0d9340ed9a3f7dcb3451e6bc0308f12605cd29 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 17 Feb 2016 16:39:56 +0200 Subject: [PATCH 4/6] Update pyenv. --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index de0460a..741e2a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: language: python python: "2.7" compiler: gcc - env: CC=gcc + env: CC=gcc - os: linux language: python python: "2.7" @@ -41,7 +41,7 @@ matrix: language: python python: "3.4" compiler: gcc - env: CC=gcc + env: CC=gcc - os: linux language: python python: "3.4" @@ -51,7 +51,7 @@ matrix: language: python python: "3.5" compiler: gcc - env: CC=gcc + env: CC=gcc - os: linux language: python python: "3.5" @@ -61,7 +61,7 @@ matrix: language: python python: "pypy" compiler: gcc - env: CC=gcc + env: CC=gcc - os: linux language: python python: "pypy" @@ -71,25 +71,25 @@ matrix: language: python python: "pypy" compiler: gcc - env: + env: - CC=gcc - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" before_install: - - git clone https://github.com/yyuu/pyenv.git ~/.pyenv - eval "$(pyenv init -)" + - pyenv update - pyenv install pypy-4.0.1 - pyenv global pypy-4.0.1 - os: linux language: python python: "pypy" compiler: clang - env: + env: - CC=clang - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" before_install: - - git clone https://github.com/yyuu/pyenv.git ~/.pyenv - eval "$(pyenv init -)" + - pyenv update - pyenv install pypy-4.0.1 - pyenv global pypy-4.0.1 From bb303b34b3f69ef588b1e07a4058994c7acc6f55 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 17 Feb 2016 18:09:22 +0200 Subject: [PATCH 5/6] Don't update pyenv. Just install pypy. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 741e2a8..782c7e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,6 @@ matrix: - PATH="$PYENV_ROOT/bin:$PATH" before_install: - eval "$(pyenv init -)" - - pyenv update - pyenv install pypy-4.0.1 - pyenv global pypy-4.0.1 - os: linux @@ -90,6 +89,5 @@ matrix: - PATH="$PYENV_ROOT/bin:$PATH" before_install: - eval "$(pyenv init -)" - - pyenv update - pyenv install pypy-4.0.1 - pyenv global pypy-4.0.1 From 888fd5c2419dae7c08f181b4beb7d5eea51c3d56 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 17 Feb 2016 19:29:21 +0200 Subject: [PATCH 6/6] Fix env vars specification. --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 782c7e2..51c1970 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,14 +67,13 @@ matrix: python: "pypy" compiler: clang env: CC=clang + # pypy 4.0.1 - os: linux language: python python: "pypy" compiler: gcc env: - - CC=gcc - - PYENV_ROOT="$HOME/.pyenv" - - PATH="$PYENV_ROOT/bin:$PATH" + - CC=gcc PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" before_install: - eval "$(pyenv init -)" - pyenv install pypy-4.0.1 @@ -84,9 +83,7 @@ matrix: python: "pypy" compiler: clang env: - - CC=clang - - PYENV_ROOT="$HOME/.pyenv" - - PATH="$PYENV_ROOT/bin:$PATH" + - CC=clang PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH" before_install: - eval "$(pyenv init -)" - pyenv install pypy-4.0.1