Hopiu/django-watson
1
0
Fork 0
mirror of https://github.com/Hopiu/django-watson.git synced 2026-03-16 22:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Working on migrations for Django 1.7

Browse source
This commit is contained in:
Dave Hall 2014-12-18 12:39:42 +00:00
parent 7b1606aa23
commit f51b15942a
4 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
.travis.yml
View file

@ -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

2
src/watson/management/commands/buildwatson.py
View file

@ -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))

2
src/watson/management/commands/installwatson.py
View file

@ -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))

2
src/watson/management/commands/uninstallwatson.py
View file

@ -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))