Added apps configs and fixed models for 1.7

misago/acl/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoACLsConfig(AppConfig):
+    name = 'misago.acl'
+    label = 'misago_acl'
+    verbose_name = "Misago ACL framework"

misago/acl/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from misago.admin import site
 from misago.acl import version as acl_version
 import base64

misago/admin/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoAdminConfig(AppConfig):
+    name = 'misago.admin'
+    label = 'misago_admin'
+    verbose_name = "Misago Admin"

misago/conf/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoConfConfig(AppConfig):
+    name = 'misago.conf'
+    label = 'misago_conf'
+    verbose_name = "Misago Configuration"

misago/conf/defaults.py

@@ -89,17 +89,16 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'debug_toolbar',
-    'south',
     'pipeline',
     'crispy_forms',
     'mptt',
-    'misago.admin',
-    'misago.acl',
-    'misago.core',
-    'misago.conf',
-    'misago.users',
-    'misago.faker',
-    'misago.forums',
+    'misago.admin.apps.MisagoAdminConfig',
+    'misago.acl.apps.MisagoACLsConfig',
+    'misago.core.apps.MisagoCoreConfig',
+    'misago.conf.apps.MisagoConfConfig',
+    'misago.users.apps.MisagoUsersConfig',
+    'misago.faker.apps.MisagoFakerConfig',
+    'misago.forums.apps.MisagoForumsConfig',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -165,7 +164,7 @@ CSRF_FAILURE_VIEW = 'misago.core.errorpages.csrf_failure'
 
 
 # Use Misago authentication
-AUTH_USER_MODEL = 'users.User'
+AUTH_USER_MODEL = 'misago_users.User'
 
 AUTHENTICATION_BACKENDS = (
     'misago.users.authbackends.MisagoBackend',

misago/core/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoCoreConfig(AppConfig):
+    name = 'misago.core'
+    label = 'misago_core'
+    verbose_name = "Misago Core"

misago/faker/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoFakerConfig(AppConfig):
+    name = 'misago.faker'
+    label = 'misago_faker'
+    verbose_name = "Misago Test Data Generator"

misago/forums/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoForumsConfig(AppConfig):
+    name = 'misago.forums'
+    label = 'misago_forums'
+    verbose_name = "Misago Forums"

misago/forums/models.py

@@ -43,12 +43,11 @@ class Forum(MPTTModel):
     posts_count = models.PositiveIntegerField(default=0)
     prune_started_after = models.PositiveIntegerField(default=0)
     prune_replied_after = models.PositiveIntegerField(default=0)
-    archive_pruned_in = models.ForeignKey(
-        'self',
-        related_name='pruned_archive',
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL)
+    archive_pruned_in = models.ForeignKey('self',
+                                          related_name='pruned_archive',
+                                          null=True,
+                                          blank=True,
+                                          on_delete=models.SET_NULL)
     css_class = models.CharField(max_length=255, null=True, blank=True)
 
     objects = ForumManager()
@@ -87,7 +86,7 @@ class ForumRole(BaseRole):
 
 
 class RoleForumACL(models.Model):
-    role = models.ForeignKey('acl.Role', related_name='forums_acls')
+    role = models.ForeignKey('misago_acl.Role', related_name='forums_acls')
     forum = models.ForeignKey('Forum')
     forum_role = models.ForeignKey(ForumRole)
 

misago/project_template/requirements.txt

@@ -1,11 +1,10 @@
+git+https://github.com/django/django.git@stable/1.7.x#egg=django
 bleach==1.4
-django==1.6.1
-django-debug-toolbar==1.0.1
+django-debug-toolbar==1.2.1
 django-crispy-forms==1.4.0
 django-mptt==0.6.1
 django-pipeline==1.3.20
 fake-factory
 markdown==2.4.1
 pytz
-south==0.8.4
 unidecode

misago/users/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MisagoUsersConfig(AppConfig):
+    name = 'misago.users'
+    label = 'misago_users'
+    verbose_name = "Misago Auth"

misago/users/models/rankmodel.py

@@ -21,7 +21,7 @@ class Rank(models.Model):
     slug = models.CharField(max_length=255)
     description = models.TextField(null=True, blank=True)
     title = models.CharField(max_length=255, null=True, blank=True)
-    roles = models.ManyToManyField('acl.Role', null=True, blank=True)
+    roles = models.ManyToManyField('misago_acl.Role', null=True, blank=True)
     css_class = models.CharField(max_length=255, null=True, blank=True)
     is_default = models.BooleanField(default=False)
     is_tab = models.BooleanField(default=False)
@@ -31,7 +31,6 @@ class Rank(models.Model):
     objects = RankManager()
 
     class Meta:
-        app_label = 'users'
         get_latest_by = 'order'
 
     def __unicode__(self):

misago/users/models/usermodel.py

@@ -78,12 +78,12 @@ class User(AbstractBaseUser, PermissionsMixin):
     email_hash = models.CharField(max_length=32, unique=True)
     joined_on = models.DateTimeField(_('joined on'), default=timezone.now)
     rank = models.ForeignKey(
-        'users.Rank', null=True, blank=True, on_delete=models.PROTECT)
+        'misago_users.Rank', null=True, blank=True, on_delete=models.PROTECT)
     title = models.CharField(max_length=255, null=True, blank=True)
     is_staff = models.BooleanField(
         _('staff status'), default=False, db_index=True,
         help_text=_('Designates whether the user can log into admin sites.'))
-    roles = models.ManyToManyField('acl.Role')
+    roles = models.ManyToManyField('misago_acl.Role')
     acl_key = models.CharField(max_length=12, null=True, blank=True)
 
     is_active = True
@@ -93,9 +93,6 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     objects = UserManager()
 
-    class Meta:
-        app_label = 'users'
-
     @property
     def acl(self):
         try: