Added support for python 3.5 and 3.8

openedx-unsupported · Jun 5, 2020 · 0c1b9b5 · 0c1b9b5
1 parent 58ae041
commit 0c1b9b5
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,10 @@
 
 language: python
 
-python:
-  - 3.5
-  - 3.8
-
 matrix:
   include:
+    - python: 2.7
+      env: TOXENV=py27
     - python: 3.5
       env: TOXENV=py35
     - python: 3.8
@@ -19,5 +17,8 @@ cache:
 before_install:
   - pip install --upgrade pip
 
+install:
+  - pip install -r requirements/tox.txt
+
 script:
   - tox
diff --git a/Makefile b/Makefile
@@ -13,3 +13,4 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade -o requirements/test.txt requirements/test.in
 	pip-compile --upgrade -o requirements/github.txt requirements/github.in
+	pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,18 +4,21 @@
 #
 #    make upgrade
 #
-awscli==1.18.72           # via -r requirements/base.in
-botocore==1.16.22         # via awscli, s3transfer
+awscli==1.18.73           # via -r requirements/base.in
+botocore==1.16.23         # via awscli, s3transfer
 colorama==0.4.3           # via awscli
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.6.0.post1  # via importlib-metadata, zipp
 docopt==0.6.2             # via -r requirements/base.in
 docutils==0.15.2          # via awscli, botocore
 edx-ccx-keys==1.1.0       # via -r requirements/base.in
 edx-opaque-keys==2.1.0    # via -r requirements/base.in, edx-ccx-keys
+futures==3.3.0            # via s3transfer
 graphitesend==0.10.0      # via -r requirements/base.in
-importlib-metadata==1.6.0  # via path
+importlib-metadata==1.6.0  # via path.py
 jmespath==0.10.0          # via botocore
-path.py==12.4.0           # via -r requirements/base.in
-path==13.1.0              # via path.py
+path.py==11.5.2           # via -r requirements/base.in
+pathlib2==2.3.5           # via importlib-metadata
 pbr==5.4.5                # via -r requirements/base.in, stevedore
 psutil==5.7.0             # via -r requirements/base.in
 pyasn1==0.4.8             # via rsa
@@ -25,7 +28,8 @@ python-gnupg==0.4.6       # via -r requirements/base.in
 pyyaml==5.3.1             # via -r requirements/base.in, awscli
 rsa==3.4.2                # via awscli
 s3transfer==0.3.3         # via awscli
-six==1.15.0               # via edx-ccx-keys, edx-opaque-keys, python-dateutil, stevedore
+scandir==1.10.0           # via pathlib2
+six==1.15.0               # via edx-ccx-keys, edx-opaque-keys, pathlib2, python-dateutil, stevedore
 stevedore==1.32.0         # via edx-opaque-keys
 urllib3==1.25.9           # via botocore
 zipp==1.2.0               # via importlib-metadata

diff --git a/requirements/test.in b/requirements/test.in
@@ -8,4 +8,3 @@ mock
 pytest
 pytest-cov
 setuptools
-tox
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,51 +4,50 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via virtualenv
+atomicwrites==1.4.0       # via pytest
 attrs==19.3.0             # via pytest
-awscli==1.18.72           # via -r requirements/base.txt
-botocore==1.16.22         # via -r requirements/base.txt, awscli, s3transfer
+awscli==1.18.73           # via -r requirements/base.txt
+backports.functools-lru-cache==1.6.1  # via wcwidth
+botocore==1.16.23         # via -r requirements/base.txt, awscli, s3transfer
 colorama==0.4.3           # via -r requirements/base.txt, awscli
+configparser==4.0.2       # via -r requirements/base.txt, importlib-metadata
+contextlib2==0.6.0.post1  # via -r requirements/base.txt, importlib-metadata, zipp
 coverage==5.1             # via -r requirements/test.in, pytest-cov
-distlib==0.3.0            # via virtualenv
 docopt==0.6.2             # via -r requirements/base.txt
 docutils==0.15.2          # via -r requirements/base.txt, awscli, botocore
 edx-ccx-keys==1.1.0       # via -r requirements/base.txt
 edx-opaque-keys==2.1.0    # via -r requirements/base.txt, edx-ccx-keys
