From 7173e134dd7a335272abf2a38401f379d12c4a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 5 Sep 2014 17:47:29 -0700 Subject: [PATCH 1/3] Try running Tox from Travis --- .travis.yml | 56 ++++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index e768e1468..4b7b04e7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,43 +1,25 @@ language: python -python: - - "2.6" - - "2.7" - - "3.2" - - "3.3" - - "3.4" +python: 2.7 env: - - DJANGO="django==1.7" - - DJANGO="django==1.6.5" - - DJANGO="django==1.5.8" - - DJANGO="django==1.4.13" - -install: - - pip install $DJANGO - - pip install defusedxml==0.3 - - pip install Pillow==2.3.0 - - pip install django-guardian==1.2.3 - - pip install pytest-django==2.6.1 - - pip install flake8==2.2.2 - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - - "if [[ ${DJANGO} == 'django==1.7' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - - export PYTHONPATH=. + - TOX_ENV=flake8 + - TOX_ENV=py3.4-django1.7 + - TOX_ENV=py3.3-django1.7 + - TOX_ENV=py3.2-django1.7 + - TOX_ENV=py2.7-django1.7 + - TOX_ENV=py3.4-django1.6 + - TOX_ENV=py3.3-django1.6 + - TOX_ENV=py3.2-django1.6 + - TOX_ENV=py2.7-django1.6 + - TOX_ENV=py2.6-django1.6 + - TOX_ENV=py3.4-django1.5 + - TOX_ENV=py3.3-django1.5 + - TOX_ENV=py3.2-django1.5 + - TOX_ENV=py2.7-django1.5 + - TOX_ENV=py2.6-django1.5 + - TOX_ENV=py2.7-django1.4 + - TOX_ENV=py2.6-django1.4 script: - - ./runtests.py - -matrix: - exclude: - - python: "2.6" - env: DJANGO="django==1.7" - - python: "3.2" - env: DJANGO="django==1.4.13" - - python: "3.3" - env: DJANGO="django==1.4.13" - - python: "3.4" - env: DJANGO="django==1.4.13" + - tox -e $TOX_ENV From a01176ce5fccb7ac531d7f2ec1a4c550d247fb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 5 Sep 2014 17:50:49 -0700 Subject: [PATCH 2/3] Install tox --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4b7b04e7e..b5b2c3ea9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,5 @@ env: - TOX_ENV=py2.6-django1.4 script: + - pip install tox - tox -e $TOX_ENV From 6901677cbd34d62ecf9a92438539c8b8c7c1ae93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 5 Sep 2014 17:56:25 -0700 Subject: [PATCH 3/3] Install tox correctly --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5b2c3ea9..a5b6d7d91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ env: - TOX_ENV=py2.7-django1.4 - TOX_ENV=py2.6-django1.4 +install: + - "pip install tox --download-cache $HOME/.pip-cache" + script: - - pip install tox - tox -e $TOX_ENV