Merge pull request #436 from edx/awais786/1025

BOM-1025

.travis.yml

@@ -2,17 +2,27 @@ language: python
 sudo: false
 python:
   - 2.7
-  - 3.6
+  - 3.5
 cache: pip
 install:
   - pip install -r requirements/travis.txt
 env:
   - TOX_ENV=django111
+  - TOX_ENV=django20
+  - TOX_ENV=django21
+  - TOX_ENV=django22
 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.6
+    - python: 3.5
       env: TOX_ENV=docs
-    - python: 3.6
+    - python: 3.5
       env: TOX_ENV=quality
 script:
   - tox -e $TOX_ENV
@@ -26,5 +36,5 @@ deploy:
   distributions: sdist bdist_wheel
   on:
     tags: true
-    python: 3.6
-    condition: '$TOX_ENV = django111'
+    python: 3.5
+    condition: '$TOX_ENV = quality'

pylintrc

@@ -136,7 +136,7 @@ class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
+good-names=i,j,k,ex,Run,_,e
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata

requirements/base.in

@@ -1,7 +1,7 @@
 # Core requirements for using this package
+-c constraints.txt
 
 fs
-futures ; python_version == "2.7"   # via s3transfer
 lxml
 markupsafe
 python-dateutil

requirements/base.txt

@@ -8,18 +8,17 @@ appdirs==1.4.3            # via fs
 backports.os==0.1.1       # via fs
 enum34==1.1.6             # via fs
 fs==2.4.11
-future==0.18.1            # via backports.os
-futures==3.3.0 ; python_version == "2.7"
+future==0.18.2            # via backports.os
 lxml==4.4.1
 markupsafe==1.1.1
 python-dateutil==2.8.0
 pytz==2019.3
 pyyaml==5.1.2
 simplejson==3.16.0
-six==1.12.0
+six==1.13.0
 typing==3.7.4.1           # via fs
-web-fragments==0.3.0
+web-fragments==0.3.1
 webob==1.8.5
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.4.0        # via fs
+# setuptools==41.6.0        # via fs

requirements/constraints.txt

@@ -0,0 +1,18 @@
+# Version constraints for pip installation.
+#
+# This file doesn't install any packages. It specifies version constraints
+# that will be applied if a package is needed.
+#
+# When pinning something here, please provide an explanation of why.  Ideally,
+# link to other information that will help people in the future to remove the
+# pin when possible.  Writing an issue against the offending project and
+# 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 to 2.8.0 and that is not
+# compatible with other packages. That's why adding a cap here to avoid boto latest release untill they fix the issue.
+botocore<1.14.0,>=1.13.17

requirements/dev.in

@@ -1,5 +1,6 @@
 # Dependencies that are used in development environments.
 # Please do not use this file for packages that are needed for package installation or for test runs.
+-c constraints.txt
 
 -r pip-tools.txt                    # pip-tools and its dependencies, for managing requirements files
 -r test.txt                         # Dependencies for running the various test suites

requirements/dev.txt

@@ -9,11 +9,11 @@ argparse==1.4.0
 astroid==1.6.6
 atomicwrites==1.3.0
 attrs==19.3.0
-backports.functools-lru-cache==1.5
+backports.functools-lru-cache==1.6.1
 backports.os==0.1.1
-boto3==1.10.0
-botocore==1.13.0
-caniusepython3==7.1.0
+boto3==1.10.17
+botocore==1.13.17
+caniusepython3==7.2.0
 certifi==2019.9.11
 chardet==3.0.4
 click==7.0
@@ -23,26 +23,26 @@ contextlib2==0.6.0.post1
 coverage==4.5.4
 ddt==1.2.1
 diff-cover==2.4.0
-distlib==0.2.9.post0
+distlib==0.3.0
 django-pyfs==2.0
-django==1.11.25
+django==1.11.26
 docutils==0.15.2
 enum34==1.1.6
 filelock==3.0.12
 fs-s3fs==1.1.1
 fs==2.4.11
 funcsigs==1.0.2
-future==0.18.1
+future==0.18.2
 futures==3.3.0 ; python_version == "2.7"
-hypothesis==4.41.3
+hypothesis==4.44.2
 idna==2.8
 importlib-metadata==0.23
-inflect==2.1.0
+inflect==3.0.2
 isort==4.3.21
 jinja2-pluralize==0.3.0
 jinja2==2.10.3
 jmespath==0.9.4
-lazy-object-proxy==1.4.2
+lazy-object-proxy==1.4.3
 lazy==1.4
 lxml==4.4.1
 markupsafe==1.1.1
@@ -59,9 +59,9 @@ py==1.8.0
 pycodestyle==2.5.0
 pygments==2.4.2
 pylint==1.9.5
-pyparsing==2.4.2
+pyparsing==2.4.5
 pytest-cov==2.8.1
-pytest-django==3.6.0
+pytest-django==3.7.0
 pytest==4.6.6
 python-dateutil==2.8.0
 pytz==2019.3
@@ -71,18 +71,18 @@ s3transfer==0.2.1
 scandir==1.10.0
 simplejson==3.16.0
 singledispatch==3.4.0.3
