Version Bump v2.5.1

Fix esi duplicate model warnings

See merge request allianceauth/allianceauth!1159

.gitignore

@@ -64,5 +64,8 @@ celerybeat-schedule
 .idea/*
 /nbproject/
 
+#VSCode
+.vscode/
+
 #gitlab configs
 .gitlab/

.gitlab-ci.yml

@@ -7,20 +7,25 @@ before_script:
 - pip install wheel tox
 
 test-3.5:
-  image: python:3.5-stretch
+  image: python:3.5-buster
   script:  
   - tox -e py35
 
 test-3.6:
-  image: python:3.6-stretch
+  image: python:3.6-buster
   script:  
   - tox -e py36
 
 test-3.7:
-  image: python:3.7-stretch
+  image: python:3.7-buster
   script:  
   - tox -e py37
 
+test-3.8:
+  image: python:3.8-buster
+  script:  
+  - tox -e py38
+
 deploy_production:
   stage: deploy
   image: python:3.6-stretch

.travis.yml

@@ -1,25 +0,0 @@
-language: python
-sudo: false
-cache: pip
-dist: trusty
-install:
-  - pip install coveralls>=1.1 tox
-# command to run tests
-script:
-  - tox
-after_success:
-  coveralls
-matrix:
-  include:
-   - env: TOXENV=py35-dj111
-     python: '3.5'
-   - env: TOXENV=py36-dj111
-     python: '3.6'
-   - env: TOXENV=py35-dj20
-     python: '3.5'
-   - env: TOXENV=py36-dj20
-     python: '3.6'
-   - env: TOXENV=py37-dj20
-     python: '3.7-dev'
-  allow_failures:
-  - env: TOXENV=py37-dj20

allianceauth/__init__.py

@@ -1,6 +1,6 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.5.0'
+__version__ = '2.5.1'
 NAME = 'Alliance Auth v%s' % __version__
 default_app_config = 'allianceauth.apps.AllianceAuthConfig'

allianceauth/authentication/templates/public/login.html

@@ -3,7 +3,7 @@
 {% block page_title %}Login{% endblock %}
 {% block middle_box_content %}
     <p style="text-align:center">
-        <a href="{% url 'auth_sso_login' %}">
+        <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
             <img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
         </a>
     </p>

allianceauth/authentication/templates/registration/activation_email.txt

@@ -1,6 +1,10 @@
 You're receiving this email because someone has entered this email address while registering for an account on {{ site.domain }}
 
-If this was you, please go to the following URL to confirm your email address:
+If this was you, please click on the link below to confirm your email address:
+
+<a href="{{ scheme }}://{{ url }}">Confirm email address</a>
+
+Link not working? Try copy/pasting this URL into your browser:
 
 {{ scheme }}://{{ url }}
 

allianceauth/services/modules/openfire/views.py

@@ -25,7 +25,7 @@ def activate_jabber(request):
     logger.debug("Adding jabber user for user %s with main character %s" % (request.user, character))
     info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user))
     # If our username is blank means we already had a user
-    if info[0] is not "":
+    if info[0] != "":
         OpenfireUser.objects.update_or_create(user=request.user, defaults={'username': info[0]})
         logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
         OpenfireTasks.update_groups.delay(request.user.pk)

allianceauth/services/modules/teamspeak3/views.py

@@ -25,7 +25,7 @@ def activate_teamspeak3(request):
         result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
 
     # if its empty we failed
-    if result[0] is not "":
+    if result[0] != "":
         Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]})
         logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
         logger.info("Successfully activated TS3 for user %s" % request.user)

setup.py

@@ -21,7 +21,7 @@ install_requires = [
     'celery>=4.3.0,<5.0.0',
     'celery_once',
 
-    'django>=2.0,<3.0',
+    'django>=2.2.1,<3.0',
     'django-bootstrap-form',
     'django-registration==2.4',
     'django-sortedm2m',
@@ -75,6 +75,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 skipsdist = true
 usedevelop = true
-envlist = py{35,36,37}-dj{2X}
+envlist = py{35,36,37,38}-dj{2X}
 
 [testenv]
 setenv =
@@ -10,11 +10,10 @@ basepython =
     py35: python3.5
     py36: python3.6
     py37: python3.7
+    py38: python3.8
 deps=    
     coverage
     dj2X: Django>=2.0,<3.0
-    py37: https://github.com/yaml/pyyaml/zipball/master#egg=pyyaml
-    py37: https://github.com/celery/kombu/zipball/master#egg=kombu
 install_command = pip install -e ".[testing]" -U {opts} {packages}
 commands = 
     coverage run runtests.py -v 2