Merge pull request #189 from edx/usamasadiq/bom-1951-remove-six

Removed all usages of package six

bin/workbench-make-xblock

@@ -4,10 +4,10 @@ Use cookiecutter to create a new XBlock project.
 """
 from __future__ import print_function
 
-from builtins import input
 import os
 import re
 import textwrap
+from builtins import input
 
 from cookiecutter.main import cookiecutter
 

manage.py

@@ -1,9 +1,9 @@
 """Manage.py file for XBlock"""
-import django
-
 import os
 import sys
 
+import django
+
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "workbench.settings")
 

requirements/base.txt

@@ -5,41 +5,41 @@
 #    make upgrade
 #
 appdirs==1.4.4            # via fs
-arrow==0.15.6             # via jinja2-time
+arrow==0.15.7             # via jinja2-time
 binaryornot==0.4.4        # via cookiecutter
-boto3==1.13.23            # via fs-s3fs
+boto3==1.14.26            # via fs-s3fs
 boto==2.49.0              # via -r requirements/base.in
-botocore==1.16.23         # via boto3, s3transfer
-certifi==2020.4.5.1       # via requests
+botocore==1.17.26         # via boto3, s3transfer
+certifi==2020.6.20        # via requests
 chardet==3.0.4            # via binaryornot, requests
 click==7.1.2              # via cookiecutter
 cookiecutter==1.7.2       # via -r requirements/base.in
-django-pyfs==2.1          # via -r requirements/base.in
-django==2.2.13            # via -r requirements/base.in, django-pyfs
+django-pyfs==2.2          # via -r requirements/base.in
+django==2.2.14            # via -r requirements/base.in, django-pyfs
 docutils==0.15.2          # via botocore
 fs-s3fs==1.1.1            # via -r requirements/base.in, django-pyfs
 fs==2.4.11                # via django-pyfs, fs-s3fs, xblock
-idna==2.9                 # via requests
+idna==2.10                # via requests
 jinja2-time==0.2.0        # via cookiecutter
 jinja2==2.11.2            # via cookiecutter, jinja2-time
 jmespath==0.10.0          # via boto3, botocore
 lazy==1.4                 # via -r requirements/base.in
-lxml==4.5.1               # via -r requirements/base.in, xblock
+lxml==4.5.2               # via -r requirements/base.in, xblock
 markupsafe==1.1.1         # via cookiecutter, jinja2, xblock
 poyo==0.5.0               # via cookiecutter
 pypng==0.0.20             # via -r requirements/base.in
 python-dateutil==2.8.1    # via arrow, botocore, xblock
-python-slugify==4.0.0     # via cookiecutter
+python-slugify==4.0.1     # via cookiecutter
 pytz==2020.1              # via django, fs, xblock
 pyyaml==5.3.1             # via xblock
-requests==2.23.0          # via -r requirements/base.in, cookiecutter
+requests==2.24.0          # via -r requirements/base.in, cookiecutter
 s3transfer==0.3.3         # via boto3
-simplejson==3.17.0        # via -r requirements/base.in
-six==1.15.0               # via cookiecutter, django-pyfs, fs, fs-s3fs, python-dateutil, xblock
+simplejson==3.17.2        # via -r requirements/base.in
+six==1.15.0               # via cookiecutter, fs, fs-s3fs, python-dateutil, xblock
 sqlparse==0.3.1           # via django
 text-unidecode==1.3       # via python-slugify
-typing==3.7.4.1           # via fs
-urllib3==1.25.9           # via botocore, requests
+typing==3.7.4.3           # via fs
+urllib3==1.25.10          # via botocore, requests
 web-fragments==0.3.2      # via -r requirements/base.in, xblock
 webob==1.8.6              # via -r requirements/base.in, xblock
 xblock==1.3.1             # via -r requirements/base.in

requirements/dev.txt

@@ -6,84 +6,84 @@
 #
 -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock  # via -r requirements/test.in, -r requirements/test.txt
 appdirs==1.4.4            # via -r requirements/test.txt, fs, virtualenv
-arrow==0.15.6             # via -r requirements/test.txt, jinja2-time
+arrow==0.15.7             # via -r requirements/test.txt, jinja2-time
 astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 binaryornot==0.4.4        # via -r requirements/test.txt, cookiecutter
 bok_choy==0.7.1           # via -r requirements/test.in, -r requirements/test.txt
-boto3==1.13.23            # via -r requirements/test.txt, fs-s3fs
+boto3==1.14.26            # via -r requirements/test.txt, fs-s3fs
 boto==2.49.0              # via -r requirements/base.in, -r requirements/test.txt
-botocore==1.16.23         # via -r requirements/test.txt, boto3, s3transfer
-certifi==2020.4.5.1       # via -r requirements/test.txt, requests
+botocore==1.17.26         # via -r requirements/test.txt, boto3, s3transfer
+certifi==2020.6.20        # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, binaryornot, requests
 click-log==0.3.2          # via edx-lint
 click==7.1.2              # via -r requirements/test.txt, click-log, cookiecutter, edx-lint
 cookiecutter==1.7.2       # via -r requirements/base.in, -r requirements/test.txt
-coverage==5.1             # via -r requirements/test.in, -r requirements/test.txt, pytest-cov
+coverage==5.2             # via -r requirements/test.in, -r requirements/test.txt, pytest-cov
 ddt==1.4.1                # via -r requirements/test.in, -r requirements/test.txt
-distlib==0.3.0            # via -r requirements/test.txt, virtualenv
-django-pyfs==2.1          # via -r requirements/base.in, -r requirements/test.txt
-django==2.2.13            # via -r requirements/base.in, -r requirements/test.txt, django-pyfs
+distlib==0.3.1            # via -r requirements/test.txt, virtualenv
+django-pyfs==2.2          # via -r requirements/base.in, -r requirements/test.txt
+django==2.2.14            # via -r requirements/base.in, -r requirements/test.txt, django-pyfs
 docutils==0.15.2          # via -r requirements/test.txt, botocore
-edx-lint==1.4.1           # via -r requirements/quality.in
+edx-lint==1.5.0           # via -r requirements/quality.in
 filelock==3.0.12          # via -r requirements/test.txt, tox, virtualenv
 fs-s3fs==1.1.1            # via -r requirements/base.in, -r requirements/test.txt, django-pyfs
 fs==2.4.11                # via -r requirements/test.txt, django-pyfs, fs-s3fs, xblock
-idna==2.9                 # via -r requirements/test.txt, requests
-importlib-metadata==1.6.1  # via -r requirements/test.txt, importlib-resources, pluggy, pytest, tox, virtualenv
-importlib-resources==1.5.0  # via -r requirements/test.txt, virtualenv
+idna==2.10                # via -r requirements/test.txt, requests
+importlib-metadata==1.7.0  # via -r requirements/test.txt, pluggy, pytest, tox, virtualenv
+importlib-resources==3.0.0  # via -r requirements/test.txt, virtualenv
 isort==4.3.21             # via -r requirements/quality.in, pylint
 jinja2-time==0.2.0        # via -r requirements/test.txt, cookiecutter
 jinja2==2.11.2            # via -r requirements/test.txt, cookiecutter, jinja2-time
 jmespath==0.10.0          # via -r requirements/test.txt, boto3, botocore
 lazy-object-proxy==1.4.3  # via astroid
 lazy==1.4                 # via -r requirements/base.in, -r requirements/test.txt, acid-xblock, bok-choy
-lxml==4.5.1               # via -r requirements/base.in, -r requirements/test.txt, xblock
+lxml==4.5.2               # via -r requirements/base.in, -r requirements/test.txt, xblock
 mako==1.1.3               # via -r requirements/test.txt, acid-xblock
 markupsafe==1.1.1         # via -r requirements/test.txt, cookiecutter, jinja2, mako, xblock
 mccabe==0.6.1             # via pylint
 mock==3.0.5               # via -r requirements/test.in, -r requirements/test.txt
-more-itertools==8.3.0     # via -r requirements/test.txt, pytest
+more-itertools==8.4.0     # via -r requirements/test.txt, pytest
 needle==0.5.0             # via -r requirements/test.txt, bok-choy
 nose==1.3.7               # via -r requirements/test.txt, needle
 packaging==20.4           # via -r requirements/test.txt, pytest, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
-pillow==7.1.2             # via -r requirements/test.txt, needle
+pillow==7.2.0             # via -r requirements/test.txt, needle
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 poyo==0.5.0               # via -r requirements/test.txt, cookiecutter
-py==1.8.1                 # via -r requirements/test.txt, pytest, tox
+py==1.9.0                 # via -r requirements/test.txt, pytest, tox
 pycodestyle==2.6.0        # via -r requirements/quality.in
 pydocstyle==5.0.2         # via -r requirements/quality.in
 pylint-celery==0.3        # via edx-lint
 pylint-django==2.0.11     # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
-pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.4             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pyparsing==2.4.7          # via -r requirements/test.txt, packaging
 pypng==0.0.20             # via -r requirements/base.in, -r requirements/test.txt
-pytest-cov==2.9.0         # via -r requirements/test.in, -r requirements/test.txt
+pytest-cov==2.10.0        # via -r requirements/test.in, -r requirements/test.txt
 pytest-django==3.9.0      # via -r requirements/test.in, -r requirements/test.txt
 pytest-rerunfailures==9.0  # via -r requirements/test.in, -r requirements/test.txt
 pytest==5.4.3             # via -r requirements/test.txt, pytest-cov, pytest-django, pytest-rerunfailures
 python-dateutil==2.8.1    # via -r requirements/test.txt, arrow, botocore, xblock
-python-slugify==4.0.0     # via -r requirements/test.txt, cookiecutter
+python-slugify==4.0.1     # via -r requirements/test.txt, cookiecutter
 pytz==2020.1              # via -r requirements/test.txt, django, fs, xblock
 pyyaml==5.3.1             # via -r requirements/test.txt, xblock
-requests==2.23.0          # via -r requirements/base.in, -r requirements/test.txt, cookiecutter
+requests==2.24.0          # via -r requirements/base.in, -r requirements/test.txt, cookiecutter
 s3transfer==0.3.3         # via -r requirements/test.txt, boto3
 selenium==3.4.1           # via -r requirements/test.in, -r requirements/test.txt, bok-choy, needle
-simplejson==3.17.0        # via -r requirements/base.in, -r requirements/test.txt
-six==1.15.0               # via -r requirements/quality.in, -r requirements/test.txt, astroid, bok-choy, cookiecutter, django-pyfs, edx-lint, fs, fs-s3fs, mock, packaging, pathlib2, python-dateutil, tox, virtualenv, xblock
+simplejson==3.17.2        # via -r requirements/base.in, -r requirements/test.txt
+six==1.15.0               # via -r requirements/test.txt, astroid, bok-choy, cookiecutter, edx-lint, fs, fs-s3fs, mock, packaging, pathlib2, python-dateutil, tox, virtualenv, xblock
 snowballstemmer==2.0.0    # via pydocstyle
 sqlparse==0.3.1           # via -r requirements/test.txt, django
 text-unidecode==1.3       # via -r requirements/test.txt, python-slugify
 toml==0.10.1              # via -r requirements/test.txt, tox
 tox-battery==0.6.1        # via -r requirements/test.in, -r requirements/test.txt
-tox==3.15.1               # via -r requirements/test.in, -r requirements/test.txt, tox-battery
+tox==3.17.1               # via -r requirements/test.in, -r requirements/test.txt, tox-battery
 typed-ast==1.4.1          # via astroid
-typing==3.7.4.1           # via -r requirements/test.txt, fs
-urllib3==1.25.9           # via -r requirements/test.txt, botocore, requests
-virtualenv==20.0.21       # via -r requirements/test.txt, tox
-wcwidth==0.2.3            # via -r requirements/test.txt, pytest
+typing==3.7.4.3           # via -r requirements/test.txt, fs
+urllib3==1.25.10          # via -r requirements/test.txt, botocore, requests
+virtualenv==20.0.27       # via -r requirements/test.txt, tox
+wcwidth==0.2.5            # via -r requirements/test.txt, pytest
 web-fragments==0.3.2      # via -r requirements/base.in, -r requirements/test.txt, xblock
 webob==1.8.6              # via -r requirements/base.in, -r requirements/test.txt, xblock
 wrapt==1.11.2             # via astroid

requirements/quality.in

@@ -7,4 +7,3 @@ edx-lint                  # edX pylint rules and plugins
 isort                     # to standardize order of imports
 pycodestyle               # PEP 8 compliance validation
 pydocstyle                # PEP 257 compliance validation
-six                       # Prevents a version conflict between this file and test.txt

requirements/quality.txt

@@ -6,84 +6,84 @@
 #
 -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock  # via -r requirements/test.txt
 appdirs==1.4.4            # via -r requirements/test.txt, fs, virtualenv
-arrow==0.15.6             # via -r requirements/test.txt, jinja2-time
+arrow==0.15.7             # via -r requirements/test.txt, jinja2-time
 astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 binaryornot==0.4.4        # via -r requirements/test.txt, cookiecutter
 bok_choy==0.7.1           # via -r requirements/test.txt
-boto3==1.13.23            # via -r requirements/test.txt, fs-s3fs
+boto3==1.14.26            # via -r requirements/test.txt, fs-s3fs
 boto==2.49.0              # via -r requirements/test.txt
-botocore==1.16.23         # via -r requirements/test.txt, boto3, s3transfer
-certifi==2020.4.5.1       # via -r requirements/test.txt, requests
+botocore==1.17.26         # via -r requirements/test.txt, boto3, s3transfer
+certifi==2020.6.20        # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, binaryornot, requests
 click-log==0.3.2          # via edx-lint
 click==7.1.2              # via -r requirements/test.txt, click-log, cookiecutter, edx-lint
 cookiecutter==1.7.2       # via -r requirements/test.txt
-coverage==5.1             # via -r requirements/test.txt, pytest-cov
+coverage==5.2             # via -r requirements/test.txt, pytest-cov
 ddt==1.4.1                # via -r requirements/test.txt
-distlib==0.3.0            # via -r requirements/test.txt, virtualenv
-django-pyfs==2.1          # via -r requirements/test.txt
-django==2.2.13            # via -r requirements/test.txt, django-pyfs
+distlib==0.3.1            # via -r requirements/test.txt, virtualenv
+django-pyfs==2.2          # via -r requirements/test.txt
+django==2.2.14            # via -r requirements/test.txt, django-pyfs
 docutils==0.15.2          # via -r requirements/test.txt, botocore
-edx-lint==1.4.1           # via -r requirements/quality.in
+edx-lint==1.5.0           # via -r requirements/quality.in
 filelock==3.0.12          # via -r requirements/test.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, xblock
-idna==2.9                 # via -r requirements/test.txt, requests
-importlib-metadata==1.6.1  # via -r requirements/test.txt, importlib-resources, pluggy, pytest, tox, virtualenv
-importlib-resources==1.5.0  # via -r requirements/test.txt, virtualenv
+idna==2.10                # via -r requirements/test.txt, requests
+importlib-metadata==1.7.0  # via -r requirements/test.txt, pluggy, pytest, tox, virtualenv
+importlib-resources==3.0.0  # via -r requirements/test.txt, virtualenv
 isort==4.3.21             # via -r requirements/quality.in, pylint
 jinja2-time==0.2.0        # via -r requirements/test.txt, cookiecutter
 jinja2==2.11.2            # via -r requirements/test.txt, cookiecutter, jinja2-time
 jmespath==0.10.0          # via -r requirements/test.txt, boto3, botocore
 lazy-object-proxy==1.4.3  # via astroid
 lazy==1.4                 # via -r requirements/test.txt, acid-xblock, bok-choy
-lxml==4.5.1               # via -r requirements/test.txt, xblock
+lxml==4.5.2               # via -r requirements/test.txt, xblock
 mako==1.1.3               # via -r requirements/test.txt, acid-xblock
 markupsafe==1.1.1         # via -r requirements/test.txt, cookiecutter, jinja2, mako, xblock
 mccabe==0.6.1             # via pylint
 mock==3.0.5               # via -r requirements/test.txt
-more-itertools==8.3.0     # via -r requirements/test.txt, pytest
+more-itertools==8.4.0     # via -r requirements/test.txt, pytest
 needle==0.5.0             # via -r requirements/test.txt, bok-choy
 nose==1.3.7               # via -r requirements/test.txt, needle
 packaging==20.4           # via -r requirements/test.txt, pytest, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
-pillow==7.1.2             # via -r requirements/test.txt, needle
+pillow==7.2.0             # via -r requirements/test.txt, needle
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 poyo==0.5.0               # via -r requirements/test.txt, cookiecutter
-py==1.8.1                 # via -r requirements/test.txt, pytest, tox
+py==1.9.0                 # via -r requirements/test.txt, pytest, tox
 pycodestyle==2.6.0        # via -r requirements/quality.in
 pydocstyle==5.0.2         # via -r requirements/quality.in
 pylint-celery==0.3        # via edx-lint
 pylint-django==2.0.11     # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
-pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==2.4.4             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
 pyparsing==2.4.7          # via -r requirements/test.txt, packaging
 pypng==0.0.20             # via -r requirements/test.txt
-pytest-cov==2.9.0         # via -r requirements/test.txt
+pytest-cov==2.10.0        # via -r requirements/test.txt
 pytest-django==3.9.0      # via -r requirements/test.txt
 pytest-rerunfailures==9.0  # via -r requirements/test.txt
 pytest==5.4.3             # via -r requirements/test.txt, pytest-cov, pytest-django, pytest-rerunfailures
 python-dateutil==2.8.1    # via -r requirements/test.txt, arrow, botocore, xblock
-python-slugify==4.0.0     # via -r requirements/test.txt, cookiecutter
+python-slugify==4.0.1     # via -r requirements/test.txt, cookiecutter
 pytz==2020.1              # via -r requirements/test.txt, django, fs, xblock
 pyyaml==5.3.1             # via -r requirements/test.txt, xblock
-requests==2.23.0          # via -r requirements/test.txt, cookiecutter
+requests==2.24.0          # via -r requirements/test.txt, cookiecutter
 s3transfer==0.3.3         # via -r requirements/test.txt, boto3
 selenium==3.4.1           # via -r requirements/test.txt, bok-choy, needle
-simplejson==3.17.0        # via -r requirements/test.txt
-six==1.15.0               # via -r requirements/quality.in, -r requirements/test.txt, astroid, bok-choy, cookiecutter, django-pyfs, edx-lint, fs, fs-s3fs, mock, packaging, pathlib2, python-dateutil, tox, virtualenv, xblock
+simplejson==3.17.2        # via -r requirements/test.txt
+six==1.15.0               # via -r requirements/test.txt, astroid, bok-choy, cookiecutter, edx-lint, fs, fs-s3fs, mock, packaging, pathlib2, python-dateutil, tox, virtualenv, xblock
 snowballstemmer==2.0.0    # via pydocstyle
 sqlparse==0.3.1           # via -r requirements/test.txt, django
 text-unidecode==1.3       # via -r requirements/test.txt, python-slugify
 toml==0.10.1              # via -r requirements/test.txt, tox
 tox-battery==0.6.1        # via -r requirements/test.txt
-tox==3.15.1               # via -r requirements/test.txt, tox-battery
+tox==3.17.1               # via -r requirements/test.txt, tox-battery
 typed-ast==1.4.1          # via astroid
-typing==3.7.4.1           # via -r requirements/test.txt, fs
-urllib3==1.25.9           # via -r requirements/test.txt, botocore, requests
-virtualenv==20.0.21       # via -r requirements/test.txt, tox
-wcwidth==0.2.3            # via -r requirements/test.txt, pytest
+typing==3.7.4.3           # via -r requirements/test.txt, fs
+urllib3==1.25.10          # via -r requirements/test.txt, botocore, requests
+virtualenv==20.0.27       # via -r requirements/test.txt, tox
+wcwidth==0.2.5            # via -r requirements/test.txt, pytest
 web-fragments==0.3.2      # via -r requirements/test.txt, xblock
 webob==1.8.6              # via -r requirements/test.txt, xblock
 wrapt==1.11.2             # via astroid