Merge pull request #24 from edx/Django22-Support

Django22 support

Author: Ayub-Khan

.gitignore

@@ -71,6 +71,7 @@ docs/super_csv.*.rst
 # Private requirements
 requirements/private.in
 requirements/private.txt
+requirements/test.txt.tmp
 
 # tox environment temporary artifacts
 tests/__init__.py

.travis.yml

@@ -1,21 +1,61 @@
 language: python
+
 python:
 - 2.7
-- 3.6
+- 3.5
+
 env:
-- TOXENV=django111
-- TOXENV=django20
+  - TOXENV=django111-drf37
+  - TOXENV=django111-drf38
+  - TOXENV=django111-drf39
+  - TOXENV=django111-drflatest
+  - TOXENV=django20-drf37
+  - TOXENV=django20-drf38
+  - TOXENV=django20-drf39
+  - TOXENV=django20-drflatest
+  - TOXENV=django21-drf37
+  - TOXENV=django21-drf38
+  - TOXENV=django21-drf39
+  - TOXENV=django21-drflatest
+  - TOXENV=django22-drf37
+  - TOXENV=django22-drf38
+  - TOXENV=django22-drf39
+  - TOXENV=django22-drflatest
+
 matrix:
-  exclude:
-  - python: 2.7
-    env: TOXENV=django20
   include:
-  - python: 3.6
+  - python: 3.5
     env: TOXENV=quality
-  - python: 3.6
+  - python: 3.5
     env: TOXENV=docs
-  - python: 3.6
+  - python: 3.5
     env: TOXENV=pii_check
+  exclude:
+    - python: 2.7
+      env: TOXENV=django20-drf37
+    - python: 2.7
+      env: TOXENV=django20-drf38
+    - python: 2.7
+      env: TOXENV=django20-drf39
+    - python: 2.7
+      env: TOXENV=django20-drflatest
+    - python: 2.7
+      env: TOXENV=django21-drf37
+    - python: 2.7
+      env: TOXENV=django21-drf38
+    - python: 2.7
+      env: TOXENV=django21-drf39
+    - python: 2.7
+      env: TOXENV=django21-drflatest
+    - python: 2.7
+      env: TOXENV=django22-drf37
+    - python: 2.7
+      env: TOXENV=django22-drf38
+    - python: 2.7
+      env: TOXENV=django22-drf39
+    - python: 2.7
+      env: TOXENV=django22-drflatest
+
 cache:
 - pip
 before_install:

Makefile

@@ -41,8 +41,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
 	pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
 	# Let tox control the Django version for tests
-	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
-	mv requirements/test.tmp requirements/test.txt
+	sed -i.tmp '/^django==/d' requirements/test.txt
+	sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
+	rm requirements/test.txt.tmp
 
 quality: ## check coding style with pycodestyle and pylint
 	tox -e quality

requirements/base.in

@@ -1,9 +1,10 @@
 # Core requirements for using this application
 -c constraints.txt
 
-Django>=1.11,<2.0          # Web application framework
+Django>=1.11               # Web application framework
 django-model-utils         # Provides TimeStampedModel abstract base class
 django-celery
 django-crum
 djangorestframework
-edx-celeryutils
+edx-celeryutils
+simplejson

requirements/base.txt

@@ -7,12 +7,15 @@
 amqp==1.4.9               # via kombu
 anyjson==0.3.3            # via kombu
 billiard==3.3.0.23        # via celery
-celery==3.1.26.post2      # via django-celery
-django-celery==3.3.0
-django-crum==0.7.3
-django-model-utils==3.2.0
-django==1.11.23
+celery==3.1.26.post2      # via django-celery, edx-celeryutils
+django-celery==3.3.1
+django-crum==0.7.4
+django-model-utils==3.0.0
+django==1.11.26
 djangorestframework==3.9.4
 edx-celeryutils==0.3.0
+future==0.18.2            # via edx-celeryutils
+jsonfield==2.0.2          # via edx-celeryutils
 kombu==3.0.37             # via celery
-pytz==2019.2              # via celery, django
+pytz==2019.3              # via celery, django
+simplejson==3.16.0

requirements/dev.txt

@@ -7,88 +7,91 @@
 amqp==1.4.9
 anyjson==0.3.3
 argparse==1.4.0
-astroid==1.5.3
+astroid==1.6.6
 atomicwrites==1.3.0
-attrs==19.1.0
-backports.functools-lru-cache==1.5
+attrs==19.3.0
+backports.functools-lru-cache==1.6.1
 billiard==3.3.0.23
-caniusepython3==7.1.0
+caniusepython3==7.2.0
 celery==3.1.26.post2
-certifi==2019.6.16
+certifi==2019.9.11
 chardet==3.0.4
 click-log==0.3.2
 click==7.0
 code-annotations==0.3.2
 codecov==2.0.15
-configparser==3.7.4
-contextlib2==0.5.5
+configparser==4.0.2
+contextlib2==0.6.0.post1
 coverage==4.5.4
 ddt==1.2.1
-diff-cover==2.3.0
-distlib==0.2.9.post0
-django-celery==3.3.0
-django-crum==0.7.3
-django-model-utils==3.2.0
-django==1.11.23
+diff-cover==2.4.0
+distlib==0.3.0
+django-celery==3.3.1
+django-crum==0.7.4
+django-model-utils==3.0.0
+django==1.11.26
 djangorestframework==3.9.4
 edx-celeryutils==0.3.0
 edx-i18n-tools==0.4.8
-edx-lint==1.3.0
+edx-lint==1.4.1
 enum34==1.1.6
 filelock==3.0.12
 freezegun==0.3.12
 funcsigs==1.0.2
+future==0.18.2
 futures==3.3.0 ; python_version == "2.7"
 idna==2.8
