From 2d9e39d0849ee71b3acde5a23adc6ecb779ed94f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 28 Jan 2015 09:42:10 +0000 Subject: [PATCH 1/2] Added Django 1.8 to tox/travis --- .travis.yml | 26 ++++++++++---- tox.ini | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ddf0446d..ae33a3661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,23 @@ language: python -env: - - TOXENV=py27-dj17-postgres - - TOXENV=py27-dj17-sqlite - - TOXENV=py32-dj17-postgres -# - TOXENV=py33-dj17-postgres - - TOXENV=py34-dj17-postgres - - TOXENV=py34-dj17-sqlite + +matrix: + include: + - env: TOXENV=py27-dj17-postgres + - env: TOXENV=py27-dj17-sqlite + - env: TOXENV=py32-dj17-postgres +# - env: TOXENV=py33-dj17-postgres + - env: TOXENV=py34-dj17-postgres + - env: TOXENV=py34-dj17-sqlite + - env: TOXENV=py27-dj18-postgres +# - env: TOXENV=py27-dj18-sqlite +# - env: TOXENV=py32-dj18-postgres +# - env: TOXENV=py33-dj18-postgres + - env: TOXENV=py34-dj18-postgres + - env: TOXENV=py34-dj18-sqlite + allow_failures: + - env: TOXENV=py27-dj18-postgres + - env: TOXENV=py34-dj18-postgres + - env: TOXENV=py34-dj18-sqlite # Services services: diff --git a/tox.ini b/tox.ini index df523d812..503007c5e 100644 --- a/tox.ini +++ b/tox.ini @@ -26,6 +26,9 @@ dj17 = dj171 = Django==1.7.1 +dj18 = + https://github.com/django/django/archive/stable/1.8.x.zip#egg=django + py2 = unicodecsv>=0.9.4 @@ -44,7 +47,16 @@ envlist = py33-dj17-postgres, py33-dj17-sqlite, py34-dj17-postgres, - py34-dj17-sqlite + py34-dj17-sqlite, + py27-dj18-postgres, + py27-dj18-sqlite, + py32-dj18-postgres, + py32-dj18-sqlite, + py33-dj18-postgres, + py33-dj18-sqlite, + py34-dj18-postgres, + py34-dj18-sqlite + # mysql not currently supported # (wagtail.wagtailimages.tests.TestImageEditView currently fails with a @@ -143,3 +155,91 @@ deps = {[deps]dj171} setenv = DATABASE_ENGINE=django.db.backends.sqlite3 + + +[testenv:py27-dj18-postgres] +basepython=python2.7 +deps = + {[deps]base} + {[deps]py2} + {[deps]dj18} + psycopg2==2.5.3 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py27-dj18-sqlite] +basepython=python2.7 +deps = + {[deps]base} + {[deps]py2} + {[deps]dj18} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 + +[testenv:py27-dj18-mysql] +basepython=python2.7 +deps = + {[deps]base} + {[deps]py2} + {[deps]dj18} + MySQL-python==1.2.5 +setenv = + DATABASE_ENGINE=django.db.backends.mysql + DATABASE_USER=wagtail + +[testenv:py32-dj18-postgres] +basepython=python3.2 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} + psycopg2==2.5.3 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py32-dj18-sqlite] +basepython=python3.2 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 + +[testenv:py33-dj18-postgres] +basepython=python3.3 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} + psycopg2==2.5.3 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py33-dj18-sqlite] +basepython=python3.3 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 + +[testenv:py34-dj18-postgres] +basepython=python3.4 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} + psycopg2==2.5.3 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py34-dj18-sqlite] +basepython=python3.4 +deps = + {[deps]base} + {[deps]py3} + {[deps]dj18} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 From 878addd7373f7b112f3d138bff31d02266972eee Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 28 Jan 2015 09:43:50 +0000 Subject: [PATCH 2/2] Removed Python 3.2 from travis/tox --- .travis.yml | 4 +--- tox.ini | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae33a3661..3bb00d546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,11 @@ matrix: include: - env: TOXENV=py27-dj17-postgres - env: TOXENV=py27-dj17-sqlite - - env: TOXENV=py32-dj17-postgres -# - env: TOXENV=py33-dj17-postgres + - env: TOXENV=py33-dj17-postgres - env: TOXENV=py34-dj17-postgres - env: TOXENV=py34-dj17-sqlite - env: TOXENV=py27-dj18-postgres # - env: TOXENV=py27-dj18-sqlite -# - env: TOXENV=py32-dj18-postgres # - env: TOXENV=py33-dj18-postgres - env: TOXENV=py34-dj18-postgres - env: TOXENV=py34-dj18-sqlite diff --git a/tox.ini b/tox.ini index 503007c5e..71b18622f 100644 --- a/tox.ini +++ b/tox.ini @@ -42,16 +42,12 @@ usedevelop = True envlist = py27-dj17-postgres, py27-dj17-sqlite, - py32-dj17-postgres, - py32-dj17-sqlite, py33-dj17-postgres, py33-dj17-sqlite, py34-dj17-postgres, py34-dj17-sqlite, py27-dj18-postgres, py27-dj18-sqlite, - py32-dj18-postgres, - py32-dj18-sqlite, py33-dj18-postgres, py33-dj18-sqlite, py34-dj18-postgres, @@ -99,25 +95,6 @@ setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail -[testenv:py32-dj17-postgres] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj17} - psycopg2==2.5.3 -setenv = - DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 - -[testenv:py32-dj17-sqlite] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj171} -setenv = - DATABASE_ENGINE=django.db.backends.sqlite3 - [testenv:py33-dj17-postgres] basepython=python3.3 deps = @@ -187,25 +164,6 @@ setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail -[testenv:py32-dj18-postgres] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj18} - psycopg2==2.5.3 -setenv = - DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 - -[testenv:py32-dj18-sqlite] -basepython=python3.2 -deps = - {[deps]base} - {[deps]py3} - {[deps]dj18} -setenv = - DATABASE_ENGINE=django.db.backends.sqlite3 - [testenv:py33-dj18-postgres] basepython=python3.3 deps =