From 1a7e81b00b6fa2c53092700b10db2d1c6478bfa2 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 20 Jan 2016 10:44:50 +0100 Subject: [PATCH 1/5] Workaround to avoid pip-8 installation. --- .travis.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67404d750..19523dff9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,19 +3,22 @@ language: python sudo: false env: - - TOX_ENV=py27-lint - - TOX_ENV=py27-docs - - TOX_ENV=py35-django19 - - TOX_ENV=py34-django19 - - TOX_ENV=py27-django19 - - TOX_ENV=py34-django18 - - TOX_ENV=py33-django18 - - TOX_ENV=py32-django18 - - TOX_ENV=py27-django18 - - TOX_ENV=py34-django17 - - TOX_ENV=py33-django17 - - TOX_ENV=py32-django17 - - TOX_ENV=py27-django17 + global: + - VIRTUALENV_NO_PIP=True + matrix: + - TOX_ENV=py27-lint + - TOX_ENV=py27-docs + - TOX_ENV=py35-django19 + - TOX_ENV=py34-django19 + - TOX_ENV=py27-django19 + - TOX_ENV=py34-django18 + - TOX_ENV=py33-django18 + - TOX_ENV=py32-django18 + - TOX_ENV=py27-django18 + - TOX_ENV=py34-django17 + - TOX_ENV=py33-django17 + - TOX_ENV=py32-django17 + - TOX_ENV=py27-django17 matrix: # Python 3.5 not yet available on travis, watch this to see when it is. From 64e1fe75182a65651a2645d839d6dad26a37f72e Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 20 Jan 2016 10:59:57 +0100 Subject: [PATCH 2/5] Try downgrading virtualenv. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19523dff9..a100bdcad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - env: TOX_ENV=py35-django19 install: - - pip install tox + - pip install tox "virtualenv<14" script: - tox -e $TOX_ENV From ebec88ccab4fd63acf2dc09581bda979070be019 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 20 Jan 2016 11:06:51 +0100 Subject: [PATCH 3/5] Remove the no-pip option. --- .travis.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index a100bdcad..cff88f481 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,19 @@ language: python sudo: false env: - global: - - VIRTUALENV_NO_PIP=True - matrix: - - TOX_ENV=py27-lint - - TOX_ENV=py27-docs - - TOX_ENV=py35-django19 - - TOX_ENV=py34-django19 - - TOX_ENV=py27-django19 - - TOX_ENV=py34-django18 - - TOX_ENV=py33-django18 - - TOX_ENV=py32-django18 - - TOX_ENV=py27-django18 - - TOX_ENV=py34-django17 - - TOX_ENV=py33-django17 - - TOX_ENV=py32-django17 - - TOX_ENV=py27-django17 + - TOX_ENV=py27-lint + - TOX_ENV=py27-docs + - TOX_ENV=py35-django19 + - TOX_ENV=py34-django19 + - TOX_ENV=py27-django19 + - TOX_ENV=py34-django18 + - TOX_ENV=py33-django18 + - TOX_ENV=py32-django18 + - TOX_ENV=py27-django18 + - TOX_ENV=py34-django17 + - TOX_ENV=py33-django17 + - TOX_ENV=py32-django17 + - TOX_ENV=py27-django17 matrix: # Python 3.5 not yet available on travis, watch this to see when it is. From b53f6691f4b371da081c2174c60b0dd721715248 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 20 Jan 2016 11:45:23 +0100 Subject: [PATCH 4/5] Preserve the former indentation. --- .travis.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index cff88f481..c8d56791f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,19 +3,19 @@ language: python sudo: false env: - - TOX_ENV=py27-lint - - TOX_ENV=py27-docs - - TOX_ENV=py35-django19 - - TOX_ENV=py34-django19 - - TOX_ENV=py27-django19 - - TOX_ENV=py34-django18 - - TOX_ENV=py33-django18 - - TOX_ENV=py32-django18 - - TOX_ENV=py27-django18 - - TOX_ENV=py34-django17 - - TOX_ENV=py33-django17 - - TOX_ENV=py32-django17 - - TOX_ENV=py27-django17 + - TOX_ENV=py27-lint + - TOX_ENV=py27-docs + - TOX_ENV=py35-django19 + - TOX_ENV=py34-django19 + - TOX_ENV=py27-django19 + - TOX_ENV=py34-django18 + - TOX_ENV=py33-django18 + - TOX_ENV=py32-django18 + - TOX_ENV=py27-django18 + - TOX_ENV=py34-django17 + - TOX_ENV=py33-django17 + - TOX_ENV=py32-django17 + - TOX_ENV=py27-django17 matrix: # Python 3.5 not yet available on travis, watch this to see when it is. From e6d1eb375cd6f8cb88138b63724ecd6b21097b28 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 20 Jan 2016 11:53:32 +0100 Subject: [PATCH 5/5] Add a comment about virtualenv < 14 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c8d56791f..49686ab07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ matrix: - env: TOX_ENV=py35-django19 install: + # Virtualenv < 14 is required to keep the Python 3.2 builds running. - pip install tox "virtualenv<14" script: