diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6c0ddc1..05cbfcb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/docs/installation/allianceauth.md b/docs/installation/allianceauth.md index a2fdcaf4..47b7ee6e 100644 --- a/docs/installation/allianceauth.md +++ b/docs/installation/allianceauth.md @@ -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: diff --git a/setup.py b/setup.py index 02737c8b..1c36b27a 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -71,8 +71,7 @@ setup( 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/tox.ini b/tox.ini index 53c0fc18..8ead5386 100644 --- a/tox.ini +++ b/tox.ini @@ -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 +basepython = py36: python3.6 py37: python3.7 py38: python3.8