Skip to content

Commit

Permalink
Merge pull request #404 from Koed00/django3
Browse files Browse the repository at this point in the history
Django 3 support
  • Loading branch information
Koed00 authored Jan 18, 2020
2 parents 6813753 + 5f46d11 commit ee0cdbb
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 38 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@ services:
- mongodb

python:
- "3.6"
- "3.7"
- "3.8"

env:
- DJANGO=2.2.5
- DJANGO=1.11.24

matrix:
exclude:
- python: "3.7"
env: DJANGO=1.11.24
- DJANGO=3.0.2
- DJANGO=2.2.9

sudo: true
dist: xenial
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Features
Requirements
~~~~~~~~~~~~

- `Django <https://www.djangoproject.com>`__ > = 1.11.24
- `Django <https://www.djangoproject.com>`__ > = 2.2
- `Django-picklefield <https://github.com/gintas/django-picklefield>`__
- `Arrow <https://github.com/crsmithdev/arrow>`__
- `Blessed <https://github.com/jquast/blessed>`__

Tested with: Python 3.6. 3.7 Django 1.11.x and 2.2.x
Tested with: Python 3.7, 3.8 Django 2.2.X and 3.0.X

.. warning:: Since Python 3.7 `async` became a reserved keyword and was refactored to `async_task`

Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Features
- Rollbar and Sentry support


Django Q is tested with: Python 3.6. and 3.7, Django 1.11.x LTS and 2.2.x
Django Q is tested with: Python 3.7 and 3.8, Django 2.2.x and 3.0.x


Contents:
Expand Down
14 changes: 7 additions & 7 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Installation
Requirements
------------

Django Q is tested for Python 3.6 and 3.7
Django Q is tested for Python 3.7 and 3.8

- `Django <https://www.djangoproject.com>`__

Django Q aims to use as much of Django's standard offerings as possible
The code is tested against Django versions `1.11.x LTS` and `2.1.x`.
The code is tested against Django versions `2.2.x` and `3.0.x`.
Please note that Django versions below 2.0 do not support Python 3.7

- `Django-picklefield <https://github.com/gintas/django-picklefield>`__
Expand Down Expand Up @@ -126,12 +126,12 @@ Other known issues are:
Python
~~~~~~
The code is always tested against the latest version Python 3 and we try to stay compatible with the last two versions of each.
Current tests are performed with 3.6 and 3.7
Current tests are performed with 3.7 and 3.8
If you do encounter any regressions with earlier versions, please submit an issue on `github <https://github.com/Koed00/django-q>`__

.. note::

Django releases before 1.11 are not officially supported on Python 3.6
Django releases before 1.11 are not supported on Python 3.6
Django releases before 2.0 are not supported on Python 3.7

Open-source packages
Expand All @@ -142,10 +142,10 @@ You can reference the `requirements <https://github.com/Koed00/django-q/blob/mas
Django
~~~~~~
We strive to be compatible with last two major version of Django.
At the moment this means we support the 1.11.x and 2.2.x releases.
At the moment this means we support the 2.2.x and 3.0.x releases.

Since we are now no longer supporting Python 2, we can also not support older versions of Django that do not support Python 3.
For this you can always use the pre 1.0 release, but it's no longer maintained.
Since we are now no longer supporting Python 2, we can also not support older versions of Django that do not support Python >= 3.6
For this you can always use older releases, but they are no longer maintained.



37 changes: 19 additions & 18 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,32 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements.txt requirements.in
# pip-compile requirements.in
#
arrow==0.15.2
blessed==1.15.0
boto3==1.9.236
botocore==1.12.236 # via boto3, s3transfer
certifi==2019.9.11 # via requests
arrow==0.15.5
asgiref==3.2.3 # via django
blessed==1.16.1
boto3==1.11.4
botocore==1.14.4 # via boto3, s3transfer
certifi==2019.11.28 # via requests
chardet==3.0.4 # via requests
django-picklefield==2.0
django-redis==4.10.0
django==2.2.8 # via django-picklefield, django-redis
django-redis==4.11.0
django==3.0.2 # via django-picklefield, django-redis
docutils==0.15.2 # via botocore
hiredis==1.0.0
hiredis==1.0.1
idna==2.8 # via requests
iron-core==1.2.0 # via iron-mq
iron-mq==0.9
jmespath==0.9.4 # via boto3, botocore
psutil==5.6.3
pymongo==3.9.0
python-dateutil==2.8.0 # via arrow, botocore, iron-core
pytz==2019.2 # via django
redis==3.3.8
psutil==5.6.7
pymongo==3.10.1
python-dateutil==2.8.1 # via arrow, botocore, iron-core
pytz==2019.3 # via django
redis==3.3.11
requests==2.22.0 # via iron-core
s3transfer==0.2.1 # via boto3
six==1.12.0 # via blessed, python-dateutil
s3transfer==0.3.1 # via boto3
six==1.14.0 # via blessed, python-dateutil
sqlparse==0.3.0 # via django
urllib3==1.25.6 # via botocore, requests
wcwidth==0.1.7 # via blessed
urllib3==1.25.7 # via botocore, requests
wcwidth==0.1.8 # via blessed
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def run(self):
license='MIT',
description='A multiprocessing distributed task queue for Django',
long_description=README,
install_requires=['django>=1.11', 'django-picklefield', 'blessed', 'arrow'],
install_requires=['django>=2.2', 'django-picklefield', 'blessed', 'arrow'],
test_requires=['pytest', 'pytest-django', ],
cmdclass={'test': PyTest},
classifiers=[
Expand All @@ -49,9 +49,9 @@ def run(self):
'Operating System :: MacOS',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Internet :: WWW/HTTP',
'Topic :: System :: Distributed Computing',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand Down

0 comments on commit ee0cdbb

Please sign in to comment.