diff --git a/.travis.yml b/.travis.yml index 624ba11..ce3560d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,46 +6,39 @@ python: - 3.3 - 3.4 env: - - DJANGO=django==1.4.13 - - DJANGO=django==1.5.8 - - DJANGO=django==1.6.5 - - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO=django==1.6.8 + - DJANGO=django==1.6.8 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO=django==1.6.8 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO=django==1.7.1 + - DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" matrix: exclude: - - 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 + # Django 1.7 does not work with Python 2.6. + - python: 2.6 + env: DJANGO=django==1.7.1 + - python: 2.6 + env: DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - python: 2.6 + env: DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + # Python 3 does not work with MySQL DB engine. - python: 3.2 env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.3 env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.4 env: DJANGO=django==1.6.5 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - - python: 2.6 - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - - python: 2.6 - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - python: 2.6 - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.2 - env: DJANGO="django==https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.3 - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" - python: 3.4 - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + env: DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" allow_failures: - - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" - - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" + - DJANGO=django==1.7.1 + - DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.postgresql_psycopg2" DB_NAME="test_project" DB_USER="postgres" + - DJANGO=django==1.7.1 DB_ENGINE="django.db.backends.mysql" DB_NAME="test_project" DB_USER="travis" fast_finish: true - services: - postgresql - mysql diff --git a/src/watson/management/commands/buildwatson.py b/src/watson/management/commands/buildwatson.py index 3adf81a..e70384f 100644 --- a/src/watson/management/commands/buildwatson.py +++ b/src/watson/management/commands/buildwatson.py @@ -59,7 +59,7 @@ class Command(BaseCommand): help="Search engine models are registered with"), ) - @transaction.commit_on_success + @transaction.atomic() def handle(self, *args, **options): """Runs the management command.""" verbosity = int(options.get("verbosity", 1)) diff --git a/src/watson/management/commands/installwatson.py b/src/watson/management/commands/installwatson.py index da90a95..cbb967b 100644 --- a/src/watson/management/commands/installwatson.py +++ b/src/watson/management/commands/installwatson.py @@ -12,7 +12,7 @@ class Command(NoArgsCommand): help = "Creates the database indices needed by django-watson." - @transaction.commit_on_success + @transaction.atomic() def handle_noargs(self, **options): """Runs the management command.""" verbosity = int(options.get("verbosity", 1)) diff --git a/src/watson/management/commands/uninstallwatson.py b/src/watson/management/commands/uninstallwatson.py index b86b9ff..d6738e4 100644 --- a/src/watson/management/commands/uninstallwatson.py +++ b/src/watson/management/commands/uninstallwatson.py @@ -12,7 +12,7 @@ class Command(NoArgsCommand): help = "Destroys the database indices needed by django-watson." - @transaction.commit_on_success + @transaction.atomic() def handle_noargs(self, **options): """Runs the management command.""" verbosity = int(options.get("verbosity", 1))