Merge branch 'celery_update' into 'master'

Update Dependencies

Closes #1175

See merge request allianceauth/allianceauth!1141
This commit is contained in:
colcrunch 2020-01-23 00:34:35 +00:00
commit 801502ec77
2 changed files with 9 additions and 11 deletions

View File

@ -19,7 +19,7 @@ Alliance Auth can be installed on any operating system. Dependencies are provide
### Python
Alliance Auth requires python3.4 or higher. Ensure it is installed on your server before proceeding.
Alliance Auth requires python3.5 or higher. Ensure it is installed on your server before proceeding.
Ubuntu:

View File

@ -11,28 +11,27 @@ install_requires = [
'mysqlclient',
'dnspython',
'passlib',
'requests>=2.9.1',
'requests>=2.9.1,<3.0.0',
'bcrypt',
'python-slugify>=1.2',
'requests-oauthlib',
'semantic_version',
'redis<=2.10.6',
'celery>=4.0.2,<4.3.0',
'redis>=3.3.1,<4.0.0',
'celery>=4.3.0,<5.0.0',
'celery_once',
'django>=2.0,<3.0',
'django-bootstrap-form',
'django-registration==2.4',
'django-sortedm2m',
'django-redis-cache==1.8.1',
'django-celery-beat<=1.1.1',
'django-redis-cache>=2.1.0,<3.0.0',
'django-celery-beat>=1.1.1,<2.0.0',
'openfire-restapi',
'sleekxmpp',
'adarnauth-esi>=1.4.10,<2.0',
'kombu<=4.3.0',
'django-esi>=1.5.0,<2.0'
]
testing_extras = [
@ -52,10 +51,9 @@ setup(
long_description_content_type='text/markdown',
install_requires=install_requires,
extras_require={
'testing': testing_extras,
':python_version=="3.4"': ['typing'],
'testing': testing_extras
},
python_requires='~=3.4',
python_requires='~=3.5',
license='GPLv2',
packages=['allianceauth'],
url='https://gitlab.com/allianceauth/allianceauth',