Version Bump v2.9.0a2

revert migrations & set DEFAULT_AUTO_FIELD to django.db.models.AutoField

See merge request allianceauth/allianceauth!1312

.gitlab-ci.yml

@@ -25,15 +25,6 @@ dependency_scanning:
   - python -V
   - pip install wheel tox
 
-test-3.6-core:
-  image: python:3.6-buster
-  script:  
-  - tox -e py36-core  
-  artifacts:
-    when: always
-    reports:
-      cobertura: coverage.xml
-
 test-3.7-core:
   image: python:3.7-buster
   script:  
@@ -52,10 +43,10 @@ test-3.8-core:
     reports:
       cobertura: coverage.xml
 
-test-3.6-all:
-  image: python:3.6-buster
+test-3.9-core:
+  image: python:3.9-buster
   script:  
-  - tox -e py36-all
+  - tox -e py39-core
   artifacts:
     when: always
     reports:
@@ -79,9 +70,18 @@ test-3.8-all:
     reports:
       cobertura: coverage.xml
 
+test-3.9-all:
+  image: python:3.9-buster
+  script:  
+  - tox -e py39-all
+  artifacts:
+    when: always
+    reports:
+      cobertura: coverage.xml
+
 deploy_production:
   stage: deploy
-  image: python:3.8-buster
+  image: python:3.9-buster
 
   before_script:
     - pip install twine wheel

allianceauth/__init__.py

@@ -1,7 +1,7 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.8.5'
+__version__ = '2.9.0a2'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = '%s v%s' % (__title__, __version__)

allianceauth/authentication/admin.py

@@ -399,7 +399,7 @@ class UserAdmin(BaseUserAdmin):
     def formfield_for_manytomany(self, db_field, request, **kwargs):
         """overriding this formfield to have sorted lists in the form"""
         if db_field.name == "groups":
-            kwargs["queryset"] = Group.objects.all().order_by(Lower('name'))        
+            kwargs["queryset"] = Group.objects.all().order_by(Lower('name'))
         return super().formfield_for_manytomany(db_field, request, **kwargs)
 
 
@@ -438,7 +438,7 @@ class StateAdmin(admin.ModelAdmin):
     ]
 
     def formfield_for_manytomany(self, db_field, request, **kwargs):
-        """overriding this formfield to have sorted lists in the form"""        
+        """overriding this formfield to have sorted lists in the form"""
         if db_field.name == "member_characters":
             kwargs["queryset"] = EveCharacter.objects.all()\
                 .order_by(Lower('character_name'))
@@ -448,10 +448,8 @@ class StateAdmin(admin.ModelAdmin):
         elif db_field.name == "member_alliances":
             kwargs["queryset"] = EveAllianceInfo.objects.all()\
                 .order_by(Lower('alliance_name'))
-        elif db_field.name == "permissions":
-            kwargs["queryset"] = Permission.objects.select_related("content_type").all()
         return super().formfield_for_manytomany(db_field, request, **kwargs)
-        
+
     def has_delete_permission(self, request, obj=None):
         if obj == get_guest_state():
             return False

allianceauth/eveonline/managers.py

@@ -32,12 +32,10 @@ class EveCharacterManager(models.Manager):
     def update_character(self, character_id):
         return self.get(character_id=character_id).update_character()
 
-    def get_character_by_id(self, character_id: int):
-        """Return character by character ID or None if not found."""
-        try:
-            return self.get(character_id=character_id)
-        except self.model.DoesNotExist:
-            return None
+    def get_character_by_id(self, char_id):
+        if self.filter(character_id=char_id).exists():
+            return self.get(character_id=char_id)
+        return None
 
 
 class EveAllianceProviderManager:

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html

