Merge cca71e6 into 2c4ecfd

openedx · Dec 9, 2019 · 792d06a · 792d06a
2 parents 2c4ecfd + cca71e6
commit 792d06a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -7,7 +7,7 @@
 certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 django-model-utils==3.2.0
-django-simple-history==2.7.3
+django-simple-history==2.8.0
 django-waffle==0.18.0     # via edx-django-utils, edx-drf-extensions
 django==1.11.26
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -16,7 +16,7 @@ coverage==4.5.4
 ddt==1.1.0
 django-model-utils==3.2.0
 django-nose==1.4.6
-django-simple-history==2.7.3
+django-simple-history==2.8.0
 django-waffle==0.18.0
 djangorestframework-jwt==1.11.0
 djangorestframework-oauth==1.1.0
@@ -27,13 +27,13 @@ edx-lint==0.6.0
 edx-opaque-keys==2.0.1
 enum34==1.1.6             # via astroid
 factory-boy==2.12.0
-faker==2.0.4              # via factory-boy
+faker==3.0.0              # via factory-boy
 filelock==3.0.12          # via tox
 future==0.18.2
 futures==3.3.0 ; python_version == "2.7"  # via isort
 httpretty==0.9.7
 idna==2.8
-importlib-metadata==0.23  # via pluggy, tox
+importlib-metadata==1.2.0  # via pluggy, tox
 ipaddress==1.0.23         # via faker
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
@@ -70,7 +70,7 @@ six==1.13.0
 stevedore==1.31.0
 text-unidecode==1.3       # via faker
 toml==0.10.0              # via tox
-tox==3.14.1
+tox==3.14.2
 urllib3==1.25.7
 virtualenv==16.7.8        # via tox
 wrapt==1.11.2             # via astroid

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36}-django111-drf{36,37,38,39,latest}, py36-django{20,21}-drf{latest}, quality
+envlist = py{27,36}-django111-drf{37,38,39,latest}, py36-django{20,21}-drf{latest}, quality
 
 [testenv]
 setenv =
@@ -10,7 +10,6 @@ deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
-    drf36: djangorestframework<3.7
     drf37: djangorestframework<3.8
     drf38: djangorestframework<3.9
     drf39: djangorestframework<4.0
@@ -22,6 +21,10 @@ commands =
     coverage report
 
 [testenv:quality]
+deps =
+    Django>=1.11,<2.0
+    djangorestframework<3.8
+    -rtest-requirements.txt
 commands =
     pep8 --config=.pep8 organizations
     pylint --rcfile=pylintrc organizations