Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-1176' into 'master'

Browse Source 
Fix issue #1176: Prevent Django 3 installation

Closes #1176

See merge request allianceauth/allianceauth!1142
This commit is contained in:
Basraah 2019-12-05 02:36:03 +00:00
commit 58e9c21e4f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -16,7 +16,7 @@ install_requires = [
'celery>=4.0.2,<4.3.0', 'celery>=4.0.2,<4.3.0',
'celery_once', 'celery_once',
'django>=2.0', 'django>=2.0,<3.0',
'django-bootstrap-form', 'django-bootstrap-form',
'django-registration==2.4', 'django-registration==2.4',
'django-sortedm2m', 'django-sortedm2m',

5
tox.ini
View File

@ -1,7 +1,7 @@
[tox] [tox]
skipsdist = True skipsdist = True
usedevelop = True usedevelop = True
envlist = py{34,35,36,37}-dj{111,20} envlist = py{34,35,36,37}-dj{20}
[testenv] [testenv]
setenv = setenv =
@ -12,8 +12,7 @@ basepython =
py36: python3.6 py36: python3.6
py37: python3.7 py37: python3.7
deps= deps=
dj111: Django>=1.11.1,<2.0 dj20: Django>=2.0,<3.0
dj20: Django>=2.0
py37: https://github.com/yaml/pyyaml/zipball/master#egg=pyyaml py37: https://github.com/yaml/pyyaml/zipball/master#egg=pyyaml
py37: https://github.com/celery/kombu/zipball/master#egg=kombu 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}