From c82d9c7722d226dca24da5ae4dfb0d91fe0d21b3 Mon Sep 17 00:00:00 2001 From: Basraah Date: Mon, 4 Dec 2017 13:21:29 +1000 Subject: [PATCH] Fix migration issue --- .../modules/teamspeak3/migrations/0002_auto_20161212_0133.py | 2 ++ tox.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/allianceauth/services/modules/teamspeak3/migrations/0002_auto_20161212_0133.py b/allianceauth/services/modules/teamspeak3/migrations/0002_auto_20161212_0133.py index 317de302..66a13f1a 100644 --- a/allianceauth/services/modules/teamspeak3/migrations/0002_auto_20161212_0133.py +++ b/allianceauth/services/modules/teamspeak3/migrations/0002_auto_20161212_0133.py @@ -7,6 +7,8 @@ from django.db import migrations class Migration(migrations.Migration): + atomic = False + dependencies = [ ('teamspeak3', '0001_initial'), ] diff --git a/tox.ini b/tox.ini index 51d1d1ab..2fe1cc59 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ basepython = py37: python3.7 deps= dj111: Django>=1.11.1,<2.0 - dj20: Django>=2.0a1 + dj20: Django>=2.0 dj20: https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat dj20: https://github.com/Adarnof/adarnauth-esi/zipball/master#egg=adarnauth-esi install_command = pip install -e ".[testing]" -U {opts} {packages}