@@ -42,6 +42,7 @@
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function(){
-  $("[rel=tooltip]").tooltip();
+$(document).ready(function () {
+    $("[rel=tooltip]").tooltip();
+});
 {% endblock extra_script %}

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html

@@ -44,6 +44,7 @@
     </div>
 {% endblock content %}
 {% block extra_script %}
-$(document).ready(function(){
-  $("[rel=tooltip]").tooltip();
+$(document).ready(function () {
+    $("[rel=tooltip]").tooltip();
+});
 {% endblock extra_script %}

allianceauth/groupmanagement/admin.py

@@ -1,5 +1,4 @@
 from django.apps import apps
-from django.contrib.auth.models import Permission
 from django.contrib import admin
 from django.contrib.auth.models import Group as BaseGroup, User
 from django.db.models import Count
@@ -97,7 +96,8 @@ class HasLeaderFilter(admin.SimpleListFilter):
             return queryset
 
 
-class GroupAdmin(admin.ModelAdmin):        
+class GroupAdmin(admin.ModelAdmin):    
+    list_select_related = ('authgroup',)
     ordering = ('name',)
     list_display = (
         'name', 
@@ -122,7 +122,7 @@ class GroupAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)                
         if _has_auto_groups:
             qs = qs.prefetch_related('managedalliancegroup_set', 'managedcorpgroup_set')
-        qs = qs.prefetch_related('authgroup__group_leaders').select_related('authgroup')
+        qs = qs.prefetch_related('authgroup__group_leaders')
         qs = qs.annotate(
             member_count=Count('user', distinct=True),
         )        
@@ -168,11 +168,6 @@ class GroupAdmin(admin.ModelAdmin):
     filter_horizontal = ('permissions',)
     inlines = (AuthGroupInlineAdmin,)
 
-    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        if db_field.name == "permissions":
-            kwargs["queryset"] = Permission.objects.select_related("content_type").all()
-        return super().formfield_for_manytomany(db_field, request, **kwargs)
-
 
 class Group(BaseGroup):
     class Meta:

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -83,7 +83,7 @@
 
 {% block extra_script %}
     $.fn.dataTable.moment = function(format, locale) {
-        var types = $.fn.dataTable.ext.type;
+        let types = $.fn.dataTable.ext.type;
 
         // Add type detection
         types.detect.unshift(function(d) {

allianceauth/optimer/templates/optimer/add.html

@@ -34,17 +34,15 @@
 {% endblock %}
 
 {% block extra_script %}
-
     $('#id_start').datetimepicker({
-    setlocale: '{{ LANGUAGE_CODE }}',
-    {% if NIGHT_MODE %}
-        theme: 'dark',
-    {% else %}
-        theme: 'default',
-    {% endif %}
-    mask: true,
-    format: 'Y-m-d H:i',
-    minDate: 0
+        setlocale: '{{ LANGUAGE_CODE }}',
+        {% if NIGHT_MODE %}
+            theme: 'dark',
+        {% else %}
+            theme: 'default',
+        {% endif %}
+        mask: true,
+        format: 'Y-m-d H:i',
+        minDate: 0
     });
-
 {% endblock extra_script %}

allianceauth/optimer/templates/optimer/management.html

@@ -41,9 +41,10 @@
 
     {% include 'bundles/moment-js.html' with locale=True %}
     <script src="{% static 'js/timers.js' %}"></script>
+
     <script type="application/javascript">
         // Data
-        var timers = [
+        let timers = [
         {% for op in optimer %}
             {
                 'id': {{ op.id }},
@@ -52,67 +53,66 @@
             },
         {% endfor %}
         ];
-    </script>
-    <script type="application/javascript">
-
-        timedUpdate();
-        setAllLocalTimes();
-
-        // Start timed updates
-        setInterval(timedUpdate, 1000);
-
-        function timedUpdate() {
-            updateClock();
-            updateAllTimers();
-        }
-
-        function updateAllTimers () {
-            var l = timers.length;
-            for (var i=0; i < l; ++i) {
-                if (timers[i].expired) continue;
-                updateTimer(timers[i]);
-            }
-        }
 
         /**
          * Update a timer
          * @param timer Timer information
-         * @param timer.start Date of the timer
-         * @param timer.id Id number of the timer
-         * @param timer.expired
          */
-        function updateTimer(timer) {
+        let updateTimer = function (timer) {
             if (timer.start.isAfter(Date.now())) {
-                var duration = moment.duration(timer.start - moment(), 'milliseconds');
+                let duration = moment.duration(timer.start - moment(), 'milliseconds');
+
                 document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
             } else {
                 timer.expired = true;
+
                 document.getElementById("countdown" + timer.id).innerHTML = "";
             }
-        }
+        };
+
+        let updateAllTimers = function () {
+            let l = timers.length;
 
-        /**
-         * Set all local time fields
-         */
-        function setAllLocalTimes() {
-            var l = timers.length;
             for (var i=0; i < l; ++i) {
-                setLocalTime(timers[i]);
+                if (timers[i].expired) continue;
+
+                updateTimer(timers[i]);
             }
-        }
+        };
 
         /**
          * Set the local time info for the timer
          * @param timer Timer information
-         * @param timer.start Date of the timer
-         * @param timer.id Id number of the timer
          */
-        function setLocalTime(timer) {
+        let setLocalTime = function (timer) {
             document.getElementById("localtime" + timer.id).innerHTML = timer.start.format("ddd @ LT");
-        }
+        };
 
-        function updateClock() {
+        /**
+         * Set all local time fields
+         */
+        let setAllLocalTimes = function () {
+            let l = timers.length;
+
+            for (var i=0; i < l; ++i) {
+                setLocalTime(timers[i]);
+            }
+        };
+
+        let updateClock = function () {
             document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
-        }
+        };
+
+        let timedUpdate = function () {
+            updateClock();
+            updateAllTimers();
+        };
+
+        // Set initial values
+        setAllLocalTimes();
+        timedUpdate();
+
+        // Start timed updates
+        setInterval(timedUpdate, 1000);
     </script>
 {% endblock content %}

allianceauth/permissions_tool/templates/permissions_tool/audit.html

@@ -24,7 +24,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                {% for user in permission.users %}                    
+                {% for user in permission.users %}
                     {% include 'permissions_tool/audit_row.html' with type="User" name="Permission granted directlty" %}
                 {% endfor %}
                 {% for group in permission.groups %}
@@ -35,13 +35,13 @@
                 {% for state in permission.states %}
                     {% for profile in state.userprofile_set.all %}
                         {% with profile.user as user %}
-                            {% include 'permissions_tool/audit_row.html' with type="State" name=state%}                            
+                            {% include 'permissions_tool/audit_row.html' with type="State" name=state%}
                         {% endwith %}
                     {% endfor %}
                 {% endfor %}
                 </tbody>
             </table>
-        </div>        
+        </div>
     </div>
 {% endblock content %}
 
@@ -56,15 +56,16 @@
 
 {% block extra_script %}
     $(document).ready(function() {
-        var groupColumn = 0;
-        var table = $('#tab_permissions_audit').DataTable({
+        let groupColumn = 0;
+
+        $('#tab_permissions_audit').DataTable({
             columnDefs: [
                 { "visible": false, "targets": groupColumn }
             ],
             order: [[ groupColumn, 'asc' ], [ 2, 'asc' ] ],
             filterDropDown:
             {
-                columns: [                                       
+                columns: [
                     {
                         idx: 0,
                         title: 'Source'
@@ -73,20 +74,20 @@
                 bootstrap: true
             },
             drawCallback: function ( settings ) {
-                var api = this.api();
-                var rows = api.rows( {page:'current'} ).nodes();
-                var last=null;
-    
+                let api = this.api();
+                let rows = api.rows( {page:'current'} ).nodes();
+                let last = null;
+
                 api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
                     if ( last !== group ) {
                         $(rows).eq( i ).before(
                             '<tr class="tr-group"><td colspan="3">' + group + '</td></tr>'
                         );
-    
+
                         last = group;
                     }
                 } );
             }
         } );
     } );
-{% endblock %}
+{% endblock %}

allianceauth/permissions_tool/templates/permissions_tool/overview.html

@@ -9,9 +9,9 @@
     <div class="col-sm-12">
         <h1 class="page-header">{% trans "Permissions Overview" %}</h1>
         <p>
-        {% if request.GET.all != 'yes' %}            
+        {% if request.GET.all != 'yes' %}
             {% blocktrans %}Showing only applied permissions{% endblocktrans %}
-            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>            
+            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>
         {% else %}
             {% blocktrans %}Showing all permissions{% endblocktrans %}
             <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
@@ -79,7 +79,7 @@
 {% endblock content %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}    
+    {% include 'bundles/datatables-js.html' %}
     <script type="application/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
 {% endblock %}
 
@@ -89,15 +89,16 @@
 
 {% block extra_script %}
     $(document).ready(function() {
-        var groupColumn = 0;
-        var table = $('#tab_permissions_overview').DataTable({
+        let groupColumn = 0;
+
+        $('#tab_permissions_overview').DataTable({
             columnDefs: [
                 { "visible": false, "targets": groupColumn }
             ],
             order: [[ groupColumn, 'asc' ], [ 1, 'asc' ], [ 2, 'asc' ] ],
             filterDropDown:
             {
-                columns: [                                       
+                columns: [
                     {
                         idx: 0
                     },
@@ -108,20 +109,20 @@
                 bootstrap: true
             },
             drawCallback: function ( settings ) {
-                var api = this.api();
-                var rows = api.rows( {page:'current'} ).nodes();
-                var last=null;
-    
+                let api = this.api();
+                let rows = api.rows( {page:'current'} ).nodes();
+                let last = null;
+
                 api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
                     if ( last !== group ) {
                         $(rows).eq( i ).before(
                             '<tr class="tr-group"><td colspan="6">' + group + '</td></tr>'
                         );
-    
+
                         last = group;
                     }
                 } );
             }
         } );
     } );
-{% endblock %}
+{% endblock %}

allianceauth/project_template/project_name/settings/base.py

@@ -262,3 +262,5 @@ LOGGING = {
         },
     }
 }
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

allianceauth/services/modules/discord/managers.py

@@ -83,31 +83,10 @@ class DiscordUserManager(models.Manager):
             if created is not False:
                 if created is None:
                     logger.debug(
-                        "User %s with Discord ID %s is already a member. Forcing a Refresh",
+                        "User %s with Discord ID %s is already a member.",
                         user,
                         user_id,
                     )
-                    
-                    # Force an update cause the discord API won't do it for us.
-                    if role_ids:
-                        role_ids = list(role_ids)
-
-                    updated = bot_client.modify_guild_member(
-                        guild_id=DISCORD_GUILD_ID, 
-                        user_id=user_id,
-                        role_ids=role_ids,
-                        nick=nickname
-                    )
-
-                    if not updated:
-                        # Could not update the new user so fail.
-                        logger.warning(
-                            "Failed to add user %s with Discord ID %s to Discord server",
-                            user,
-                            user_id,
-                        )
-                        return False
-
                 self.update_or_create(
                     user=user, 
                     defaults={

allianceauth/services/modules/discord/tests/test_managers.py

@@ -111,40 +111,6 @@ class TestAddUser(TestCase):
         self.assertSetEqual(set(kwargs['role_ids']), {1, 2, 3})
         self.assertIsNone(kwargs['nick'])
 
-    def test_can_activate_existing_user_with_roles_no_nick(
-        self, 
-        mock_user_formatted_nick,
-        mock_user_group_names,        
-        mock_exchange_auth_code_for_token, 
-        mock_DiscordClient
-    ):
-        roles = [
-            create_matched_role(ROLE_ALPHA), 
-            create_matched_role(ROLE_BRAVO), 
-            create_matched_role(ROLE_CHARLIE)
-        ]
-        mock_user_formatted_nick.return_value = None
-        mock_user_group_names.return_value = ['a', 'b', 'c']        
-        mock_exchange_auth_code_for_token.return_value = self.access_token
-        mock_DiscordClient.return_value.current_user.return_value = self.user_info
-        mock_DiscordClient.return_value.match_or_create_roles_from_names\
-            .return_value = roles
-        mock_DiscordClient.return_value.add_guild_member.return_value = None
-        mock_DiscordClient.return_value.modify_guild_member.return_value = True
-        
-        result = DiscordUser.objects.add_user(self.user, authorization_code='abcdef')
-        self.assertTrue(result)
-        self.assertTrue(
-            DiscordUser.objects.filter(user=self.user, uid=TEST_USER_ID).exists()
-        )
-        self.assertTrue(mock_DiscordClient.return_value.add_guild_member.called)
-        self.assertTrue(mock_DiscordClient.return_value.modify_guild_member.called)
-        args, kwargs = mock_DiscordClient.return_value.modify_guild_member.call_args
-        self.assertEqual(kwargs['guild_id'], TEST_GUILD_ID)
-        self.assertEqual(kwargs['user_id'], TEST_USER_ID)
-        self.assertSetEqual(set(kwargs['role_ids']), {1, 2, 3})
-        self.assertIsNone(kwargs['nick'])
-
     @patch(MODULE_PATH + '.managers.DISCORD_SYNC_NAMES', True)
     def test_can_create_user_no_roles_with_nick(
         self, 
@@ -174,36 +140,6 @@ class TestAddUser(TestCase):
         self.assertIsNone(kwargs['role_ids'])
         self.assertEqual(kwargs['nick'], TEST_MAIN_NAME)
 
-    @patch(MODULE_PATH + '.managers.DISCORD_SYNC_NAMES', True)
-    def test_can_activate_existing_user_no_roles_with_nick(
-        self, 
-        mock_user_formatted_nick,
-        mock_user_group_names,        
-        mock_exchange_auth_code_for_token, 
-        mock_DiscordClient
-    ):        
-        mock_user_formatted_nick.return_value = TEST_MAIN_NAME
-        mock_user_group_names.return_value = []        
-        mock_exchange_auth_code_for_token.return_value = self.access_token
-        mock_DiscordClient.return_value.current_user.return_value = self.user_info
-        mock_DiscordClient.return_value.match_or_create_roles_from_names\
-            .return_value = []
-        mock_DiscordClient.return_value.add_guild_member.return_value = None
-        mock_DiscordClient.return_value.modify_guild_member.return_value = True
-        
-        result = DiscordUser.objects.add_user(self.user, authorization_code='abcdef')
-        self.assertTrue(result)
-        self.assertTrue(
-            DiscordUser.objects.filter(user=self.user, uid=TEST_USER_ID).exists()
-        )
-        self.assertTrue(mock_DiscordClient.return_value.add_guild_member.called)
-        self.assertTrue(mock_DiscordClient.return_value.modify_guild_member.called)
-        args, kwargs = mock_DiscordClient.return_value.modify_guild_member.call_args
-        self.assertEqual(kwargs['guild_id'], TEST_GUILD_ID)
-        self.assertEqual(kwargs['user_id'], TEST_USER_ID)
-        self.assertIsNone(kwargs['role_ids'])
-        self.assertEqual(kwargs['nick'], TEST_MAIN_NAME)
-
     @patch(MODULE_PATH + '.managers.DISCORD_SYNC_NAMES', False)
     def test_can_create_user_no_roles_and_without_nick_if_turned_off(
         self, 
@@ -247,7 +183,6 @@ class TestAddUser(TestCase):
         mock_DiscordClient.return_value.match_or_create_roles_from_names\
             .return_value = []
         mock_DiscordClient.return_value.add_guild_member.return_value = None
-        mock_DiscordClient.return_value.modify_guild_member.return_value = True
         
         result = DiscordUser.objects.add_user(self.user, authorization_code='abcdef')
         self.assertTrue(result)
@@ -255,31 +190,6 @@ class TestAddUser(TestCase):
             DiscordUser.objects.filter(user=self.user, uid=TEST_USER_ID).exists()
         )
         self.assertTrue(mock_DiscordClient.return_value.add_guild_member.called)
-        self.assertTrue(mock_DiscordClient.return_value.modify_guild_member.called)
-    
-    def test_can_activate_existing_guild_member_failure(
-        self, 
-        mock_user_formatted_nick,
-        mock_user_group_names,                
-        mock_exchange_auth_code_for_token, 
-        mock_DiscordClient
-    ):
-        mock_user_formatted_nick.return_value = None
-        mock_user_group_names.return_value = []                
-        mock_exchange_auth_code_for_token.return_value = self.access_token
-        mock_DiscordClient.return_value.current_user.return_value = self.user_info
-        mock_DiscordClient.return_value.match_or_create_roles_from_names\
-            .return_value = []
-        mock_DiscordClient.return_value.add_guild_member.return_value = None
-        mock_DiscordClient.return_value.modify_guild_member.return_value = False
-
-        result = DiscordUser.objects.add_user(self.user, authorization_code='abcdef')
-        self.assertFalse(result)
-        self.assertFalse(
-            DiscordUser.objects.filter(user=self.user, uid=TEST_USER_ID).exists()
-        )
-        self.assertTrue(mock_DiscordClient.return_value.add_guild_member.called)
-        self.assertTrue(mock_DiscordClient.return_value.modify_guild_member.called)
         
     def test_return_false_when_user_creation_fails(
         self, 

allianceauth/services/modules/discourse/views.py

@@ -12,20 +12,12 @@ import base64
 import hmac
 import hashlib
 
-try:
-    from urllib import unquote, urlencode
-except ImportError: #py3
-    from urllib.parse import unquote, urlencode
-try:
-    from urlparse import parse_qs
-except ImportError: #py3
-    from urllib.parse import parse_qs
+from urllib.parse import unquote, urlencode, parse_qs
 
 import logging
 
 logger = logging.getLogger(__name__)
 
-
 ACCESS_PERM = 'discourse.access_discourse'
 
 
@@ -55,7 +47,7 @@ def discourse_sso(request):
     # Validate the payload
     try:
         payload = unquote(payload).encode('utf-8')
-        decoded = base64.decodestring(payload).decode('utf-8')
+        decoded = base64.decodebytes(payload).decode('utf-8')
         assert 'nonce' in decoded
         assert len(payload) > 0
     except AssertionError:
@@ -86,7 +78,7 @@ def discourse_sso(request):
     if main_char:
         params['avatar_url'] = main_char.portrait_url(256)
 
-    return_payload = base64.encodestring(urlencode(params).encode('utf-8'))
+    return_payload = base64.encodebytes(urlencode(params).encode('utf-8'))
     h = hmac.new(key, return_payload, digestmod=hashlib.sha256)
     query_string = urlencode({'sso': return_payload, 'sig': h.hexdigest()})
 

allianceauth/services/modules/teamspeak3/admin.py

@@ -15,7 +15,6 @@ class Teamspeak3UserAdmin(ServicesUserAdmin):
 
 @admin.register(AuthTS)
 class AuthTSgroupAdmin(admin.ModelAdmin):
-    change_list_template = 'admin/teamspeak3/authts/change_list.html'
     ordering = ('auth_group__name', )
     list_select_related = True  
     
@@ -29,7 +28,7 @@ class AuthTSgroupAdmin(admin.ModelAdmin):
         return [x for x in obj.ts_group.all().order_by('ts_group_id')]
     
     _ts_group.short_description = 'ts groups'
-    # _ts_group.admin_order_field = 'profile__state'
+    #_ts_group.admin_order_field = 'profile__state'
 
 
 @admin.register(StateGroup)

allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html

@@ -1,11 +0,0 @@
-{% extends "admin/change_list.html" %}
-{% load i18n static %}
-
-{% block object-tools-items %}
-{{ block.super }}
-<li>
-    <a href="{% url 'teamspeak3:admin_update_ts3_groups' %}" class="btn btn-high">
-        Update TS3 groups
-    </a>
-</li>
-{% endblock %}

allianceauth/services/modules/teamspeak3/tests.py

@@ -216,24 +216,6 @@ class Teamspeak3ViewsTestCase(TestCase):
         self.assertEqual(ts3_user.perm_key, '123abc')
         self.assertTrue(tasks_manager.return_value.__enter__.return_value.update_groups.called)
 
-    @mock.patch(MODULE_PATH + '.views.Teamspeak3Tasks')
-    @mock.patch(MODULE_PATH + '.views.messages')    
-    def test_should_update_ts_groups(self, messages, Teamspeak3Tasks):
-        # given        
-        self.member.is_superuser = True
-        self.member.is_staff = True
-        self.member.save()
-        self.login()
-        # when
-        response = self.client.get(urls.reverse('teamspeak3:admin_update_ts3_groups'))
-        # then                        
-        self.assertRedirects(
-            response, urls.reverse('admin:teamspeak3_authts_changelist'), 
-            target_status_code=200
-        )
-        self.assertTrue(messages.info.called)
-        self.assertTrue(Teamspeak3Tasks.run_ts3_group_update.delay.called)
-        
 
 class Teamspeak3SignalsTestCase(TestCase):
     def setUp(self):

allianceauth/services/modules/teamspeak3/urls.py

@@ -6,14 +6,12 @@ app_name = 'teamspeak3'
 
 module_urls = [
     # Teamspeak3 service control
-    url(r'^activate/$', views.activate_teamspeak3, name='activate'),
-    url(r'^deactivate/$', views.deactivate_teamspeak3, name='deactivate'),
-    url(r'^reset_perm/$', views.reset_teamspeak3_perm, name='reset_perm'),
-    url(
-        r'^admin_update_ts3_groups/$', 
-        views.admin_update_ts3_groups,
-        name='admin_update_ts3_groups'
-    ),
+    url(r'^activate/$', views.activate_teamspeak3,
+        name='activate'),
+    url(r'^deactivate/$', views.deactivate_teamspeak3,
+        name='deactivate'),
+    url(r'^reset_perm/$', views.reset_teamspeak3_perm,
+        name='reset_perm'),
 
     # Teamspeak Urls
     url(r'^verify/$', views.verify_teamspeak3, name='verify'),

allianceauth/services/modules/teamspeak3/views.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.contrib import messages
-from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import render, redirect
 from django.conf import settings
@@ -100,11 +99,3 @@ def reset_teamspeak3_perm(request):
         logger.error("Unsuccessful attempt to reset TS3 permission key for user %s" % request.user)
         messages.error(request, _('An error occurred while processing your TeamSpeak3 account.'))
     return redirect("services:services")
-
-
-@login_required
-@staff_member_required
-def admin_update_ts3_groups(request):
-    Teamspeak3Tasks.run_ts3_group_update.delay()
-    messages.info(request, "Started updating TS3 server groups...")
-    return redirect("admin:teamspeak3_authts_changelist")

allianceauth/srp/templates/srp/add.html

@@ -43,17 +43,15 @@
 {% endblock %}
 
 {% block extra_script %}
-
     $('#id_fleet_time').datetimepicker({
-    setlocale: '{{ LANGUAGE_CODE }}',
-    {% if NIGHT_MODE %}
-        theme: 'dark',
-    {% else %}
-        theme: 'default',
-    {% endif %}
-    mask: true,
-    format: 'Y-m-d H:i',
-    minDate: 0
+        setlocale: '{{ LANGUAGE_CODE }}',
+        {% if NIGHT_MODE %}
+            theme: 'dark',
+        {% else %}
+            theme: 'default',
+        {% endif %}
+        mask: true,
+        format: 'Y-m-d H:i',
+        minDate: 0
     });
-
 {% endblock extra_script %}

allianceauth/srp/templates/srp/data.html

@@ -187,7 +187,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
     {% include 'bundles/x-editable-js.html' %}
     {% include 'bundles/moment-js.html' %}
     {% include 'bundles/clipboard-js.html' %}
-    
+
     <script>
         var clipboard = new ClipboardJS('.copy-text-fa-icon');
         clipboard.on('success', function (e) {
@@ -206,73 +206,71 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
 {% endblock extra_javascript %}
 
 {% block extra_script %}
-  $(document).ready(function() {
-      $.fn.editable.defaults.mode = 'inline';
-      $.fn.editable.defaults.showbuttons = false;
-      $.fn.editable.defaults.highlight = "#AAFF80";
+    $(document).ready(function() {
+        $.fn.editable.defaults.mode = 'inline';
+        $.fn.editable.defaults.showbuttons = false;
+        $.fn.editable.defaults.highlight = "#AAFF80";
 
+        $.fn.dataTable.moment = function(format, locale) {
+            let types = $.fn.dataTable.ext.type;
 
-      $('.srp').editable({
-          display: function(value, response) {
-              return false;
-          },
-          success: function(response, newValue) {
-              newValue = parseInt(newValue);
-              newvalue = newValue.toLocaleString() + " ISK";
-              $(this).html(newvalue.bold());
-          },
-          validate: function(value) {
-              if (value === null || value === '') {
-                  return 'Empty values not allowed';
-              }
-          }
-      });
-      $('.srp').on('hidden', function(e, reason){
-              if(reason === 'save' || reason === 'nochange') {
-              var $next = $(this).closest('tr').next().find('.editable');
-              setTimeout(function() {
-                  $next.editable('show');
-              }, 400);
-          }
-     });
-  });
+            // Add type detection
+            types.detect.unshift(function(d) {
+                return moment(d, format, locale, true).isValid() ?
+                    'moment-' + format :
+                    null;
+            });
 
-  $(document).ready(function(){
-    $("[rel=tooltip]").tooltip({ placement: 'top'});
-  });
+            // Add sorting method - use an integer for the sorting
+            types.order[ 'moment-' + format+'-pre' ] = function(d) {
+                return moment(d, format, locale, true).unix();
+            };
+        };
+        $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
 
-  $.fn.dataTable.moment = function(format, locale) {
-    var types = $.fn.dataTable.ext.type;
+        $('.srp').editable({
+            display: function(value, response) {
+                return false;
+            },
+            success: function(response, newValue) {
+                newValue = parseInt(newValue);
+                let newValueOutput = newValue.toLocaleString() + " ISK";
 
-      // Add type detection
-      types.detect.unshift(function(d) {
-        return moment(d, format, locale, true).isValid() ?
-          'moment-'+format :
-          null;
-      } );
+                $(this).html(newValueOutput.bold());
+            },
+            validate: function(value) {
+                if (value === null || value === '') {
+                    return 'Empty values not allowed';
+                }
+            }
+        });
 
-      // Add sorting method - use an integer for the sorting
-      types.order[ 'moment-'+format+'-pre' ] = function(d) {
-        return moment(d, format, locale, true).unix();
-    };
-  };
+        $('.srp').on('hidden', function(e, reason){
+            if(reason === 'save' || reason === 'nochange') {
+                let $next = $(this).closest('tr').next().find('.editable');
 
-  $(document).ready( function(){
-    $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
+                setTimeout(function() {
+                    $next.editable('show');
+                }, 400);
+            }
+        });
 
-    $('table.srplist').DataTable({
-      "order": [[ 6, "asc" ]],
-      "paging": false,
-      "columnDefs": [{
-          "targets": [1, 8],
-          "orderable": false
-      },
-      {
-          "targets": [4, 5],
-          "type": "num"
-      }]
+        $('table.srplist').DataTable({
+            "order": [[ 6, "asc" ]],
+            "paging": false,
+            "columnDefs": [
+                {
+                    "targets": [1, 8],
+                    "orderable": false
+                },
+                {
+                    "targets": [4, 5],
+                    "type": "num"
+                }
+            ]
+        });
 
+        // tooltip
+        $("[rel=tooltip]").tooltip({ placement: 'top'});
     });
-  });
-
 {% endblock extra_script %}

allianceauth/static/js/refresh_notifications.js

@@ -1,3 +1,5 @@
+/* global notificationUPdateSettings */
+
 /*
     This script refreshed the unread notification count in the top menu
     on a regular basis so to keep the user apprised about newly arrived
@@ -6,70 +8,67 @@
     The refresh rate can be changes via the Django setting NOTIFICATIONS_REFRESH_TIME.
     See documentation for details.
 */
-
 $(function () {
-    var elem = document.getElementById("dataExport");
-    var notificationsListViewUrl = elem.getAttribute("data-notificationsListViewUrl");
-    var notificationsRefreshTime = elem.getAttribute("data-notificationsRefreshTime");
-    var userNotificationsCountViewUrl = elem.getAttribute(
-        "data-userNotificationsCountViewUrl"
-    );
+    'use strict';
+
+    let notificationsListViewUrl = notificationUPdateSettings.notificationsListViewUrl;
+    let notificationsRefreshTime = notificationUPdateSettings.notificationsRefreshTime;
+    let userNotificationsCountViewUrl = notificationUPdateSettings.userNotificationsCountViewUrl;
 
     // update the notification unread count in the top menu
-    function update_notifications() {
+    let updateNotifications = function () {
         $.getJSON(userNotificationsCountViewUrl, function (data, status) {
-            if (status == 'success') {
-                var innerHtml = "";
-                var unread_count = data.unread_count;
-                if (unread_count > 0) {
+            if (status === 'success') {
+                let innerHtml = '';
+                let unreadCount = data.unread_count;
+
+                if (unreadCount > 0) {
                     innerHtml = (
-                        `Notifications <span class="badge">${unread_count}</span>`
-                    )
+                        `Notifications <span class="badge">${unreadCount}</span>`
+                    );
+                } else {
+                    innerHtml = '<i class="far fa-bell"></i>';
                 }
-                else {
-                    innerHtml = '<i class="far fa-bell"></i>'
-                }
-                $("#menu_item_notifications").html(
+
+                $('#menu_item_notifications').html(
                     `<a href="${notificationsListViewUrl}">${innerHtml}</a>`
                 );
-            }
-            else {
+            } else {
                 console.error(
-                    `Failed to load HTMl to render notifications item. Error: `
-                        `${xhr.status}': '${xhr.statusText}`
+                    `Failed to load HTMl to render notifications item. Error: ${xhr.status}': '${xhr.statusText}`
                 );
             }
         });
-    }
+    };
 
-    var myInterval;
+    let myInterval;
 
     // activate automatic refreshing every x seconds
-    function activate_refreshing() {
+    let activateRefreshing = function () {
         if (notificationsRefreshTime > 0) {
             myInterval = setInterval(
-                update_notifications, notificationsRefreshTime * 1000
+                updateNotifications, notificationsRefreshTime * 1000
             );
         }
-    }
+    };
 
     // deactivate automatic refreshing
-    function deactivate_refreshing() {
+    let deactivateRefreshing = function () {
         if ((notificationsRefreshTime > 0) && (typeof myInterval !== 'undefined')) {
-            clearInterval(myInterval)
+            clearInterval(myInterval);
         }
-    }
+    };
 
     // refreshing only happens on active browser tab
     $(document).on({
         'show': function () {
-            activate_refreshing()
+            activateRefreshing();
         },
         'hide': function () {
-            deactivate_refreshing()
+            deactivateRefreshing();
         }
     });
 
     // Initial start of refreshing on script loading
-    activate_refreshing()
+    activateRefreshing();
 });

allianceauth/static/js/timers.js

@@ -1,23 +1,49 @@
+/* global moment */
+
 /**
-* Get a duration string like countdown.js
-* e.g. "1y 2d 3h 4m 5s"
-* @param duration moment.duration
-*/
-function getDurationString(duration) {
-    var out = "";
+ * Get a duration string like countdown.js
+ * e.g. "1y 2d 3h 4m 5s"
+ *
+ * @param duration
+ * @returns {string}
+ */
+let getDurationString = function (duration) {
+    'use strict';
+
+    let out = '';
+
     if (duration.years()) {
         out += duration.years() + 'y ';
     }
+
     if (duration.months()) {
         out += duration.months() + 'm ';
     }
+
     if (duration.days()) {
         out += duration.days() + 'd ';
     }
-    return out + duration.hours() + "h " + duration.minutes() + "m " + duration.seconds() + "s";
-}
 
+    return out + duration.hours() + 'h ' + duration.minutes() + 'm ' + duration.seconds() + 's';
+};
 
-function getCurrentEveTimeString() {
-    return moment().utc().format('dddd LL HH:mm:ss')
-}
+/**
+ * returns the current eve time as a formatted string
+ *
+ * condition:
+ *      only if moment.js is loaded before,
+ *      if not this function returns an empty string to avoid JS errors from happening.
+ *
+ * @returns {string}
+ */
+let getCurrentEveTimeString = function () {
+    'use strict';
+
+    let returnValue = '';
+
+    if (window.moment) {
+        returnValue = moment().utc().format('dddd LL HH:mm:ss');
+    }
+
+    return returnValue;
+};

allianceauth/static/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

allianceauth/templates/allianceauth/base.html

@@ -30,7 +30,15 @@
                 <div class="row" id="site-body-wrapper">
                     {% include 'allianceauth/side-menu.html' %}
                     <div class="col-sm-10">
-                        {% include 'allianceauth/messages.html' %}
+                        {% if messages %}
+                            <br>
+                            {% for message in messages %}
+                                <div class="alert alert-{{ message.level_tag }}">{{ message }}</div>
+                                {% if not forloop.last %}
+                                    <br>
+                                {% endif %}
+                            {% endfor %}
+                        {% endif %}
                         {% block content %}
                         {% endblock content %}
                     </div>
@@ -38,19 +46,20 @@
                 </div>
             </div>
         {% endif %}
-        <!-- share data with JS part -->
-        <div 
-            id="dataExport"     
-            data-notificationsListViewUrl="{% url 'notifications:list' %}"
-            data-notificationsRefreshTime="{% notifications_refresh_time %}"
-            data-userNotificationsCountViewUrl="{% url 'notifications:user_notifications_count' request.user.pk %}"            
-        >
-        </div>
+
         {% include 'bundles/bootstrap-js.html' %}
         {% include 'bundles/jquery-visibility-js.html' %}
+
+        <script type="application/javascript">
+            let notificationUPdateSettings = {
+                notificationsListViewUrl: "{% url 'notifications:list' %}",
+                notificationsRefreshTime: "{% notifications_refresh_time %}",
+                userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}"
+            };
+        </script>
         <script src="{% static 'js/refresh_notifications.js' %}"></script>
-        
-        {% block extra_javascript %}            
+
+        {% block extra_javascript %}
         {% endblock extra_javascript %}
         <script>
             {% block extra_script %}

allianceauth/templates/allianceauth/messages.html

@@ -1,26 +0,0 @@
-{% if messages %}
-    <br>
-    {% for message in messages %}
-        <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-
-            <div class="message-icon pull-left" style="margin-right: 0.5rem;">
-                {% if message.level_tag == "info" %}
-                    <i class="fas fa-info-circle"></i>
-                {% elif message.level_tag == "success" %}
-                    <i class="fas fa-check-circle"></i>
-                {% elif message.level_tag == "warning" %}
-                    <i class="fas fa-exclamation-circle"></i>
-                {% elif message.level_tag == "danger" %}
-                    <i class="fas fa-exclamation-triangle"></i>
-                {% endif %}
-            </div>
-
-            <div class="message-text" style="margin-left: 2.5rem;">
-                {{ message }}
-            </div>
-        </div>
-    {% endfor %}
-{% endif %}

allianceauth/timerboard/templates/timerboard/view.html

@@ -526,9 +526,7 @@
     {% include 'bundles/moment-js.html' with locale=True %}
     <script src="{% static 'js/timers.js' %}"></script>
     <script type="application/javascript">
-        var locale = "{{ LANGUAGE_CODE }}";
-
-        var timers = [
+        let timers = [
             {% for timer in timers %}
                 {
                     'id': {{ timer.id }},
@@ -545,67 +543,64 @@
             {% endfor %}
         ];
 
-        moment.locale(locale);
+        /**
+         * Update a timer
+         * @param timer Timer information
+         */
+        let updateTimer = function (timer) {
+            if (timer.targetDate.isAfter(Date.now())) {
+                let duration = moment.duration(timer.targetDate - moment(), 'milliseconds');
 
-        // Set initial values
-        setAllLocalTimes();
-        timedUpdate();
+                document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
+            } else {
+                timer.expired = true;
 
-        // Start timed updates
-        setInterval(timedUpdate, 1000);
+                document.getElementById("countdown" + timer.id).innerHTML = "";
+            }
+        };
+
+        let updateAllTimers = function () {
+            let l = timers.length;
+
+            for (var i=0; i < l; ++i) {
+                if (timers[i].expired) continue;
+
+                updateTimer(timers[i]);
+            }
+        };
 
         function timedUpdate() {
             updateClock();
             updateAllTimers();
         }
 
-        function updateAllTimers () {
-            var l = timers.length;
-            for (var i=0; i < l; ++i) {
-                if (timers[i].expired) continue;
-                updateTimer(timers[i]);
-            }
-        }
-
         /**
-         * Update a timer
+         * Set the local time info for the timer
          * @param timer Timer information
-         * @param timer.targetDate Date of the timer
-         * @param timer.id Id number of the timer
-         * @param timer.expired
          */
-        function updateTimer(timer) {
-            if (timer.targetDate.isAfter(Date.now())) {
-                duration = moment.duration(timer.targetDate - moment(), 'milliseconds');
-                document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
-            } else {
-                timer.expired = true;
-                document.getElementById("countdown" + timer.id).innerHTML = "";
-            }
-        }
+        let setLocalTime = function (timer) {
+            document.getElementById("localtime" + timer.id).innerHTML = timer.targetDate.format("ddd @ LT");
+        };
 
         /**
          * Set all local time fields
          */
-        function setAllLocalTimes() {
-            var l = timers.length;
+        let setAllLocalTimes = function () {
+            let l = timers.length;
+
             for (var i=0; i < l; ++i) {
                 setLocalTime(timers[i]);
             }
-        }
+        };
 
-        /**
-         * Set the local time info for the timer
-         * @param timer Timer information
-         * @param timer.targetDate Date of the timer
-         * @param timer.id Id number of the timer
-         */
-        function setLocalTime(timer) {
-            document.getElementById("localtime" + timer.id).innerHTML = timer.targetDate.format("ddd @ LT");
-        }
-
-        function updateClock() {
+        let updateClock = function () {
             document.getElementById("current-time").innerHTML = getCurrentEveTimeString();
-        }
+        };
+        // Set initial values
+        setAllLocalTimes();
+        timedUpdate();
+
+        // Start timed updates
+        setInterval(timedUpdate, 1000);
     </script>
 {% endblock content %}

docs/customizing/index.md

@@ -23,7 +23,7 @@ Within your auth project exists two folders named `static` and `templates`. Thes
 
 You can add extra static or templates by putting files in these folders. Note that changes to static requires running the `python manage.py collectstatic` command to copy to the web server directory.
 
-It is possible to overload static and templates shipped with Django or Alliance Auth by including a file with the exact path of the one you wish to overload. For instance if you wish to add extra links to the menu bar by editing the template, you would make a copy of the `allianceauth/templates/allianceauth/base.html` file to `myauth/templates/allianceauth/base.html` and edit it there. Notice the paths are identical after the `templates/` directory - this is critical for it to be recognized. Your custom template would be used instead of the one included with Alliance Auth when Django renders the web page. Similar idea for static: put CSS or images at an identical path after the `static/` directory and they will be copied to the web server directory instead of the ones included.
+It is possible to overload static and templates shipped with Django or Alliance Auth by including a file with the exact path of the one you wish to overload. For instance if you wish to add extra links to the menu bar by editing the template, you would make a copy of the `allianceauth/templates/allianceauth/base.html` file to `myauth/templates/allinceauth/base.html` and edit it there. Notice the paths are identical after the `templates/` directory - this is critical for it to be recognized. Your custom template would be used instead of the one included with Alliance Auth when Django renders the web page. Similar idea for static: put CSS or images at an identical path after the `static/` directory and they will be copied to the web server directory instead of the ones included.
 
 ## Custom URLs and Views
 

docs/features/services/teamspeak3.md

@@ -105,9 +105,7 @@ Click the URL provided to automatically connect to our server. It will prompt yo
 
 Now we need to make groups. AllianceAuth handles groups in teamspeak differently: instead of creating groups it creates an association between groups in TeamSpeak and groups in AllianceAuth. Go ahead and make the groups you want to associate with auth groups, keeping in mind multiple TeamSpeak groups can be associated with a single auth group.
 
-Navigate back to the AllianceAuth admin interface (example.com/admin) and under `Teamspeak3`, select `Auth / TS Groups`.
-
-In the top-right corner click, first click on `Update TS3 Groups` to fetch the newly created server groups from TS3 (this may take a minute to complete). Then click on `Add Auth / TS Group` to link Auth groups with TS3 server groups.
+Navigate back to the AllianceAuth admin interface (example.com/admin) and under `Services`, select `Auth / TS Groups`. In the top-right corner click `Add`.
 
 The dropdown box provides all auth groups. Select one and assign TeamSpeak groups from the panels below. If these panels are empty, wait a minute for the database update to run, or see the [troubleshooting section](#ts-group-models-not-populating-on-admin-site) below.
 
@@ -121,23 +119,13 @@ To enable advanced permissions, on your client go to the `Tools` menu, `Applicat
 
 ### TS group models not populating on admin site
 
-The method which populates these runs every 30 minutes. To populate manually you start the process from the admin site or from the Django shell.
-
-#### Admin Site
-
-Navigate to the AllianceAuth admin interface and under `Teamspeak3`, select `Auth / TS Groups`.
-
-Then, in the top-right corner click, click on `Update TS3 Groups` to start the process of fetching the server groups from TS3 (this may take a minute to complete).
-
-#### Django Shell
-
-Start a django shell with:
+The method which populates these runs every 30 minutes. To populate manually, start a django shell:
 
 ```bash
 python manage.py shell
 ```
 
-And execute the update as follows:
+And execute the update:
 
 ```python
 from allianceauth.services.modules.teamspeak3.tasks import Teamspeak3Tasks

docs/installation/allianceauth.md

@@ -104,8 +104,6 @@ CREATE DATABASE alliance_auth CHARACTER SET utf8mb4;
 GRANT ALL PRIVILEGES ON alliance_auth . * TO 'allianceserver'@'localhost';
 ```
 
-Once your database is set up, you can leave the SQL shell with `exit`.
-
 Add timezone tables to your mysql installation:
 
 ```bash
@@ -179,7 +177,7 @@ source /home/allianceserver/venv/auth/bin/activate
 
 You need to have a dedicated Eve SSO app for Alliance auth. Please go to [EVE Developer](https://developers.eveonline.com/applications) to create one.
 
-For **scopes** your SSO app needs to have at least `publicData`. Additional scopes depends on which Alliance Auth apps you will be using. For convenience, we recommend adding all available ESO scopes to your SSO app. Note that Alliance Auth will always ask the users to approve specific scopes before they are used.
+For **scopes** your SSO app needs to have at least `publicData`. Additional scopes depends on which Alliance Auth apps you will be using. For convenience we recommend adding all available ESO scopes to your SSO app. Note that Alliance Auth will always ask the users to approve specific scopes before they are used.
 
 As **callback URL** you want to define the URL of your Alliance Auth site plus the route: `/sso/callback`. Example for a valid callback URL: `https://auth.example.com/sso/callback`
 
@@ -238,7 +236,7 @@ Check to ensure your settings are valid.
 python /home/allianceserver/myauth/manage.py check
 ```
 
-Finally, ensure the allianceserver user has read/write permissions to this directory before proceeding.
+And finally ensure the allianceserver user has read/write permissions to this directory before proceeding.
 
 ```bash
 chown -R allianceserver:allianceserver /home/allianceserver/myauth
@@ -246,7 +244,7 @@ chown -R allianceserver:allianceserver /home/allianceserver/myauth
 
 ## Services
 
-Alliance Auth needs some additional services to run, which we will set up and configure next.
+Alliance Auth needs some additional services to run, which we will setup and configure next.
 
 ### Gunicorn
 
@@ -277,7 +275,7 @@ systemctl enable supervisord.service
 systemctl start supervisord.service
 ```
 
-Once installed, it needs a configuration file to know which processes to watch. Your Alliance Auth project comes with a ready-to-use template which will ensure the Celery workers, Celery task scheduler and Gunicorn are all running.
+Once installed it needs a configuration file to know which processes to watch. Your Alliance Auth project comes with a ready-to-use template which will ensure the Celery workers, Celery task scheduler and Gunicorn are all running.
 
 Ubuntu:
 
@@ -291,7 +289,7 @@ CentOS:
 ln -s /home/allianceserver/myauth/supervisor.conf /etc/supervisord.d/myauth.ini
 ```
 
-Activate it with `supervisorctl reload`.
+And activate it with `supervisorctl reload`.
 
 You can check the status of the processes with `supervisorctl status`. Logs from these processes are available in `/home/allianceserver/myauth/log` named by process.
 
@@ -306,11 +304,11 @@ You can check the status of the processes with `supervisorctl status`. Logs from
 
 Once installed, decide on whether you're going to use [NGINX](nginx.md) or [Apache](apache.md) and follow the respective guide.
 
-Note that Alliance Auth is designed to run with web servers on HTTPS. While running on HTTP is technically possible, it is not recommended for production use, and some functions (e.g. Email confirmation links) will not work properly.
+Note that Alliance Auth is designed to run with web servers on HTTPS. While running on HTTP is technically possible, it is not recommended for production use and some functions (e.g. Email confirmation links) will not work properly.
 
 ## Superuser
 
-Before using your auth site, it is essential to create a superuser account. This account will have all permissions in Alliance Auth. It's OK to use this as your personal auth account.
+Before using your auth site it is essential to create a superuser account. This account will have all permissions in Alliance Auth. It's OK to use this as your personal auth account.
 
 ```bash
 python /home/allianceserver/myauth/manage.py createsuperuser
@@ -318,7 +316,7 @@ python /home/allianceserver/myauth/manage.py createsuperuser
 
 The superuser account is accessed by logging in via the admin site at `https://example.com/admin`.
 
-If you intend to use this account as your personal auth account you need to add a main character. Navigate to the normal user dashboard (at `https://example.com`) after logging in via the admin site and select `Change Main`. Once a main character has been added, it is possible to use SSO to login to this account.
+If you intend to use this account as your personal auth account you need to add a main character. Navigate to the normal user dashboard (at `https://example.com`) after logging in via the admin site and select `Change Main`. Once a main character has been added it is possible to use SSO to login to this account.
 
 ## Updating
 
@@ -342,7 +340,7 @@ Some releases come with new or changed models. Update your database to reflect t
 python /home/allianceserver/myauth/manage.py migrate
 ```
 
-Finally, some releases come with new or changed static files. Run the following command to update your static files folder:
+Finally some releases come with new or changed static files. Run the following command to update your static files folder:
 
 ```bash
 python /home/allianceserver/myauth/manage.py collectstatic

docs/installation/apache.md

@@ -45,17 +45,25 @@ Place your virtual host configuration in the appropriate section within `/etc/ht
 ```
 <VirtualHost *:80>
         ServerName auth.example.com
-
+    
         ProxyPassMatch ^/static !
+        ProxyPassMatch ^/robots.txt !
+
         ProxyPass / http://127.0.0.1:8000/
         ProxyPassReverse / http://127.0.0.1:8000/
         ProxyPreserveHost On
 
         Alias "/static" "/var/www/myauth/static"
+        Alias "/robots.txt" "/var/www/myauth/static/robots.txt"
+
         <Directory "/var/www/myauth/static">
             Require all granted
         </Directory>
 
+        <Location "/robots.txt">
+            SetHandler None
+            Require all granted
+        </Location>
 </VirtualHost>
 ```
 

docs/installation/nginx.md

@@ -69,6 +69,10 @@ server {
         autoindex off;
     }
 
+    location /robots.txt {
+        alias /var/www/myauth/static/robots.txt;
+    }
+
     # Gunicorn config goes below
     location / {
         include proxy_params;

docs/installation/upgrade_python.md

@@ -18,12 +18,17 @@ To run AA with a newer Python 3 version than your system's default you need to i
 
 ```eval_rst
 .. note::
-   For stability and performance we currently recommend to run AA with Python 3.7. Since at the time of writing Python 3.7 was not available for CentOS through yum install this guide will upgrade to Python 3.6. For Ubuntu one can just replace "3.6" with "3.7" in the installation commands to get Python 3.7.
+   For stability and performance we currently recommend to run AA with Python 3.7. It has proven to be the fastest and most stable version in use currently.
 ```
 
-To install other Python versions than come with your distro you need to add a new installation repository. Then you can install the specific Python 3 to your system.
+To install other Python versions than those included with your distribution, you need to add a new installation repository. Then you can install the specific Python 3 to your system.
 
-Ubuntu:
+Ubuntu 1604 1804:
+
+```eval_rst
+.. note::
+   Ubuntu 2004 ships with Python 3.8, No updates required.
+```
 
 ```bash
 add-apt-repository ppa:deadsnakes/ppa
@@ -34,23 +39,38 @@ apt-get update
 ```
 
 ```bash
-apt-get install python3.6 python3.6-dev python3.6-venv
+apt-get install python3.7 python3.7-dev python3.7-venv
 ```
 
-CentOS:
+CentOS 7/8:
 
 ```bash
-yum install https://centos7.iuscommunity.org/ius-release.rpm
+cd ~
 ```
 
 ```bash
-yum update
+sudo yum install gcc openssl-devel bzip2-devel libffi-devel wget
 ```
 
 ```bash
-yum install python36u python36u-pip python36u-devel
+wget https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz
 ```
 
+```bash
+tar xvf Python-3.7.10.tgz
+```
+
+```bash
+cd Python-3.7.10/
+```
+
+```bash
+./configure --enable-optimizations --enable-shared
+```
+
+```bash
+make altinstall
+```
 ## Preparing your venv
 
 Before updating your venv it is important to make sure that your current installation is stable. Otherwise your new venv might not be consistent with your data, which might create problems.
@@ -97,12 +117,6 @@ If you unsure which apps you have installed from repos check `INSTALLED_APPS` in
 pip list
 ```
 
-Some AA installations might still be running an older version of django-celery-beat. We would recommend to upgrade to the current version before doing the Python update:
-
-```bash
-pip install -U 'django-celery-beat<2.00'
-```
-
 ```bash
 python manage.py migrate
 ```
@@ -171,7 +185,7 @@ mv /home/allianceserver/venv/auth /home/allianceserver/venv/auth_old
 Now let's create our new venv with Python 3.6 and activate it:
 
 ```bash
-python3.6 -m venv /home/allianceserver/venv/auth
+python3.7 -m venv /home/allianceserver/venv/auth
 ```
 
 ```bash

docs/maintenance/apps.md

@@ -17,8 +17,8 @@ Mature Alliance Auth installations, or those with actively developed extensions
 
 This can make it confusing for admins to apply the right permissions, contribute to larger queries in backend management or simply look unsightly.
 
-```shell
-python manage.py remove_stale_contenttypes --include-stale-apps
+```python
+    python manage.py remove_stale_contenttypes --include-stale-apps
 ```
 
 This inbuilt Django command will step through each contenttype and offer to delete it, displaying what exactly this will cascade to delete. Pay attention and ensure you understand exactly what is being removed before answering `yes`.

setup.py

@@ -22,7 +22,7 @@ install_requires = [
     'celery>=4.3.0,<5.0.0,!=4.4.4',  # 4.4.4 is missing a dependency
     'celery_once>=2.0.1',
 
-    'django>=3.1.1,<3.2.0',
+    'django>=3.1.1,<4.0.0',
     'django-bootstrap-form',
     'django-registration>=3.1',
     'django-sortedm2m',
@@ -58,7 +58,7 @@ setup(
     extras_require={
         'testing': testing_extras
     },
-    python_requires='~=3.6',
+    python_requires='~=3.7',
     license='GPLv2',
     packages=['allianceauth'],
     url=allianceauth.__url__,
@@ -72,15 +72,20 @@ setup(
         'Environment :: Web Environment',
         'Framework :: Django',
         'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3',        
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
+    project_urls={
+        'Documentation': 'https://allianceauth.readthedocs.io/',
+    },
+
 )

tox.ini

@@ -1,16 +1,16 @@
 [tox]
 skipsdist = true
 usedevelop = true
-envlist = py{36,37,38}-{all}
+envlist = py{37,38,39}-{all}
 
 [testenv]
 setenv =
     all: DJANGO_SETTINGS_MODULE = tests.settings_all
     core: DJANGO_SETTINGS_MODULE = tests.settings_core
 basepython =        
-    py36: python3.6
     py37: python3.7
     py38: python3.8
+    py39: python3.9
 deps=    
     coverage
 install_command = pip install -e ".[testing]" -U {opts} {packages}