mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 12:30:15 +02:00
Support and Test against Python3.8
This commit is contained in:
parent
bf24c8253e
commit
4b27dd40b9
3
.gitignore
vendored
3
.gitignore
vendored
@ -64,5 +64,8 @@ celerybeat-schedule
|
|||||||
.idea/*
|
.idea/*
|
||||||
/nbproject/
|
/nbproject/
|
||||||
|
|
||||||
|
#VSCode
|
||||||
|
.vscode/
|
||||||
|
|
||||||
#gitlab configs
|
#gitlab configs
|
||||||
.gitlab/
|
.gitlab/
|
||||||
|
@ -7,20 +7,25 @@ before_script:
|
|||||||
- pip install wheel tox
|
- pip install wheel tox
|
||||||
|
|
||||||
test-3.5:
|
test-3.5:
|
||||||
image: python:3.5-stretch
|
image: python:3.5-buster
|
||||||
script:
|
script:
|
||||||
- tox -e py35
|
- tox -e py35
|
||||||
|
|
||||||
test-3.6:
|
test-3.6:
|
||||||
image: python:3.6-stretch
|
image: python:3.6-buster
|
||||||
script:
|
script:
|
||||||
- tox -e py36
|
- tox -e py36
|
||||||
|
|
||||||
test-3.7:
|
test-3.7:
|
||||||
image: python:3.7-stretch
|
image: python:3.7-buster
|
||||||
script:
|
script:
|
||||||
- tox -e py37
|
- tox -e py37
|
||||||
|
|
||||||
|
test-3.8:
|
||||||
|
image: python:3.8-buster
|
||||||
|
script:
|
||||||
|
- tox -e py38
|
||||||
|
|
||||||
deploy_production:
|
deploy_production:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
image: python:3.6-stretch
|
image: python:3.6-stretch
|
||||||
|
25
.travis.yml
25
.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
|
|
@ -25,7 +25,7 @@ def activate_jabber(request):
|
|||||||
logger.debug("Adding jabber user for user %s with main character %s" % (request.user, character))
|
logger.debug("Adding jabber user for user %s with main character %s" % (request.user, character))
|
||||||
info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user))
|
info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user))
|
||||||
# If our username is blank means we already had a 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]})
|
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)
|
logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
|
||||||
OpenfireTasks.update_groups.delay(request.user.pk)
|
OpenfireTasks.update_groups.delay(request.user.pk)
|
||||||
|
@ -25,7 +25,7 @@ def activate_teamspeak3(request):
|
|||||||
result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
|
result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
|
||||||
|
|
||||||
# if its empty we failed
|
# 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]})
|
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.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
|
||||||
logger.info("Successfully activated TS3 for user %s" % request.user)
|
logger.info("Successfully activated TS3 for user %s" % request.user)
|
||||||
|
1
setup.py
1
setup.py
@ -75,6 +75,7 @@ setup(
|
|||||||
'Programming Language :: Python :: 3.5',
|
'Programming Language :: Python :: 3.5',
|
||||||
'Programming Language :: Python :: 3.6',
|
'Programming Language :: Python :: 3.6',
|
||||||
'Programming Language :: Python :: 3.7',
|
'Programming Language :: Python :: 3.7',
|
||||||
|
'Programming Language :: Python :: 3.8',
|
||||||
'Topic :: Internet :: WWW/HTTP',
|
'Topic :: Internet :: WWW/HTTP',
|
||||||
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
|
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
|
||||||
],
|
],
|
||||||
|
5
tox.ini
5
tox.ini
@ -1,7 +1,7 @@
|
|||||||
[tox]
|
[tox]
|
||||||
skipsdist = true
|
skipsdist = true
|
||||||
usedevelop = true
|
usedevelop = true
|
||||||
envlist = py{35,36,37}-dj{2X}
|
envlist = py{35,36,37,38}-dj{2X}
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv =
|
setenv =
|
||||||
@ -10,11 +10,10 @@ basepython =
|
|||||||
py35: python3.5
|
py35: python3.5
|
||||||
py36: python3.6
|
py36: python3.6
|
||||||
py37: python3.7
|
py37: python3.7
|
||||||
|
py38: python3.8
|
||||||
deps=
|
deps=
|
||||||
coverage
|
coverage
|
||||||
dj2X: Django>=2.0,<3.0
|
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}
|
install_command = pip install -e ".[testing]" -U {opts} {packages}
|
||||||
commands =
|
commands =
|
||||||
coverage run runtests.py -v 2
|
coverage run runtests.py -v 2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user