Merge branch 'issue_1221' into 'master'

Remove support for Python 3.5

Closes #1224 and #1221

See merge request allianceauth/allianceauth!1182
This commit is contained in:
Ariel Rin 2020-04-15 11:25:44 +00:00
commit 8addd483c2
4 changed files with 5 additions and 17 deletions

View File

@ -6,11 +6,6 @@ before_script:
- python -V
- pip install wheel tox
test-3.5-core:
image: python:3.5-buster
script:
- tox -e py35-core
test-3.6-core:
image: python:3.6-buster
script:
@ -26,11 +21,6 @@ test-3.8-core:
script:
- tox -e py38-core
test-3.5-all:
image: python:3.5-buster
script:
- tox -e py35-all
test-3.6-all:
image: python:3.6-buster
script:

View File

@ -28,7 +28,7 @@ Alliance Auth can be installed on any Unix like operating system. Dependencies a
### Python
Alliance Auth requires python3.5 or higher. Ensure it is installed on your server before proceeding.
Alliance Auth requires Python 3.6 or higher. Ensure it is installed on your server before proceeding.
Ubuntu:

View File

@ -53,7 +53,7 @@ setup(
extras_require={
'testing': testing_extras
},
python_requires='~=3.5',
python_requires='~=3.6',
license='GPLv2',
packages=['allianceauth'],
url='https://gitlab.com/allianceauth/allianceauth',
@ -72,7 +72,6 @@ setup(
'Operating System :: POSIX :: Linux',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',

View File

@ -1,14 +1,13 @@
[tox]
skipsdist = true
usedevelop = true
envlist = py{35,36,37,38}-{all}
envlist = py{36,37,38}-{all}
[testenv]
setenv =
all: DJANGO_SETTINGS_MODULE = tests.settings_all
core: DJANGO_SETTINGS_MODULE = tests.settings_core
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8