From 8864afd784073c63065a595f9e98be833d8cdc43 Mon Sep 17 00:00:00 2001 From: Basraah Date: Thu, 28 Sep 2017 14:47:06 +1000 Subject: [PATCH] Resolve Dj20 compatibility issues Temporarily use latest snapshot for esi for dj20 Correct admin urls include Manually correct old ts3 table migration Remove obsolete services migrations Remove bootstrap pagination package Fix url namespacing --- alliance_auth/settings.py.example | 1 - allianceauth/authentication/views.py | 2 +- .../fleetactivitytracking/fatlinkmodify.html | 4 -- allianceauth/fleetactivitytracking/views.py | 17 +-------- .../services/migrations/0001_initial.py | 38 ------------------- .../migrations/0002_auto_20161016_0135.py | 22 ----------- .../migrations/0003_delete_groupcache.py | 18 --------- allianceauth/services/migrations/__init__.py | 0 allianceauth/services/modules/discord/urls.py | 4 +- allianceauth/services/modules/example/urls.py | 4 +- allianceauth/services/modules/ips4/urls.py | 4 +- allianceauth/services/modules/market/urls.py | 4 +- allianceauth/services/modules/mumble/urls.py | 4 +- .../services/modules/openfire/urls.py | 4 +- allianceauth/services/modules/phpbb3/urls.py | 4 +- allianceauth/services/modules/seat/urls.py | 4 +- allianceauth/services/modules/smf/urls.py | 4 +- .../teamspeak3/migrations/0001_initial.py | 6 +-- .../services/modules/teamspeak3/models.py | 7 ++-- .../services/modules/teamspeak3/urls.py | 4 +- allianceauth/services/modules/xenforo/urls.py | 4 +- allianceauth/services/urls.py | 4 +- .../navhelper/templatetags/navactive.py | 2 +- allianceauth/timerboard/tests.py | 2 +- allianceauth/urls.py | 6 +-- setup.py | 1 - test_allianceauth/settings.py | 1 - tox.ini | 1 + 28 files changed, 50 insertions(+), 126 deletions(-) delete mode 100644 allianceauth/services/migrations/0001_initial.py delete mode 100644 allianceauth/services/migrations/0002_auto_20161016_0135.py delete mode 100644 allianceauth/services/migrations/0003_delete_groupcache.py delete mode 100644 allianceauth/services/migrations/__init__.py diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index e6e2f5a4..1914632c 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -27,7 +27,6 @@ INSTALLED_APPS = [ 'django.contrib.humanize', 'django_celery_beat', 'bootstrapform', - 'bootstrap_pagination', 'sortedm2m', 'esi', 'allianceauth', diff --git a/allianceauth/authentication/views.py b/allianceauth/authentication/views.py index 7d8c33d5..b2121442 100644 --- a/allianceauth/authentication/views.py +++ b/allianceauth/authentication/views.py @@ -6,7 +6,7 @@ from django.contrib.auth import login, authenticate from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core import signing -from django.core.urlresolvers import reverse +from django.urls import reverse from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ from esi.decorators import token_required diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 8b507612..7bb16bf6 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html @@ -2,7 +2,6 @@ {% load bootstrap %} {% load staticfiles %} {% load i18n %} -{% load bootstrap_pagination %} {% block title %}Alliance Auth{% endblock %} {% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %} @@ -20,9 +19,6 @@
{% trans "Registered characters" %}
-
- {% bootstrap_paginate registered_fats range=10 %} -
diff --git a/allianceauth/fleetactivitytracking/views.py b/allianceauth/fleetactivitytracking/views.py index 614f9baa..2d20a666 100644 --- a/allianceauth/fleetactivitytracking/views.py +++ b/allianceauth/fleetactivitytracking/views.py @@ -29,19 +29,6 @@ SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sw logger = logging.getLogger(__name__) -FATS_PER_PAGE = int(getattr(settings, 'FATS_PER_PAGE', 20)) - - -def get_page(model_list, page_num): - p = Paginator(model_list, FATS_PER_PAGE) - try: - fats = p.page(page_num) - except PageNotAnInteger: - fats = p.page(1) - except EmptyPage: - fats = p.page(p.num_pages) - return fats - class CorpStat(object): def __init__(self, corp_id, start_of_month, start_of_next_month, corp=None): @@ -359,8 +346,6 @@ def modify_fatlink_view(request, hash=""): registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character__character_name') - fat_page = get_page(registered_fats, request.GET.get('page', 1)) - - context = {'fatlink': fatlink, 'registered_fats': fat_page} + context = {'fatlink': fatlink, 'registered_fats': registered_fats} return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context) diff --git a/allianceauth/services/migrations/0001_initial.py b/allianceauth/services/migrations/0001_initial.py deleted file mode 100644 index a482d393..00000000 --- a/allianceauth/services/migrations/0001_initial.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-09-05 21:40 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0008_alter_user_username_max_length'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='DiscordAuthToken', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('email', models.CharField(max_length=254, unique=True)), - ('token', models.CharField(max_length=254)), - ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='GroupCache', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', models.DateTimeField(auto_now_add=True)), - ('groups', models.TextField(default={})), - ('service', models.CharField(choices=[(b'discourse', b'discourse'), (b'discord', b'discord')], max_length=254, unique=True)), - ], - ), - ] diff --git a/allianceauth/services/migrations/0002_auto_20161016_0135.py b/allianceauth/services/migrations/0002_auto_20161016_0135.py deleted file mode 100644 index 68749395..00000000 --- a/allianceauth/services/migrations/0002_auto_20161016_0135.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-16 01:35 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('services', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='discordauthtoken', - name='user', - ), - migrations.DeleteModel( - name='DiscordAuthToken', - ), - ] diff --git a/allianceauth/services/migrations/0003_delete_groupcache.py b/allianceauth/services/migrations/0003_delete_groupcache.py deleted file mode 100644 index cc949a31..00000000 --- a/allianceauth/services/migrations/0003_delete_groupcache.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-09-02 06:07 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('services', '0002_auto_20161016_0135'), - ] - - operations = [ - migrations.DeleteModel( - name='GroupCache', - ), - ] diff --git a/allianceauth/services/migrations/__init__.py b/allianceauth/services/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/allianceauth/services/modules/discord/urls.py b/allianceauth/services/modules/discord/urls.py index 056ebc3e..30f48937 100644 --- a/allianceauth/services/modules/discord/urls.py +++ b/allianceauth/services/modules/discord/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'discord' + module_urls = [ # Discord Service Control url(r'^activate/$', views.activate_discord, name='activate'), @@ -12,5 +14,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^discord/', include(module_urls, namespace='discord')) + url(r'^discord/', include((module_urls, app_name), namespace=app_name)) ] diff --git a/allianceauth/services/modules/example/urls.py b/allianceauth/services/modules/example/urls.py index 3df31b1a..f72d9abd 100644 --- a/allianceauth/services/modules/example/urls.py +++ b/allianceauth/services/modules/example/urls.py @@ -1,9 +1,11 @@ from django.conf.urls import url, include +app_name = 'example' + module_urls = [ # Add your module URLs here ] urlpatterns = [ - url(r'^example/', include(module_urls, namespace='example')), + url(r'^example/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/modules/ips4/urls.py b/allianceauth/services/modules/ips4/urls.py index f6c65907..a13a98e6 100644 --- a/allianceauth/services/modules/ips4/urls.py +++ b/allianceauth/services/modules/ips4/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'ips4' + module_urls = [ # IPS4 Service Control url(r'^activate/$', views.activate_ips4, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^ips4/', include(module_urls, namespace='ips4')) + url(r'^ips4/', include((module_urls, app_name), namespace=app_name)) ] diff --git a/allianceauth/services/modules/market/urls.py b/allianceauth/services/modules/market/urls.py index d588c792..3381ec29 100644 --- a/allianceauth/services/modules/market/urls.py +++ b/allianceauth/services/modules/market/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'evernusmarket' + module_urls = [ # Alliance Market Control url(r'^activate/$', views.activate_market, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^evernus-market/', include(module_urls, namespace='evernusmarket')) + url(r'^evernus-market/', include((module_urls, app_name), namespace=app_name)) ] diff --git a/allianceauth/services/modules/mumble/urls.py b/allianceauth/services/modules/mumble/urls.py index b60034a9..dd0e04ef 100644 --- a/allianceauth/services/modules/mumble/urls.py +++ b/allianceauth/services/modules/mumble/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'mumble' + module_urls = [ # Mumble service control url(r'^activate/$', views.activate_mumble, name='activate'), @@ -12,5 +14,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^mumble/', include(module_urls, namespace='mumble')) + url(r'^mumble/', include((module_urls, app_name), namespace=app_name)) ] diff --git a/allianceauth/services/modules/openfire/urls.py b/allianceauth/services/modules/openfire/urls.py index 4e80a4a9..230d9fb4 100644 --- a/allianceauth/services/modules/openfire/urls.py +++ b/allianceauth/services/modules/openfire/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'openfire' + module_urls = [ # Jabber Service Control url(r'^activate/$', views.activate_jabber, name='activate'), @@ -12,5 +14,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^openfire/', include(module_urls, namespace='openfire')), + url(r'^openfire/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/modules/phpbb3/urls.py b/allianceauth/services/modules/phpbb3/urls.py index fd1840a5..26611469 100644 --- a/allianceauth/services/modules/phpbb3/urls.py +++ b/allianceauth/services/modules/phpbb3/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'phpbb3' + module_urls = [ # Forum Service Control url(r'^activate/$', views.activate_forum, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^phpbb3/', include(module_urls, namespace='phpbb3')) + url(r'^phpbb3/', include((module_urls, app_name), namespace=app_name)) ] diff --git a/allianceauth/services/modules/seat/urls.py b/allianceauth/services/modules/seat/urls.py index 418f6c6f..c374681c 100644 --- a/allianceauth/services/modules/seat/urls.py +++ b/allianceauth/services/modules/seat/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name='seat' + module_urls = [ # SeAT Service Control url(r'^activate/$', views.activate_seat, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^seat/', include(module_urls, namespace='seat')), + url(r'^seat/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/modules/smf/urls.py b/allianceauth/services/modules/smf/urls.py index 475ee98d..59e396bf 100644 --- a/allianceauth/services/modules/smf/urls.py +++ b/allianceauth/services/modules/smf/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'smf' + module_urls = [ # SMF Service Control url(r'^activate/$', views.activate_smf, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^smf/', include(module_urls, namespace='smf')), + url(r'^smf/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/modules/teamspeak3/migrations/0001_initial.py b/allianceauth/services/modules/teamspeak3/migrations/0001_initial.py index 0e5f552f..a46605d3 100644 --- a/allianceauth/services/modules/teamspeak3/migrations/0001_initial.py +++ b/allianceauth/services/modules/teamspeak3/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('auth_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.Group')), ], options={ - 'db_table': 'services_authts', + 'db_table': 'teamspeak3_authts', 'verbose_name': 'Auth / TS Group', }, ), @@ -35,7 +35,7 @@ class Migration(migrations.Migration): ('ts_group_name', models.CharField(max_length=30)), ], options={ - 'db_table': 'services_tsgroup', + 'db_table': 'teamspeak3_tsgroup', 'verbose_name': 'TS Group', }, ), @@ -47,7 +47,7 @@ class Migration(migrations.Migration): ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], options={ - 'db_table': 'services_usertsgroup', + 'db_table': 'teamspeak3_usertsgroup', 'verbose_name': 'User TS Group', }, ), diff --git a/allianceauth/services/modules/teamspeak3/models.py b/allianceauth/services/modules/teamspeak3/models.py index 2c8e7dc3..97e66cfd 100644 --- a/allianceauth/services/modules/teamspeak3/models.py +++ b/allianceauth/services/modules/teamspeak3/models.py @@ -1,8 +1,9 @@ from django.db import models +from django.contrib.auth.models import User, Group class Teamspeak3User(models.Model): - user = models.OneToOneField('auth.User', + user = models.OneToOneField(User, primary_key=True, on_delete=models.CASCADE, related_name='teamspeak3') @@ -30,7 +31,7 @@ class TSgroup(models.Model): class AuthTS(models.Model): - auth_group = models.ForeignKey('auth.Group', on_delete=models.CASCADE) + auth_group = models.ForeignKey(Group, on_delete=models.CASCADE) ts_group = models.ManyToManyField(TSgroup) class Meta: @@ -41,7 +42,7 @@ class AuthTS(models.Model): class UserTSgroup(models.Model): - user = models.ForeignKey('auth.User', on_delete=models.CASCADE) + user = models.ForeignKey(User, on_delete=models.CASCADE) ts_group = models.ManyToManyField(TSgroup) class Meta: diff --git a/allianceauth/services/modules/teamspeak3/urls.py b/allianceauth/services/modules/teamspeak3/urls.py index ba4e00e8..98bf6992 100644 --- a/allianceauth/services/modules/teamspeak3/urls.py +++ b/allianceauth/services/modules/teamspeak3/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'teamspeak3' + module_urls = [ # Teamspeak3 service control url(r'^activate/$', views.activate_teamspeak3, @@ -16,5 +18,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^teamspeak3/', include(module_urls, namespace='teamspeak3')), + url(r'^teamspeak3/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/modules/xenforo/urls.py b/allianceauth/services/modules/xenforo/urls.py index d63a3bce..123e7bfe 100644 --- a/allianceauth/services/modules/xenforo/urls.py +++ b/allianceauth/services/modules/xenforo/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url, include from . import views +app_name = 'xenforo' + module_urls = [ # XenForo service control url(r'^activate/$', views.activate_xenforo_forum, name='activate'), @@ -11,5 +13,5 @@ module_urls = [ ] urlpatterns = [ - url(r'^xenforo/', include(module_urls, namespace='xenforo')), + url(r'^xenforo/', include((module_urls, app_name), namespace=app_name)), ] diff --git a/allianceauth/services/urls.py b/allianceauth/services/urls.py index 1a341255..0503d292 100644 --- a/allianceauth/services/urls.py +++ b/allianceauth/services/urls.py @@ -5,11 +5,11 @@ from . import views urlpatterns = [ # Services - url(r'^services/', include([ + url(r'^services/', include(([ url(r'^$', views.services_view, name='services'), # Tools url(r'^tool/fleet_formatter_tool/$', views.fleet_formatter_view, name='fleet_format_tool'), - ], namespace='services')), + ], 'services'), namespace='services')), ] # Append hooked service urls diff --git a/allianceauth/thirdparty/navhelper/templatetags/navactive.py b/allianceauth/thirdparty/navhelper/templatetags/navactive.py index ebd7b83c..89abed90 100644 --- a/allianceauth/thirdparty/navhelper/templatetags/navactive.py +++ b/allianceauth/thirdparty/navhelper/templatetags/navactive.py @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ from django.template import Library -from django.core.urlresolvers import resolve +from django.urls import resolve from django.conf import settings import re diff --git a/allianceauth/timerboard/tests.py b/allianceauth/timerboard/tests.py index 11e3c90d..805e228b 100644 --- a/allianceauth/timerboard/tests.py +++ b/allianceauth/timerboard/tests.py @@ -1,6 +1,6 @@ from django_webtest import WebTest from django.utils import timezone -from django.core.urlresolvers import reverse +from django.urls import reverse from django.contrib.auth.models import Permission, User from django.conf import settings diff --git a/allianceauth/urls.py b/allianceauth/urls.py index 65046588..17219a56 100755 --- a/allianceauth/urls.py +++ b/allianceauth/urls.py @@ -23,15 +23,15 @@ urlpatterns = [ url(r'^i18n/', include('django.conf.urls.i18n')), # Authentication - url(r'', include(allianceauth.authentication.urls, namespace='authentication')), + url(r'', include(allianceauth.authentication.urls)), url(r'^account/login/$', TemplateView.as_view(template_name='public/login.html'), name='auth_login_user'), url(r'account/', include(hmac_urls)), # Admin urls - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), # SSO - url(r'^sso/', include(esi.urls, namespace='esi')), + url(r'^sso/', include((esi.urls, 'esi'), namespace='esi')), url(r'^sso/login$', allianceauth.authentication.views.sso_login, name='auth_sso_login'), # Notifications diff --git a/setup.py b/setup.py index fbf65020..a3409457 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ install_requires = [ 'django>=1.11', 'django-bootstrap-form', - 'django-bootstrap-pagination', 'django-registration', 'django-sortedm2m', 'django-redis-cache>=1.7.1', diff --git a/test_allianceauth/settings.py b/test_allianceauth/settings.py index a542b06e..739e0daa 100644 --- a/test_allianceauth/settings.py +++ b/test_allianceauth/settings.py @@ -40,7 +40,6 @@ INSTALLED_APPS = [ 'django_celery_beat', 'bootstrapform', 'esi', - 'bootstrap_pagination', 'allianceauth', 'allianceauth.authentication', 'allianceauth.services', diff --git a/tox.ini b/tox.ini index 6826cc63..51d1d1ab 100644 --- a/tox.ini +++ b/tox.ini @@ -15,5 +15,6 @@ deps= dj111: Django>=1.11.1,<2.0 dj20: Django>=2.0a1 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} commands=coverage run runtests.py -v 2
{% trans "User" %}