BOM-1537 : Upgrade to Python 3.8

.travis.yml

@@ -1,29 +1,18 @@
 language: python
 sudo: false
 python:
-  - 2.7
   - 3.5
+  - 3.8
 cache: pip
 install:
   - pip install -r requirements/travis.txt
 env:
-  - TOX_ENV=django111
-  - TOX_ENV=django20
-  - TOX_ENV=django21
   - TOX_ENV=django22
+  - TOX_ENV=docs
+  - TOX_ENV=quality
 matrix:
-  exclude:
-  - python: 2.7
-    env: TOX_ENV=django20
-  - python: 2.7
-    env: TOX_ENV=django21
-  - python: 2.7
-    env: TOX_ENV=django22
-  include:
-    - python: 3.5
-      env: TOX_ENV=docs
-    - python: 3.5
-      env: TOX_ENV=quality
+  allow_failures:
+    - python: 3.8
 script:
   - tox -e $TOX_ENV
 after_success:

Makefile

@@ -22,7 +22,7 @@ help: ## display this help message
 quality: ## check coding style with pycodestyle and pylint
 	pycodestyle
 	script/max_pylint_violations
-	pylint --py3k xblock
+	pylint xblock
 
 test: ## run tests on every supported Python/Django combination
 	tox

pylintrc

@@ -19,7 +19,6 @@ persistent=yes
 
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
-load-plugins=caniusepython3.pylint_checker
 
 
 [MESSAGES CONTROL]
@@ -62,6 +61,7 @@ disable=
     too-many-locals,
     duplicate-code,
     len-as-condition,
+    fixme,
 
 
 [REPORTS]

requirements/base.txt

@@ -5,10 +5,7 @@
 #    make upgrade
 #
 appdirs==1.4.3            # via fs
-backports.os==0.1.1       # via fs
-enum34==1.1.10            # via fs
 fs==2.4.11                # via -r requirements/base.in
-future==0.18.2            # via backports.os
 lxml==4.5.0               # via -r requirements/base.in
 markupsafe==1.1.1         # via -r requirements/base.in
 python-dateutil==2.8.0    # via -c requirements/constraints.txt, -r requirements/base.in

requirements/constraints.txt

@@ -9,10 +9,6 @@
 # linking to it here is good.
 
 
-# futures is part of the builtin python in python3
-futures ; python_version == "2.7"
-
-
 # latest botocore release cap upper version of python-dateutil<2.8.1, this conflicts
 # with our dependencies due to the order in which the dependecies are pip-compiled.
 # Adding this constraint till botocore can figure out a fix around this, keep a look at

requirements/dev.txt

@@ -5,38 +5,27 @@
 #    make upgrade
 #
 appdirs==1.4.3            # via -r requirements/test.txt, -r requirements/travis.txt, fs, virtualenv
-argparse==1.4.0           # via -r requirements/test.txt, caniusepython3
-astroid==1.6.6            # via -r requirements/test.txt, pylint
-atomicwrites==1.3.0       # via -r requirements/test.txt, pytest
+astroid==2.3.3            # via -r requirements/test.txt, pylint
 attrs==19.3.0             # via -r requirements/test.txt, hypothesis, pytest
-backports.functools-lru-cache==1.6.1  # via -r requirements/test.txt, astroid, caniusepython3, isort, pylint
-backports.os==0.1.1       # via -r requirements/test.txt, fs, path.py
-boto3==1.12.45            # via -r requirements/test.txt, fs-s3fs
-botocore==1.15.45         # via -r requirements/test.txt, boto3, s3transfer
-caniusepython3==7.2.0     # via -r requirements/test.txt
-certifi==2020.4.5.1       # via -r requirements/test.txt, -r requirements/travis.txt, requests
-chardet==3.0.4            # via -r requirements/test.txt, -r requirements/travis.txt, requests
+boto3==1.12.46            # via -r requirements/test.txt, fs-s3fs
+botocore==1.15.46         # via -r requirements/test.txt, boto3, s3transfer
+certifi==2020.4.5.1       # via -r requirements/travis.txt, requests
+chardet==3.0.4            # via -r requirements/travis.txt, requests
 click==7.1.1              # via -r requirements/pip-tools.txt, pip-tools
 codecov==2.0.22           # via -r requirements/travis.txt
