Upgrade requirements

Remove vendored requests from botocore boto/botocore#1829

Add constraint to ddt

Author: Luis Moreno

.travis.yml

@@ -4,11 +4,9 @@ language: python
 branches:
     only:
       - master
-matrix:
-  include:
-    - python: "2.7"
-    - python: "3.5"
-    - python: "3.6"
+python:
+  - 3.5
+  - 3.8
 before_install:
   - export BOTO_CONFIG=/dev/null
 install:

requirements/aws.txt

@@ -4,12 +4,11 @@
 #
 #    make upgrade
 #
-boto3==1.10.18
-botocore==1.13.18         # via boto3, s3transfer
+boto3==1.13.5             # via -r requirements/aws.in
+botocore==1.16.5          # via boto3, s3transfer
 docutils==0.15.2          # via botocore
-futures==3.3.0 ; python_version == "2.7"  # via s3transfer
-jmespath==0.9.4           # via boto3, botocore
-python-dateutil==2.8.0    # via botocore
-s3transfer==0.2.1         # via boto3
-six==1.13.0               # via python-dateutil
-urllib3==1.25.7           # via botocore
+jmespath==0.9.5           # via boto3, botocore
+python-dateutil==2.8.1    # via botocore
+s3transfer==0.3.3         # via boto3
+six==1.14.0               # via python-dateutil
+urllib3==1.25.9           # via botocore

requirements/base.txt

@@ -4,24 +4,23 @@
 #
 #    make upgrade
 #
-boto3==1.10.18
-botocore==1.13.18
-certifi==2019.9.11        # via requests
+boto3==1.13.5             # via -r requirements/aws.txt
+botocore==1.16.5          # via -r requirements/aws.txt, boto3, s3transfer
+certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
-click==7.0
-deprecated==1.2.7         # via pygithub
-docutils==0.15.2
-futures==3.3.0 ; python_version == "2.7"
-gitdb2==2.0.6             # via gitpython
-gitpython==2.1.14
-idna==2.8                 # via requests
-jmespath==0.9.4
-pygithub==1.44.1
+click==7.1.2              # via -r requirements/base.in
+deprecated==1.2.9         # via pygithub
+docutils==0.15.2          # via -r requirements/aws.txt, botocore
+gitdb==4.0.5              # via gitpython
+gitpython==3.1.2          # via -r requirements/base.in
+idna==2.9                 # via requests
+jmespath==0.9.5           # via -r requirements/aws.txt, boto3, botocore
+pygithub==1.51            # via -r requirements/base.in
 pyjwt==1.7.1              # via pygithub
-python-dateutil==2.8.0
-requests==2.22.0
-s3transfer==0.2.1
-six==1.13.0
-smmap2==2.0.5             # via gitdb2
-urllib3==1.25.7
-wrapt==1.11.2             # via deprecated
+python-dateutil==2.8.1    # via -r requirements/aws.txt, botocore
+requests==2.23.0          # via -r requirements/base.in, pygithub
+s3transfer==0.3.3         # via -r requirements/aws.txt, boto3
+six==1.14.0               # via -r requirements/aws.txt, python-dateutil
+smmap==3.0.4              # via gitdb
+urllib3==1.25.9           # via -r requirements/aws.txt, botocore, requests
+wrapt==1.11.2             # via -c requirements/constraints.txt, deprecated

requirements/ci.txt

@@ -4,21 +4,19 @@
 #
 #    make upgrade
 #
-configparser==4.0.2       # via importlib-metadata
-contextlib2==0.6.0.post1  # via importlib-metadata
-filelock==3.0.12          # via tox
-importlib-metadata==0.23  # via pluggy, tox
-more-itertools==5.0.0     # via zipp
-packaging==19.2           # via tox
-pathlib2==2.3.5           # via importlib-metadata
-pluggy==0.13.0            # via tox
-py==1.8.0                 # via tox
-pyparsing==2.4.5          # via packaging
-scandir==1.10.0           # via pathlib2
-six==1.13.0               # via packaging, pathlib2, tox
+appdirs==1.4.3            # via virtualenv
+distlib==0.3.0            # via virtualenv
+filelock==3.0.12          # via tox, virtualenv
+importlib-metadata==1.6.0  # via importlib-resources, pluggy, tox, virtualenv
+importlib-resources==1.5.0  # via virtualenv
+packaging==20.3           # via tox
+pluggy==0.13.1            # via tox
+py==1.8.1                 # via tox
+pyparsing==2.4.7          # via packaging
+six==1.14.0               # via packaging, tox, virtualenv
 toml==0.10.0              # via tox
