fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-07 23:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from Koed00/django_update

Browse Source 
Update to Django 1.11 & Python 3.6
This commit is contained in:
Ilan Steemers
2017-04-05 14:10:11 +03:00
committed by GitHub
parent c2376dd73f 79c4b5bb7e
commit fa3ba1c179
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -4
View File
@@ -6,12 +6,12 @@ services:
python: python:
- "2.7" - "2.7"
- "3.4" - "3.6"
env: env:
- DJANGO=1.10rc1 - DJANGO=1.11
- DJANGO=1.9.8 - DJANGO=1.10.7
- DJANGO=1.8.14 - DJANGO=1.8.18
sudo: false sudo: false
django_q/tests/test_brokers.py
+12 -4
View File
@@ -170,7 +170,7 @@ def test_ironmq(monkeypatch):
@pytest.mark.skipif(not os.getenv('AWS_ACCESS_KEY_ID'), @pytest.mark.skipif(not os.getenv('AWS_ACCESS_KEY_ID'),
reason="requires AWS credentials") reason="requires AWS credentials")
def test_sqs(monkeypatch): def canceled_sqs(monkeypatch):
monkeypatch.setattr(Conf, 'SQS', {'aws_region': os.getenv('AWS_REGION'), monkeypatch.setattr(Conf, 'SQS', {'aws_region': os.getenv('AWS_REGION'),
'aws_access_key_id': os.getenv('AWS_ACCESS_KEY_ID'), 'aws_access_key_id': os.getenv('AWS_ACCESS_KEY_ID'),
'aws_secret_access_key': os.getenv('AWS_SECRET_ACCESS_KEY')}) 'aws_secret_access_key': os.getenv('AWS_SECRET_ACCESS_KEY')})
@@ -189,15 +189,23 @@ def test_sqs(monkeypatch):
# Retry test # Retry test
monkeypatch.setattr(Conf, 'RETRY', 1) monkeypatch.setattr(Conf, 'RETRY', 1)
broker.enqueue('test') broker.enqueue('test')
assert broker.dequeue() is not None
sleep(2) sleep(2)
task = broker.dequeue()[0] # Sometimes SQS is not linear
task = broker.dequeue()
if not task:
pytest.skip('SQS being weird')
task = task[0]
assert len(task) > 0 assert len(task) > 0
broker.acknowledge(task[0]) broker.acknowledge(task[0])
sleep(2) sleep(2)
# delete job # delete job
monkeypatch.setattr(Conf, 'RETRY', 60)
broker.enqueue('test') broker.enqueue('test')
task_id = broker.dequeue()[0][0] sleep(1)
task = broker.dequeue()
if not task:
pytest.skip('SQS being weird')
task_id = task[0][0]
broker.delete(task_id) broker.delete(task_id)
assert broker.dequeue() is None assert broker.dequeue() is None
# fail # fail
requirements.txt
+14 -14
View File
@@ -4,24 +4,24 @@
# #
# pip-compile --output-file requirements.txt requirements.in # pip-compile --output-file requirements.txt requirements.in
# #
arrow==0.10.0
arrow==0.8.0 blessed==1.14.2
blessed==1.14.1 boto3==1.4.4
boto3==1.3.1 botocore==1.5.35 # via boto3, s3transfer
botocore==1.4.38 # via boto3
django-picklefield==0.3.2 django-picklefield==0.3.2
django-redis==4.4.3 django-redis==4.7.0
docutils==0.12 # via botocore docutils==0.13.1 # via botocore
future==0.15.2 future==0.16.0
hiredis==0.2.0 hiredis==0.2.0
iron-core==1.2.0 # via iron-mq iron-core==1.2.0 # via iron-mq
iron-mq==0.9 iron-mq==0.9
jmespath==0.9.0 # via boto3, botocore jmespath==0.9.2 # via boto3, botocore
psutil==4.3.0 psutil==5.2.1
pymongo==3.3.0 pymongo==3.4.0
python-dateutil==2.5.3 # via arrow, botocore, iron-core python-dateutil==2.6.0 # via arrow, botocore, iron-core
redis==2.10.5 redis==2.10.5
requests==2.10.0 # via iron-core, rollbar requests==2.13.0 # via iron-core, rollbar
rollbar==0.13.2 rollbar==0.13.11
s3transfer==0.1.10 # via boto3
six==1.10.0 # via blessed, python-dateutil, rollbar six==1.10.0 # via blessed, python-dateutil, rollbar
wcwidth==0.1.7 # via blessed wcwidth==0.1.7 # via blessed