-configparser==4.0.2       # via -r requirements/test.txt, -r requirements/travis.txt, importlib-metadata, pylint
-contextlib2==0.6.0.post1  # via -r requirements/test.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources, virtualenv, zipp
 coverage==5.1             # via -r requirements/test.txt, -r requirements/travis.txt, codecov, pytest-cov
 ddt==1.3.1                # via -r requirements/test.txt
 diff-cover==2.6.1         # via -r requirements/test.txt
-distlib==0.3.0            # via -r requirements/test.txt, -r requirements/travis.txt, caniusepython3, virtualenv
+distlib==0.3.0            # via -r requirements/test.txt, -r requirements/travis.txt, virtualenv
 django-pyfs==2.1          # via -r requirements/test.txt
-django==1.11.29           # via -r requirements/test.txt, django-pyfs
+django==2.2.12            # via -r requirements/test.txt, django-pyfs
 docutils==0.15.2          # via -r requirements/test.txt, botocore
-enum34==1.1.10            # via -r requirements/test.txt, astroid, fs, hypothesis
 filelock==3.0.12          # via -r requirements/test.txt, -r requirements/travis.txt, tox, virtualenv
 fs-s3fs==1.1.1            # via -r requirements/test.txt, django-pyfs
 fs==2.4.11                # via -r requirements/test.txt, django-pyfs, fs-s3fs
-funcsigs==1.0.2           # via -r requirements/test.txt, mock, pytest
-future==0.18.2            # via -r requirements/test.txt, backports.os
-futures==3.3.0 ; python_version == "2.7"  # via -c requirements/constraints.txt, -r requirements/test.txt, caniusepython3, isort, s3transfer
-hypothesis==4.57.1        # via -r requirements/test.txt
-idna==2.9                 # via -r requirements/test.txt, -r requirements/travis.txt, requests
-importlib-metadata==1.6.0  # via -r requirements/test.txt, -r requirements/travis.txt, importlib-resources, inflect, path.py, pluggy, pytest, tox, virtualenv
+hypothesis==5.10.4        # via -r requirements/test.txt
+idna==2.9                 # via -r requirements/travis.txt, requests
+importlib-metadata==1.6.0  # via -r requirements/test.txt, -r requirements/travis.txt, importlib-resources, inflect, path, pluggy, pytest, tox, virtualenv
 importlib-resources==1.4.0  # via -r requirements/test.txt, -r requirements/travis.txt, virtualenv
 inflect==3.0.2            # via -r requirements/test.txt, jinja2-pluralize
 isort==4.3.21             # via -r requirements/test.txt, pylint
@@ -49,41 +38,42 @@ lxml==4.5.0               # via -r requirements/test.txt
 markupsafe==1.1.1         # via -r requirements/test.txt, jinja2
 mccabe==0.6.1             # via -r requirements/test.txt, pylint
 mock==3.0.5               # via -r requirements/test.txt
-more-itertools==5.0.0     # via -r requirements/test.txt, pytest
+more-itertools==8.2.0     # via -r requirements/test.txt, pytest
 nose==1.3.7               # via -r requirements/test.txt
-packaging==20.3           # via -r requirements/test.txt, -r requirements/travis.txt, caniusepython3, pytest, tox
-path.py==11.5.2           # via -r requirements/test.txt
-pathlib2==2.3.5           # via -r requirements/test.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources, pytest, pytest-django, virtualenv
+packaging==20.3           # via -r requirements/test.txt, -r requirements/travis.txt, pytest, tox
+path.py==12.4.0           # via -r requirements/test.txt
+path==13.1.0              # via -r requirements/test.txt, path.py
+pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pip-tools==5.0.0          # via -r requirements/pip-tools.txt
 pluggy==0.13.1            # via -r requirements/test.txt, -r requirements/travis.txt, diff-cover, pytest, tox
 py==1.8.1                 # via -r requirements/test.txt, -r requirements/travis.txt, pytest, tox
 pycodestyle==2.5.0        # via -r requirements/test.txt
-pygments==2.5.2           # via -r requirements/test.txt, diff-cover
-pylint==1.9.5             # via -r requirements/test.txt
+pygments==2.6.1           # via -r requirements/test.txt, diff-cover
+pylint==2.4.4             # via -r requirements/test.txt
 pyparsing==2.4.7          # via -r requirements/test.txt, -r requirements/travis.txt, packaging
 pytest-cov==2.8.1         # via -r requirements/test.txt
 pytest-django==3.9.0      # via -r requirements/test.txt