-tox-battery==0.5.1
-tox-travis==0.12
-tox==3.14.1
-virtualenv==16.7.7        # via tox
-zipp==0.6.0               # via importlib-metadata
+tox-battery==0.5.2        # via -r requirements/ci.in
+tox-travis==0.12          # via -r requirements/ci.in
+tox==3.15.0               # via -r requirements/ci.in, tox-battery, tox-travis
+virtualenv==20.0.20       # via tox
+zipp==1.2.0               # via importlib-metadata, importlib-resources

requirements/constraints.txt

@@ -8,9 +8,8 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-# This packages is a backport which can only be installed on Python 2.7
-futures ; python_version == "2.7"
+# Constraint from astroid 2.3.3
+wrapt==1.11.*
 
-# A dependency of pytest.  Pytest doesn't constrain it and 6.0.0 onward
-# only works with python 3
-more-itertools<6.0.0
+# Constrain until https://github.com/datadriventests/ddt/issues/83 is fixed.
+ddt<1.4.0

requirements/dev.txt

@@ -4,67 +4,65 @@
 #
 #    make upgrade
 #
-astroid==1.6.6
-atomicwrites==1.3.0
-attrs==19.3.0
-backports.functools-lru-cache==1.6.1
-boto3==1.10.18
-botocore==1.13.18
-certifi==2019.9.11
-chardet==3.0.4
-click-log==0.3.2
-click==7.0
-configparser==4.0.2
-contextlib2==0.6.0.post1
-coverage==4.5.4
-ddt==1.2.1
-deprecated==1.2.7
-docutils==0.15.2
-edx-lint==1.4.1
-enum34==1.1.6
-filelock==3.0.12
-funcsigs==1.0.2
-futures==3.3.0 ; python_version == "2.7"
-gitdb2==2.0.6
-gitpython==2.1.14
-httpretty==0.9.7
-idna==2.8
-importlib-metadata==0.23
-isort==4.3.21
-jmespath==0.9.4
-lazy-object-proxy==1.4.3
-mccabe==0.6.1
-mock==3.0.5
-more-itertools==5.0.0
-packaging==19.2
-pathlib2==2.3.5
-pip-tools==4.2.0
-pluggy==0.13.0
-py==1.8.0
-pycodestyle==2.5.0
-pygithub==1.44.1
-pyjwt==1.7.1
-pylint-celery==0.3
-pylint-django==0.11.1
-pylint-plugin-utils==0.6
-pylint==1.9.5
-pyparsing==2.4.5
-pytest-cov==2.8.1
-pytest==4.6.6
-python-dateutil==2.8.0
-requests==2.22.0
-s3transfer==0.2.1
-scandir==1.10.0
-singledispatch==3.4.0.3
-six==1.13.0
-smmap2==2.0.5
-testfixtures==6.10.1
-toml==0.10.0
-tox-battery==0.5.1
-tox-travis==0.12
-tox==3.14.1
-urllib3==1.25.7
-virtualenv==16.7.7
-wcwidth==0.1.7
-wrapt==1.11.2
-zipp==0.6.0
+appdirs==1.4.3            # via -r requirements/ci.txt, virtualenv
+astroid==2.3.3            # via -r requirements/testing.txt, pylint, pylint-celery
+attrs==19.3.0             # via -r requirements/testing.txt, pytest
+boto3==1.13.5             # via -r requirements/testing.txt
+botocore==1.16.5          # via -r requirements/testing.txt, boto3, s3transfer
+certifi==2020.4.5.1       # via -r requirements/testing.txt, requests
+chardet==3.0.4            # via -r requirements/testing.txt, requests
+click-log==0.3.2          # via -r requirements/testing.txt, edx-lint
+click==7.1.2              # via -r requirements/pip-tools.txt, -r requirements/testing.txt, click-log, edx-lint, pip-tools
+coverage==5.1             # via -r requirements/testing.txt, pytest-cov
+ddt==1.3.1                # via -c requirements/constraints.txt, -r requirements/testing.txt
+deprecated==1.2.9         # via -r requirements/testing.txt, pygithub
+distlib==0.3.0            # via -r requirements/ci.txt, virtualenv
+docutils==0.15.2          # via -r requirements/testing.txt, botocore
+edx-lint==1.4.1           # via -r requirements/testing.txt
+filelock==3.0.12          # via -r requirements/ci.txt, tox, virtualenv
+gitdb==4.0.5              # via -r requirements/testing.txt, gitpython
+gitpython==3.1.2          # via -r requirements/testing.txt
+httpretty==1.0.2          # via -r requirements/testing.txt
+idna==2.9                 # via -r requirements/testing.txt, requests
+importlib-metadata==1.6.0  # via -r requirements/ci.txt, -r requirements/testing.txt, importlib-resources, pluggy, pytest, tox, virtualenv
+importlib-resources==1.5.0  # via -r requirements/ci.txt, virtualenv
+isort==4.3.21             # via -r requirements/testing.txt, pylint
+jmespath==0.9.5           # via -r requirements/testing.txt, boto3, botocore
+lazy-object-proxy==1.4.3  # via -r requirements/testing.txt, astroid
+mccabe==0.6.1             # via -r requirements/testing.txt, pylint
+mock==3.0.5               # via -r requirements/testing.txt
+more-itertools==8.2.0     # via -r requirements/testing.txt, pytest
+packaging==20.3           # via -r requirements/ci.txt, -r requirements/testing.txt, pytest, tox
+pathlib2==2.3.5           # via -r requirements/testing.txt, pytest
+pip-tools==5.1.2          # via -r requirements/pip-tools.txt
+pluggy==0.13.1            # via -r requirements/ci.txt, -r requirements/testing.txt, pytest, tox
+py==1.8.1                 # via -r requirements/ci.txt, -r requirements/testing.txt, pytest, tox
+pycodestyle==2.5.0        # via -r requirements/testing.txt
+pygithub==1.51            # via -r requirements/testing.txt
+pyjwt==1.7.1              # via -r requirements/testing.txt, pygithub
+pylint-celery==0.3        # via -r requirements/testing.txt, edx-lint
+pylint-django==2.0.11     # via -r requirements/testing.txt, edx-lint
+pylint-plugin-utils==0.6  # via -r requirements/testing.txt, pylint-celery, pylint-django
+pylint==2.4.2             # via -r requirements/testing.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.7          # via -r requirements/ci.txt, -r requirements/testing.txt, packaging
+pytest-cov==2.8.1         # via -r requirements/testing.txt
+pytest==5.4.1             # via -r requirements/testing.txt, pytest-cov
+python-dateutil==2.8.1    # via -r requirements/testing.txt, botocore
+requests==2.23.0          # via -r requirements/testing.txt, pygithub
+s3transfer==0.3.3         # via -r requirements/testing.txt, boto3
+six==1.14.0               # via -r requirements/ci.txt, -r requirements/pip-tools.txt, -r requirements/testing.txt, astroid, edx-lint, mock, packaging, pathlib2, pip-tools, python-dateutil, tox, virtualenv
+smmap==3.0.4              # via -r requirements/testing.txt, gitdb
+testfixtures==6.14.1      # via -r requirements/testing.txt
+toml==0.10.0              # via -r requirements/ci.txt, tox
+tox-battery==0.5.2        # via -r requirements/ci.txt
+tox-travis==0.12          # via -r requirements/ci.txt
+tox==3.15.0               # via -r requirements/ci.txt, tox-battery, tox-travis
+typed-ast==1.4.1          # via -r requirements/testing.txt, astroid
+urllib3==1.25.9           # via -r requirements/testing.txt, botocore, requests
+virtualenv==20.0.20       # via -r requirements/ci.txt, tox
+wcwidth==0.1.9            # via -r requirements/testing.txt, pytest
+wrapt==1.11.2             # via -c requirements/constraints.txt, -r requirements/testing.txt, astroid, deprecated
+zipp==1.2.0               # via -r requirements/ci.txt, -r requirements/testing.txt, importlib-metadata, importlib-resources
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip

