diff --git a/evennia/objects/migrations/0005_auto_20150403_2339.py b/evennia/objects/migrations/0005_auto_20150403_2339.py new file mode 100644 index 0000000000..d8359a909d --- /dev/null +++ b/evennia/objects/migrations/0005_auto_20150403_2339.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('objects', '0004_auto_20150118_1622'), + ] + + operations = [ + migrations.DeleteModel( + name='DefaultCharacter', + ), + migrations.DeleteModel( + name='DefaultExit', + ), + migrations.DeleteModel( + name='DefaultObject', + ), + migrations.DeleteModel( + name='DefaultRoom', + ), + ] diff --git a/evennia/players/migrations/0004_auto_20150403_2339.py b/evennia/players/migrations/0004_auto_20150403_2339.py new file mode 100644 index 0000000000..f09faba2b7 --- /dev/null +++ b/evennia/players/migrations/0004_auto_20150403_2339.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import evennia.players.manager +import django.core.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('players', '0003_auto_20150209_2234'), + ] + + operations = [ + migrations.DeleteModel( + name='DefaultGuest', + ), + migrations.DeleteModel( + name='DefaultPlayer', + ), + migrations.AlterModelManagers( + name='playerdb', + managers=[ + (b'objects', evennia.players.manager.PlayerDBManager()), + ], + ), + migrations.AlterField( + model_name='playerdb', + name='email', + field=models.EmailField(max_length=254, verbose_name='email address', blank=True), + ), + migrations.AlterField( + model_name='playerdb', + name='groups', + field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'), + ), + migrations.AlterField( + model_name='playerdb', + name='last_login', + field=models.DateTimeField(null=True, verbose_name='last login', blank=True), + ), + migrations.AlterField( + model_name='playerdb', + name='username', + field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'), + ), + ] diff --git a/evennia/scripts/migrations/0007_auto_20150403_2339.py b/evennia/scripts/migrations/0007_auto_20150403_2339.py new file mode 100644 index 0000000000..91fb359dc3 --- /dev/null +++ b/evennia/scripts/migrations/0007_auto_20150403_2339.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('scripts', '0006_auto_20150310_2249'), + ] + + operations = [ + migrations.DeleteModel( + name='DefaultScript', + ), + migrations.DeleteModel( + name='DoNothing', + ), + migrations.DeleteModel( + name='ScriptBase', + ), + migrations.DeleteModel( + name='Store', + ), + ] diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 5ffae33d1b..907a214009 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -56,8 +56,8 @@ PORTAL_PY_FILE = None PYTHON_MIN = '2.7' TWISTED_MIN = '12.0' -DJANGO_MIN = '1.7' -DJANGO_REC = '1.7' +DJANGO_MIN = '1.8' +DJANGO_REC = '1.8' sys.path[1] = EVENNIA_ROOT @@ -278,8 +278,13 @@ ERROR_NOTWISTED = \ ERROR_DJANGO_MIN = \ """ - ERROR: Django {dversion} found. Evennia requires version - {django_min} or higher. + ERROR: Django {dversion} found. Evennia requires version {django_min} + or higher. + + Install it with for example `pip install --upgrade django` + or with `pip install django=={django_min}` to get a specific version. + + It's also a good idea to run `evennia migrate` after this upgrade. """ NOTE_DJANGO_MIN = \ @@ -291,8 +296,8 @@ NOTE_DJANGO_MIN = \ NOTE_DJANGO_NEW = \ """ NOTE: Django {dversion} found. This is newer than Evennia's - recommended version (v{django_rec}). It will probably work, but - may be new enough not to be fully tested yet. Report any issues." + recommended version (v{django_rec}). It might work, but may be new + enough to not be fully tested yet. Report any issues. """ ERROR_NODJANGO = \ diff --git a/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py new file mode 100644 index 0000000000..8f432f034c --- /dev/null +++ b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py @@ -0,0 +1,114 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import evennia.players.manager + + +class Migration(migrations.Migration): + + dependencies = [ + ('objects', '0005_auto_20150403_2339'), + ('scripts', '0007_auto_20150403_2339'), + ('players', '0004_auto_20150403_2339'), + ('typeclasses', '0002_auto_20150109_0913'), + ] + + operations = [ + migrations.CreateModel( + name='DefaultObject', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('objects.objectdb',), + ), + migrations.CreateModel( + name='DefaultPlayer', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('players.playerdb',), + managers=[ + (b'objects', evennia.players.manager.PlayerManager()), + ], + ), + migrations.CreateModel( + name='ScriptBase', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('scripts.scriptdb',), + ), + migrations.CreateModel( + name='DefaultCharacter', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultobject',), + ), + migrations.CreateModel( + name='DefaultExit', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultobject',), + ), + migrations.CreateModel( + name='DefaultGuest', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultplayer',), + managers=[ + (b'objects', evennia.players.manager.PlayerManager()), + ], + ), + migrations.CreateModel( + name='DefaultRoom', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultobject',), + ), + migrations.CreateModel( + name='DefaultScript', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.scriptbase',), + ), + migrations.CreateModel( + name='DoNothing', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultscript',), + ), + migrations.CreateModel( + name='Store', + fields=[ + ], + options={ + 'proxy': True, + }, + bases=('typeclasses.defaultscript',), + ), + ] diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 6ff184c8df..7546b66997 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -679,8 +679,8 @@ def check_evennia_dependencies(): # defining the requirements python_min = '2.7' twisted_min = '12.0' - django_min = '1.7' - django_rec = '1.7' + django_min = '1.8' + django_rec = '1.8' errstring = "" no_error = True