-pytest==4.6.9             # via -r requirements/test.txt, pytest-cov, pytest-django
+pytest==5.4.1             # via -r requirements/test.txt, pytest-cov, pytest-django
 python-dateutil==2.8.0    # via -c requirements/constraints.txt, -r requirements/test.txt, botocore
 pytz==2019.3              # via -r requirements/test.txt, django, fs
 pyyaml==5.3.1             # via -r requirements/test.txt
-requests==2.23.0          # via -r requirements/test.txt, -r requirements/travis.txt, caniusepython3, codecov
+requests==2.23.0          # via -r requirements/travis.txt, codecov
 s3transfer==0.3.3         # via -r requirements/test.txt, boto3
-scandir==1.10.0           # via -r requirements/test.txt, -r requirements/travis.txt, pathlib2
 simplejson==3.17.0        # via -r requirements/test.txt
-singledispatch==3.4.0.3   # via -r requirements/test.txt, -r requirements/travis.txt, astroid, importlib-resources, pylint
-six==1.14.0               # via -r requirements/pip-tools.txt, -r requirements/test.txt, -r requirements/travis.txt, astroid, diff-cover, django-pyfs, fs, fs-s3fs, mock, more-itertools, packaging, pathlib2, pip-tools, pylint, pytest, python-dateutil, singledispatch, tox, virtualenv
+six==1.14.0               # via -r requirements/pip-tools.txt, -r requirements/test.txt, -r requirements/travis.txt, astroid, diff-cover, django-pyfs, fs, fs-s3fs, mock, packaging, pathlib2, pip-tools, python-dateutil, tox, virtualenv
 sortedcontainers==2.1.0   # via -r requirements/test.txt, hypothesis
+sqlparse==0.3.1           # via -r requirements/test.txt, django
 toml==0.10.0              # via -r requirements/test.txt, -r requirements/travis.txt, tox
 tox-battery==0.5.2        # via -r requirements/travis.txt
 tox==3.14.6               # via -r requirements/test.txt, -r requirements/travis.txt, tox-battery
-typing==3.7.4.1           # via -r requirements/test.txt, -r requirements/travis.txt, fs, importlib-resources
+typed-ast==1.4.1          # via -r requirements/test.txt, astroid
+typing==3.7.4.1           # via -r requirements/test.txt, fs
 urllib3==1.25.9           # via -r requirements/test.txt, -r requirements/travis.txt, botocore, requests
 virtualenv==20.0.18       # via -r requirements/test.txt, -r requirements/travis.txt, tox
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 web-fragments==0.3.1      # via -r requirements/test.txt
 webob==1.8.6              # via -r requirements/test.txt
-wrapt==1.12.1             # via -r requirements/test.txt, astroid
+wrapt==1.11.2             # via -r requirements/test.txt, astroid
 zipp==1.2.0               # via -r requirements/test.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/django.in

@@ -5,6 +5,6 @@
 
 -r base.txt                         # Core XBlock dependencies
 
-Django>=1.11
+Django>=2.2,<3.0
 django-pyfs>=1.0.5
 lazy

requirements/django.txt

@@ -5,17 +5,13 @@
 #    make upgrade
 #
 appdirs==1.4.3            # via -r requirements/base.txt, fs
-backports.os==0.1.1       # via -r requirements/base.txt, fs
-boto3==1.12.45            # via fs-s3fs
-botocore==1.15.45         # via boto3, s3transfer
+boto3==1.12.46            # via fs-s3fs
+botocore==1.15.46         # via boto3, s3transfer
 django-pyfs==2.1          # via -r requirements/django.in
-django==1.11.29           # via -r requirements/django.in, django-pyfs
+django==2.2.12            # via -r requirements/django.in, django-pyfs
 docutils==0.15.2          # via botocore
-enum34==1.1.10            # via -r requirements/base.txt, fs
 fs-s3fs==1.1.1            # via django-pyfs
 fs==2.4.11                # via -r requirements/base.txt, django-pyfs, fs-s3fs
-future==0.18.2            # via -r requirements/base.txt, backports.os
-futures==3.3.0 ; python_version == "2.7"  # via -c requirements/constraints.txt, s3transfer
 jmespath==0.9.5           # via boto3, botocore
 lazy==1.4                 # via -r requirements/django.in
 lxml==4.5.0               # via -r requirements/base.txt
@@ -26,6 +22,7 @@ pyyaml==5.3.1             # via -r requirements/base.txt
 s3transfer==0.3.3         # via boto3
 simplejson==3.17.0        # via -r requirements/base.txt
 six==1.14.0               # via -r requirements/base.txt, django-pyfs, fs, fs-s3fs, python-dateutil