requirements/pip-tools.txt

@@ -4,6 +4,9 @@
 #
 #    make upgrade
 #
-click==7.0                # via pip-tools
-pip-tools==4.5.1
-six==1.13.0               # via pip-tools
+click==7.1.2              # via pip-tools
+pip-tools==5.1.2          # via -r requirements/pip-tools.in
+six==1.14.0               # via pip-tools
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip

requirements/testing.txt

@@ -4,60 +4,52 @@
 #
 #    make upgrade
 #
-astroid==1.6.6            # via pylint, pylint-celery
-atomicwrites==1.3.0       # via pytest
+astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via pytest
-backports.functools-lru-cache==1.6.1  # via astroid, isort, pylint
-boto3==1.10.18
-botocore==1.13.18
-certifi==2019.9.11
-chardet==3.0.4
+boto3==1.13.5             # via -r requirements/base.txt
+botocore==1.16.5          # via -r requirements/base.txt, boto3, s3transfer
+certifi==2020.4.5.1       # via -r requirements/base.txt, requests
+chardet==3.0.4            # via -r requirements/base.txt, requests
 click-log==0.3.2          # via edx-lint
-click==7.0
-configparser==4.0.2       # via importlib-metadata, pylint
-contextlib2==0.6.0.post1  # via importlib-metadata
-coverage==4.5.4
-ddt==1.2.1
-deprecated==1.2.7
-docutils==0.15.2
-edx-lint==1.4.1
-enum34==1.1.6             # via astroid
-funcsigs==1.0.2           # via mock, pytest
-futures==3.3.0 ; python_version == "2.7"
-gitdb2==2.0.6
-gitpython==2.1.14
-httpretty==0.9.7
-idna==2.8
-importlib-metadata==0.23  # via pluggy, pytest
+click==7.1.2              # via -r requirements/base.txt, click-log, edx-lint
+coverage==5.1             # via -r requirements/testing.in, pytest-cov
+ddt==1.3.1                # via -c requirements/constraints.txt, -r requirements/testing.in
+deprecated==1.2.9         # via -r requirements/base.txt, pygithub
+docutils==0.15.2          # via -r requirements/base.txt, botocore
+edx-lint==1.4.1           # via -r requirements/testing.in
+gitdb==4.0.5              # via -r requirements/base.txt, gitpython
+gitpython==3.1.2          # via -r requirements/base.txt
+httpretty==1.0.2          # via -r requirements/testing.in
+idna==2.9                 # via -r requirements/base.txt, requests
+importlib-metadata==1.6.0  # via pluggy, pytest
 isort==4.3.21             # via pylint
