Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dependencies' into 'master'

Browse Source 
Depencies fix

Closes #1150

See merge request allianceauth/allianceauth!1127
This commit is contained in:
Basraah 2019-03-12 20:50:00 +10:00
parent fe3fe0527a
commit dec793bfac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/services/tasks.py
View File

@ -4,8 +4,8 @@ from celery import shared_task
from django.contrib.auth.models import User from django.contrib.auth.models import User
from .hooks import ServicesHook from .hooks import ServicesHook
from celery_once import QueueOnce as BaseTask, AlreadyQueued from celery_once import QueueOnce as BaseTask, AlreadyQueued
from celery_once.helpers import now_unix
from django.core.cache import cache from django.core.cache import cache
from time import time
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -22,7 +22,7 @@ class DjangoBackend:
@staticmethod @staticmethod
def raise_or_lock(key, timeout): def raise_or_lock(key, timeout):
now = now_unix() now = int(time())
result = cache.get(key) result = cache.get(key)
if result: if result:
remaining = int(result) - now remaining = int(result) - now

5
setup.py
View File

@ -13,20 +13,21 @@ install_requires = [
'semantic_version', 'semantic_version',
'redis<=2.10.6', 'redis<=2.10.6',
'celery>=4.0.2', 'celery>=4.0.2,<4.3.0',
'celery_once', 'celery_once',
'django>=2.0', 'django>=2.0',
'django-bootstrap-form', 'django-bootstrap-form',
'django-registration==2.4', 'django-registration==2.4',
'django-sortedm2m', 'django-sortedm2m',
'django-redis-cache>=1.7.1', 'django-redis-cache==1.8.1',
'django-celery-beat<=1.1.1', 'django-celery-beat<=1.1.1',
'openfire-restapi', 'openfire-restapi',
'sleekxmpp', 'sleekxmpp',
'adarnauth-esi>=1.4.10,<2.0', 'adarnauth-esi>=1.4.10,<2.0',
'kombu<=4.3.0',
] ]
testing_extras = [ testing_extras = [