Merge pull request #1 from edx/zulqarnain/BOM-1447

BOM-1447: Upgrade to Django 2.2
openedx · Apr 2, 2020 · c1cc11f · c1cc11f
2 parents 93624bd + 4dd9a5e
commit c1cc11f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: python
 cache: pip
 python:
-    - '2.7'
+    - '3.5'
 before_install:
     - 'uname -a'
     - 'python --version'
@@ -18,7 +18,10 @@ branches:
     only:
       - 'master'
 env:
-    - TOXENV=py27-dj18
-    - TOXENV=coveralls
+    - TOXENV=py35-django111
+    - TOXENV=py35-django20
+    - TOXENV=py35-django21
+    - TOXENV=py35-django22
+    - TOXENV=coverage
     - TOXENV=pep8
     - TOXENV=pylint
diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@ def run_tests(self):
         'invideoquiz',
     ],
     install_requires=[
-        'django >= 1.8',
+        'django<3.0',
         'django_nose',
         'mock',
         'coverage',

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,17 @@
 
 [tox]
 downloadcache = {toxworkdir}/_download/
-envlist = py27-dj18,coverage,pep8,pylint
+envlist = {py35}-django{111,20,21,22},coverage,pep8,pylint
 
 [testenv]
-commands = {envpython} manage.py test
-
-[testenv:py27-dj18]
-deps =
+deps:
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     -rrequirements.txt
+commands =
+    python manage.py test
 
 [testenv:pep8]
 deps =
@@ -32,14 +35,3 @@ setenv =
 commands =
     {envpython} manage.py test
 
-[testenv:coveralls]
-deps =
-    -rrequirements.txt
-    coveralls
-setenv =
-    NOSE_COVER_TESTS=1
-    NOSE_WITH_COVERAGE=1
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
-commands =
-    {envbindir}/coverage run --source=invideoquiz manage.py test
-    {envbindir}/coveralls