-jmespath==0.9.4
+jmespath==0.9.5           # via -r requirements/base.txt, boto3, botocore
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-mock==3.0.5
-more-itertools==5.0.0     # via pytest, zipp
-packaging==19.2           # via pytest
-pathlib2==2.3.5           # via importlib-metadata, pytest
-pluggy==0.13.0            # via pytest
-py==1.8.0                 # via pytest
-pycodestyle==2.5.0
-pygithub==1.44.1
-pyjwt==1.7.1
+mock==3.0.5               # via -r requirements/testing.in
+more-itertools==8.2.0     # via pytest
+packaging==20.3           # via pytest
+pathlib2==2.3.5           # via pytest
+pluggy==0.13.1            # via pytest
+py==1.8.1                 # via pytest
+pycodestyle==2.5.0        # via -r requirements/testing.in
+pygithub==1.51            # via -r requirements/base.txt
+pyjwt==1.7.1              # via -r requirements/base.txt, pygithub
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.11.1     # via edx-lint
+pylint-django==2.0.11     # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
-pylint==1.9.5             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.4.5          # via packaging
-pytest-cov==2.8.1
-pytest==4.6.6
-python-dateutil==2.8.0
-requests==2.22.0
-s3transfer==0.2.1
-scandir==1.10.0           # via pathlib2
-singledispatch==3.4.0.3   # via astroid, pylint
-six==1.13.0
-smmap2==2.0.5
-testfixtures==6.10.1
-urllib3==1.25.7
-wcwidth==0.1.7            # via pytest
-wrapt==1.11.2
-zipp==0.6.0               # via importlib-metadata
+pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.7          # via packaging
+pytest-cov==2.8.1         # via -r requirements/testing.in
+pytest==5.4.1             # via -r requirements/testing.in, pytest-cov
+python-dateutil==2.8.1    # via -r requirements/base.txt, botocore
+requests==2.23.0          # via -r requirements/base.txt, pygithub
+s3transfer==0.3.3         # via -r requirements/base.txt, boto3
+six==1.14.0               # via -r requirements/base.txt, astroid, edx-lint, mock, packaging, pathlib2, python-dateutil
+smmap==3.0.4              # via -r requirements/base.txt, gitdb
+testfixtures==6.14.1      # via -r requirements/testing.in
+typed-ast==1.4.1          # via astroid
+urllib3==1.25.9           # via -r requirements/base.txt, botocore, requests
+wcwidth==0.1.9            # via pytest
+wrapt==1.11.2             # via -c requirements/constraints.txt, -r requirements/base.txt, astroid, deprecated
+zipp==1.2.0               # via importlib-metadata

requirements/travis.txt

@@ -4,8 +4,8 @@
 #
 #    make upgrade
 #
-certifi==2019.9.11        # via requests
+certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
-idna==2.8                 # via requests
-requests==2.22.0
-urllib3==1.25.7           # via requests
+idna==2.9                 # via requests
+requests==2.23.0          # via -r requirements/travis.in
+urllib3==1.25.9           # via requests

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36}
+envlist = py{35,38}
 skipsdist=True
 
 [doc8]