-filelock==3.0.12          # via tox, virtualenv
+funcsigs==1.0.2           # via mock, pytest
+futures==3.3.0            # via -r requirements/base.txt, s3transfer
 graphitesend==0.10.0      # via -r requirements/base.txt
-importlib-metadata==1.6.0  # via -r requirements/base.txt, importlib-resources, path, pluggy, pytest, tox, virtualenv
-importlib-resources==1.5.0  # via virtualenv
+importlib-metadata==1.6.0  # via -r requirements/base.txt, path.py, pluggy, pytest
 jmespath==0.10.0          # via -r requirements/base.txt, botocore
 mock==3.0.5               # via -r requirements/test.in
-more-itertools==8.3.0     # via pytest
+more-itertools==5.0.0     # via pytest
 http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.2.2.zip  # via -r requirements/github.txt
-packaging==20.4           # via pytest, tox
-path.py==12.4.0           # via -r requirements/base.txt
-path==13.1.0              # via -r requirements/base.txt, path.py
-pathlib2==2.3.5           # via pytest
+packaging==20.4           # via pytest
+path.py==11.5.2           # via -r requirements/base.txt
+pathlib2==2.3.5           # via -r requirements/base.txt, importlib-metadata, pytest
 pbr==5.4.5                # via -r requirements/base.txt, stevedore
-pluggy==0.13.1            # via pytest, tox
+pluggy==0.13.1            # via pytest
 psutil==5.7.0             # via -r requirements/base.txt
-py==1.8.1                 # via pytest, tox
+py==1.8.1                 # via pytest
 pyasn1==0.4.8             # via -r requirements/base.txt, rsa
 pymongo==3.10.1           # via -r requirements/base.txt, edx-opaque-keys
 pyparsing==2.4.7          # via packaging
 pytest-cov==2.9.0         # via -r requirements/test.in
-pytest==5.4.3             # via -r requirements/test.in, pytest-cov
+pytest==4.6.11            # via -r requirements/test.in, pytest-cov
 python-dateutil==2.8.1    # via -r requirements/base.txt, botocore
 python-gnupg==0.4.6       # via -r requirements/base.txt
 pyyaml==5.3.1             # via -r requirements/base.txt, awscli
 rsa==3.4.2                # via -r requirements/base.txt, awscli
 s3transfer==0.3.3         # via -r requirements/base.txt, awscli
-six==1.15.0               # via -r requirements/base.txt, edx-ccx-keys, edx-opaque-keys, mock, packaging, pathlib2, python-dateutil, stevedore, tox, virtualenv
+scandir==1.10.0           # via -r requirements/base.txt, pathlib2
+six==1.15.0               # via -r requirements/base.txt, edx-ccx-keys, edx-opaque-keys, mock, more-itertools, packaging, pathlib2, pytest, python-dateutil, stevedore
 stevedore==1.32.0         # via -r requirements/base.txt, edx-opaque-keys
-toml==0.10.1              # via tox
-tox==3.15.1               # via -r requirements/test.in
 urllib3==1.25.9           # via -r requirements/base.txt, botocore
-virtualenv==20.0.21       # via tox
 wcwidth==0.2.3            # via pytest
-zipp==1.2.0               # via -r requirements/base.txt, importlib-metadata, importlib-resources
+zipp==1.2.0               # via -r requirements/base.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/tox.in b/requirements/tox.in
@@ -0,0 +1,3 @@
+-c constraints.txt
+
+tox
diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -0,0 +1,26 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    make upgrade
+#
+appdirs==1.4.4            # via virtualenv
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.6.0.post1  # via importlib-metadata, importlib-resources, virtualenv, zipp
+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.4           # via tox
+pathlib2==2.3.5           # via importlib-metadata, importlib-resources, virtualenv
+pluggy==0.13.1            # via tox
+py==1.8.1                 # via tox
+pyparsing==2.4.7          # via packaging
+scandir==1.10.0           # via pathlib2
+singledispatch==3.4.0.3   # via importlib-resources
+six==1.15.0               # via packaging, pathlib2, tox, virtualenv
+toml==0.10.1              # via tox
+tox==3.15.1               # via -r requirements/tox.in
+typing==3.7.4.1           # via importlib-resources
+virtualenv==20.0.21       # via tox
+zipp==1.2.0               # via importlib-metadata, importlib-resources
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py38
+envlist = py27,py35,py38
 
 
 [testenv]