From 38082d159375f75f3ed044edf668b675267c7216 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Fri, 17 Jan 2020 15:39:27 +0100 Subject: [PATCH 1/5] Tests with Django 3 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cf56979..da6d65c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,14 @@ python: - "3.7" env: - - DJANGO=2.2.5 - - DJANGO=1.11.24 + - DJANGO=3.0 + - DJANGO=2.2 + - DJANGO=1.11 matrix: exclude: - python: "3.7" - env: DJANGO=1.11.24 + env: DJANGO=1.11 sudo: true dist: xenial From f82573071634848d297a34a53502835197acf9f3 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Fri, 17 Jan 2020 15:44:36 +0100 Subject: [PATCH 2/5] Using the point releases --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index da6d65c3..258db81f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,14 @@ python: - "3.7" env: - - DJANGO=3.0 - - DJANGO=2.2 - - DJANGO=1.11 + - DJANGO=3.0.2 + - DJANGO=2.2.9 + - DJANGO=1.11.27 matrix: exclude: - python: "3.7" - env: DJANGO=1.11 + env: DJANGO=1.11.27 sudo: true dist: xenial From 8a9b15dbcb6fb9ac1798b949250893f22b9c45f1 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Fri, 17 Jan 2020 15:49:17 +0100 Subject: [PATCH 3/5] Updates testing packages requirements --- requirements.txt | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index ef5c590e..5dc93dcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From c2e96c1754a6059c65ffd4c96139e0140749ecce Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Fri, 17 Jan 2020 16:03:16 +0100 Subject: [PATCH 4/5] Removes python 3.6 testing Removes django 1.11 testing Adds python 3.8 testing --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 258db81f..a5f8ea86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,12 @@ services: - mongodb python: - - "3.6" - "3.7" + - "3.8" env: - DJANGO=3.0.2 - DJANGO=2.2.9 - - DJANGO=1.11.27 - -matrix: - exclude: - - python: "3.7" - env: DJANGO=1.11.27 sudo: true dist: xenial From 5f46d11350dd3e6affd64cdd6722a0cda339f4df Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Fri, 17 Jan 2020 16:15:05 +0100 Subject: [PATCH 5/5] Updates version changes in docs --- README.rst | 4 ++-- docs/index.rst | 2 +- docs/install.rst | 14 +++++++------- setup.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 2005c7ef..203adb3e 100644 --- a/README.rst +++ b/README.rst @@ -26,12 +26,12 @@ Features Requirements ~~~~~~~~~~~~ -- `Django `__ > = 1.11.24 +- `Django `__ > = 2.2 - `Django-picklefield `__ - `Arrow `__ - `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` diff --git a/docs/index.rst b/docs/index.rst index b2223153..f2bb418d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -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: diff --git a/docs/install.rst b/docs/install.rst index 40ec0a98..12f21a69 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -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 `__ 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 `__ @@ -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 `__ .. 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 @@ -142,10 +142,10 @@ You can reference the `requirements = 3.6 +For this you can always use older releases, but they are no longer maintained. diff --git a/setup.py b/setup.py index 66d691d5..0f026665 100644 --- a/setup.py +++ b/setup.py @@ -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=[ @@ -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',