+sqlparse==0.3.1           # via django
 typing==3.7.4.1           # via -r requirements/base.txt, fs
 urllib3==1.25.9           # via botocore
 web-fragments==0.3.1      # via -r requirements/base.txt

requirements/doc.txt

@@ -7,21 +7,16 @@
 alabaster==0.7.12         # via sphinx
 appdirs==1.4.3            # via -r requirements/django.txt, fs
 babel==2.8.0              # via sphinx
-backports.os==0.1.1       # via -r requirements/django.txt, fs
-boto3==1.12.45            # via -r requirements/django.txt, fs-s3fs
-botocore==1.15.45         # via -r requirements/django.txt, boto3, s3transfer
+boto3==1.12.46            # via -r requirements/django.txt, fs-s3fs
+botocore==1.15.46         # via -r requirements/django.txt, boto3, s3transfer
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 django-pyfs==2.1          # via -r requirements/django.txt
-django==1.11.29           # via -r requirements/django.txt, django-pyfs
+django==2.2.12            # via -r requirements/django.txt, django-pyfs
 docutils==0.15.2          # via -r requirements/django.txt, botocore, sphinx
 edx-sphinx-theme==1.5.0   # via -r requirements/doc.in
-enum34==1.1.10            # via -r requirements/django.txt, fs
 fs-s3fs==1.1.1            # via -r requirements/django.txt, django-pyfs
 fs==2.4.11                # via -r requirements/django.txt, django-pyfs, fs-s3fs
-funcsigs==1.0.2           # via mock
-future==0.18.2            # via -r requirements/django.txt, backports.os
-futures==3.3.0 ; python_version == "2.7"  # via -c requirements/constraints.txt, -r requirements/django.txt, s3transfer
 idna==2.9                 # via requests
 imagesize==1.2.0          # via sphinx
 jinja2==2.11.2            # via sphinx
@@ -31,19 +26,25 @@ lxml==4.5.0               # via -r requirements/django.txt
 markupsafe==1.1.1         # via -r requirements/django.txt, jinja2
 mock==3.0.5               # via -r requirements/doc.in
 packaging==20.3           # via sphinx
-pygments==2.5.2           # via sphinx
+pygments==2.6.1           # via sphinx
 pyparsing==2.4.7          # via packaging
 python-dateutil==2.8.0    # via -c requirements/constraints.txt, -r requirements/django.txt, botocore
 pytz==2019.3              # via -r requirements/django.txt, babel, django, fs
 pyyaml==5.3.1             # via -r requirements/django.txt
 requests==2.23.0          # via sphinx
 s3transfer==0.3.3         # via -r requirements/django.txt, boto3
 simplejson==3.17.0        # via -r requirements/django.txt
-six==1.14.0               # via -r requirements/django.txt, django-pyfs, edx-sphinx-theme, fs, fs-s3fs, mock, packaging, python-dateutil, sphinx
+six==1.14.0               # via -r requirements/django.txt, django-pyfs, edx-sphinx-theme, fs, fs-s3fs, mock, packaging, python-dateutil
 snowballstemmer==2.0.0    # via sphinx
-sphinx==1.8.5             # via -r requirements/doc.in, edx-sphinx-theme
-sphinxcontrib-websupport==1.1.2  # via sphinx
-typing==3.7.4.1           # via -r requirements/django.txt, fs, sphinx
+sphinx==3.0.2             # via -r requirements/doc.in, edx-sphinx-theme
+sphinxcontrib-applehelp==1.0.2  # via sphinx
+sphinxcontrib-devhelp==1.0.2  # via sphinx
+sphinxcontrib-htmlhelp==1.0.3  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.3  # via sphinx
+sphinxcontrib-serializinghtml==1.1.4  # via sphinx
+sqlparse==0.3.1           # via -r requirements/django.txt, django
+typing==3.7.4.1           # via -r requirements/django.txt, fs
 urllib3==1.25.9           # via -r requirements/django.txt, botocore, requests
 web-fragments==0.3.1      # via -r requirements/django.txt
 webob==1.8.6              # via -r requirements/django.txt

requirements/test.in

@@ -5,7 +5,6 @@
 -r django.txt                       # Package dependencies, including optional Django support
 
 astroid
-caniusepython3
 coverage
 ddt
 diff-cover >= 0.2.1