-six==1.12.0
+six==1.13.0
 toml==0.10.0
 tox-battery==0.5.1
-tox==3.14.0
+tox==3.14.1
 typing==3.7.4.1
-urllib3==1.25.6
+urllib3==1.25.7
 virtualenv==16.7.7
 wcwidth==0.1.7
-web-fragments==0.3.0
+web-fragments==0.3.1
 webob==1.8.5
 wrapt==1.11.2
 zipp==0.6.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.4.0        # via caniusepython3, fs
+# setuptools==41.6.0        # via caniusepython3, fs

requirements/django.in

@@ -1,8 +1,10 @@
 # Install Django requirements, if we're using the optional Django-integrated
 # parts of XBlock
 
+-c constraints.txt
+
 -r base.txt                         # Core XBlock dependencies
 
-Django>=1.8,<2.0
+Django>=1.11
 django-pyfs>=1.0.5
 lazy

requirements/django.txt

@@ -6,16 +6,16 @@
 #
 appdirs==1.4.3
 backports.os==0.1.1
-boto3==1.10.0             # via fs-s3fs
-botocore==1.13.0          # via boto3, s3transfer
+boto3==1.10.17            # via fs-s3fs
+botocore==1.13.17         # via boto3, s3transfer
 django-pyfs==2.0
-django==1.11.25
+django==1.11.26
 docutils==0.15.2          # via botocore
 enum34==1.1.6
 fs-s3fs==1.1.1            # via django-pyfs
 fs==2.4.11
-future==0.18.1
-futures==3.3.0 ; python_version == "2.7"
+future==0.18.2
+futures==3.3.0 ; python_version == "2.7"  # via s3transfer
 jmespath==0.9.4           # via boto3, botocore
 lazy==1.4
 lxml==4.4.1
@@ -25,11 +25,11 @@ pytz==2019.3
 pyyaml==5.1.2
 s3transfer==0.2.1         # via boto3
 simplejson==3.16.0
-six==1.12.0
+six==1.13.0
 typing==3.7.4.1
-urllib3==1.25.6           # via botocore
-web-fragments==0.3.0
+urllib3==1.25.7           # via botocore
+web-fragments==0.3.1
 webob==1.8.5
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.4.0        # via fs
+# setuptools==41.6.0        # via fs

requirements/doc.in

@@ -1,6 +1,8 @@
 # Packages we need in order to build the docs, separated out so that rtfd.org
 # can install them.
 
+-c constraints.txt
+
 -r django.txt                       # Package dependencies, including optional Django support
 
 edx-sphinx-theme

requirements/doc.txt

@@ -8,19 +8,19 @@ alabaster==0.7.12         # via sphinx
 appdirs==1.4.3
 babel==2.7.0              # via sphinx
 backports.os==0.1.1
-boto3==1.10.0
-botocore==1.13.0
+boto3==1.10.17
+botocore==1.13.17
 certifi==2019.9.11        # via requests
 chardet==3.0.4            # via requests
 django-pyfs==2.0
-django==1.11.25
+django==1.11.26
 docutils==0.15.2
 edx-sphinx-theme==1.5.0
 enum34==1.1.6
 fs-s3fs==1.1.1
 fs==2.4.11
 funcsigs==1.0.2           # via mock
-future==0.18.1
+future==0.18.2
 futures==3.3.0 ; python_version == "2.7"
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
@@ -32,21 +32,21 @@ markupsafe==1.1.1
 mock==3.0.5
 packaging==19.2           # via sphinx
 pygments==2.4.2           # via sphinx
-pyparsing==2.4.2          # via packaging
+pyparsing==2.4.5          # via packaging
 python-dateutil==2.8.0
 pytz==2019.3
 pyyaml==5.1.2
 requests==2.22.0          # via sphinx
 s3transfer==0.2.1
 simplejson==3.16.0
-six==1.12.0
+six==1.13.0
 snowballstemmer==2.0.0    # via sphinx
 sphinx==1.8.5
 sphinxcontrib-websupport==1.1.2  # via sphinx
 typing==3.7.4.1
-urllib3==1.25.6
-web-fragments==0.3.0
+urllib3==1.25.7
+web-fragments==0.3.1
 webob==1.8.5
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.4.0        # via fs, sphinx
+# setuptools==41.6.0        # via fs, sphinx

requirements/pip-tools.in

@@ -1,3 +1,5 @@
 # Just the dependencies to run pip-tools, mainly for the "upgrade" make target
 
+-c constraints.txt
+
 pip-tools                           # Contains pip-compile, used to generate pip requirements files

requirements/pip-tools.txt

@@ -6,4 +6,4 @@
 #
 click==7.0                # via pip-tools
 pip-tools==4.2.0
-six==1.12.0               # via pip-tools
+six==1.13.0               # via pip-tools

requirements/test.in

@@ -1,5 +1,7 @@
 # Requirements for test runs
 
+-c constraints.txt
+
 -r django.txt                       # Package dependencies, including optional Django support
 
 astroid