-importlib-metadata==0.19
-inflect==2.1.0            # via jinja2-pluralize
+importlib-metadata==0.23
+inflect==3.0.2            # via jinja2-pluralize
 isort==4.3.21
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.10.1
+jinja2==2.10.3
+jsonfield==2.0.2
 kombu==3.0.37
-lazy-object-proxy==1.4.1
+lazy-object-proxy==1.4.3
 markupsafe==1.1.1
 mccabe==0.6.1
 mock==3.0.5
 more-itertools==5.0.0
-packaging==19.1
+packaging==19.2
 path.py==11.5.2           # via edx-i18n-tools
-pathlib2==2.3.4
-pbr==5.4.2
-pip-tools==4.0.0
-pluggy==0.12.0
+pathlib2==2.3.5
+pbr==5.4.3
+pip-tools==4.2.0
+pluggy==0.13.0
 polib==1.1.0              # via edx-i18n-tools
 py==1.8.0
 pycodestyle==2.5.0
 pydocstyle==3.0.0
 pygments==2.4.2           # via diff-cover
 pylint-celery==0.3
-pylint-django==0.7.2
-pylint-plugin-utils==0.5
-pylint==1.7.6
-pyparsing==2.4.2
-pytest-cov==2.7.1
-pytest-django==3.5.1
-pytest==4.6.5
-python-dateutil==2.8.0
-python-slugify==3.0.3
-pytz==2019.2
+pylint-django==0.11.1
+pylint-plugin-utils==0.6
+pylint==1.9.5
+pyparsing==2.4.5
+pytest-cov==2.8.1
+pytest-django==3.7.0
+pytest==4.6.6
+python-dateutil==2.8.1
+python-slugify==4.0.0
+pytz==2019.3
 pyyaml==5.1.2
 requests==2.22.0
 scandir==1.10.0
+simplejson==3.16.0
 singledispatch==3.4.0.3
-six==1.12.0
-snowballstemmer==1.9.0
-stevedore==1.30.1
-text-unidecode==1.2
+six==1.13.0
+snowballstemmer==2.0.0
+stevedore==1.31.0
+text-unidecode==1.3
 toml==0.10.0
 tox-battery==0.5.1
-tox==3.13.2
-urllib3==1.25.3
-virtualenv==16.7.2
+tox==3.14.0
+urllib3==1.25.7
+virtualenv==16.7.7
 wcwidth==0.1.7
 wrapt==1.11.2
-zipp==0.5.2
+zipp==0.6.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1        # via caniusepython3
+# setuptools==41.6.0        # via caniusepython3

requirements/doc.txt

@@ -7,54 +7,58 @@
 amqp==1.4.9
 anyjson==0.3.3
 atomicwrites==1.3.0
-attrs==19.1.0
+attrs==19.3.0
 billiard==3.3.0.23
 bleach==3.1.0             # via readme-renderer
 celery==3.1.26.post2
 chardet==3.0.4            # via doc8
 click==7.0
 code-annotations==0.3.2
-configparser==3.7.4
-contextlib2==0.5.5
+configparser==4.0.2
+contextlib2==0.6.0.post1
 coverage==4.5.4
 ddt==1.2.1
-django-celery==3.3.0
-django-crum==0.7.3
-django-model-utils==3.2.0
-django==1.11.23
+django-celery==3.3.1
+django-crum==0.7.4
+django-model-utils==3.0.0
+django==1.11.26
 djangorestframework==3.9.4
 doc8==0.8.0
 docutils==0.15.2          # via doc8, readme-renderer, restructuredtext-lint
+edx-celeryutils==0.3.0
 edx-sphinx-theme==1.5.0
 freezegun==0.3.12
 funcsigs==1.0.2
-importlib-metadata==0.19
-jinja2==2.10.1
+future==0.18.2
+importlib-metadata==0.23
+jinja2==2.10.3
+jsonfield==2.0.2
 kombu==3.0.37
 markupsafe==1.1.1
 mock==3.0.5
 more-itertools==5.0.0
-packaging==19.1
-pathlib2==2.3.4
-pbr==5.4.2
-pluggy==0.12.0
+packaging==19.2
+pathlib2==2.3.5
+pbr==5.4.3
+pluggy==0.13.0
 py==1.8.0
 pygments==2.4.2           # via readme-renderer
-pyparsing==2.4.2
-pytest-cov==2.7.1
-pytest-django==3.5.1
-pytest==4.6.5
-python-dateutil==2.8.0
-python-slugify==3.0.3
-pytz==2019.2
+pyparsing==2.4.5
+pytest-cov==2.8.1
+pytest-django==3.7.0
+pytest==4.6.6
+python-dateutil==2.8.1
+python-slugify==4.0.0
+pytz==2019.3
 pyyaml==5.1.2
 readme-renderer==24.0
 restructuredtext-lint==1.3.0  # via doc8
 scandir==1.10.0
-six==1.12.0
+simplejson==3.16.0
+six==1.13.0
 sphinx==1.8.4
-stevedore==1.30.1
-text-unidecode==1.2
+stevedore==1.31.0
+text-unidecode==1.3
 wcwidth==0.1.7
 webencodings==0.5.1       # via bleach
-zipp==0.5.2
+zipp==0.6.0

requirements/pip-tools.txt

@@ -4,10 +4,6 @@
 #
 #    make upgrade
 #
---index-url http://edx.devstack.devpi:3141/root/pypi/+simple/
---extra-index-url https://pypi.python.org/simple
---trusted-host edx.devstack.devpi
-
 click==7.0                # via pip-tools
-pip-tools==4.1.0
-six==1.12.0               # via pip-tools
+pip-tools==4.2.0
+six==1.13.0               # via pip-tools