Merge pull request #43 from edx/awais786/BOM-1018

BOM-1018

Author: awais786

.travis.yml

@@ -1,17 +1,58 @@
 language: python
 python:
   - 2.7
+  - 3.5
   - 3.6
 env:
 - TOXENV=django111-drf37
 - TOXENV=django111-drf38
 - TOXENV=django111-drf39
 - TOXENV=django111-drflatest
+- TOXENV=django20-drf37
+- TOXENV=django20-drf38
+- TOXENV=django20-drf39
+- TOXENV=django20-drflatest
+- TOXENV=django21-drf37
+- TOXENV=django21-drf38
+- TOXENV=django21-drf39
+- TOXENV=django21-drflatest
+- TOXENV=django22-drf37
+- TOXENV=django22-drf38
+- TOXENV=django22-drf39
+- TOXENV=django22-drflatest
+
 matrix:
+  exclude:
+    - python: 2.7
+      env: TOXENV=django20-drf37
+    - python: 2.7
+      env: TOXENV=django20-drf38
+    - python: 2.7
+      env: TOXENV=django20-drf39
+    - python: 2.7
+      env: TOXENV=django20-drflatest
+    - python: 2.7
+      env: TOXENV=django21-drf37
+    - python: 2.7
+      env: TOXENV=django21-drf38
+    - python: 2.7
+      env: TOXENV=django21-drf39
+    - python: 2.7
+      env: TOXENV=django21-drflatest
+    - python: 2.7
+      env: TOXENV=django22-drf37
+    - python: 2.7
+      env: TOXENV=django22-drf38
+    - python: 2.7
+      env: TOXENV=django22-drf39
+    - python: 2.7
+      env: TOXENV=django22-drflatest
+
+
   include:
-  - python: 3.6
+  - python: 3.5
     env: TOXENV=quality
-  - python: 3.6
+  - python: 3.5
     env: TOXENV=docs
   - python: 2.7
     env: TOXENV=quality

config_models/__init__.py

@@ -4,6 +4,6 @@
 
 from __future__ import absolute_import, unicode_literals
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 default_app_config = 'config_models.apps.ConfigModelsConfig'  # pylint: disable=invalid-name

config_models/admin.py

@@ -8,7 +8,7 @@
 from django.contrib.admin import ListFilter
 from django.core.cache import caches, InvalidCacheBackendError
 from django.core.files.base import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
@@ -92,7 +92,7 @@ def revert(self, request, queryset):
         """
         if queryset.count() != 1:
             self.message_user(request, _("Please select a single configuration to revert to."))
-            return
+            return None
 
         target = queryset[0]
         target.id = None

config_models/models.py

@@ -146,7 +146,7 @@ def current(cls, *args):
 
         key_dict = dict(zip(cls.KEY_FIELDS, args))
         try:
-            current = cls.objects.filter(**key_dict).order_by('-change_date')[0]
+            current = cls.objects.filter(**key_dict).order_by('-change_date')[0]  # pylint: disable=no-member
         except IndexError:
             current = cls(**key_dict)
 

config_models/templatetags.py

@@ -26,5 +26,5 @@ def submit_row(context):
             'show_save_and_continue': False,
             'show_save': False,
         })
-    else:
-        return ctx
+
+    return ctx

config_models/tests/test_admin.py

@@ -0,0 +1,34 @@
+"""
+ConfigurationModel Admin Module Test Cases
+"""
+
+from __future__ import unicode_literals
+
+from django.contrib.admin.sites import AdminSite
+from django.contrib.messages.storage.fallback import FallbackStorage
+from django.http import HttpRequest
+from django.test import TestCase
+
+from config_models.admin import ConfigurationModelAdmin
+from config_models.models import ConfigurationModel
+
+
+class AdminTestCase(TestCase):
+    """
+    Test Case module for ConfigurationModel Admin
+    """
+    def setUp(self):
+        super(AdminTestCase, self).setUp()
+        self.request = HttpRequest()
+        self.conf_admin = ConfigurationModelAdmin(ConfigurationModel, AdminSite())
+        self.request.session = 'session'
+        self.request._messages = FallbackStorage(self.request)  # pylint: disable=protected-access
+
+    def test_default_fields(self):
+        """
+        Test: checking fields
+        """
+        self.assertEqual(
+            list(self.conf_admin.get_form(self.request).base_fields),
+            ['enabled']
+        )

config_models/tests/test_config_models.py

@@ -214,7 +214,7 @@ class ExampleKeyedConfig(ConfigurationModel):
 
     left = models.CharField(max_length=30)
     right = models.CharField(max_length=30)
-    user = models.ForeignKey('auth.User')
+    user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
 
     string_field = models.TextField()
     int_field = models.IntegerField(default=10)

config_models/tests/test_decorators.py

@@ -2,13 +2,12 @@
 Tests for config models decorators
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+from django.utils import six
 
 from config_models import decorators
 from config_models.models import ConfigurationModel
 from config_models.tests.utils import CacheIsolationTestCase
-from django.utils import six
-
 
 # pylint: disable=model-missing-unicode
 @six.python_2_unicode_compatible

requirements/base.txt

@@ -4,6 +4,6 @@
 #
 #    make upgrade
 #
-django==1.11.22
+django==1.11.26
 djangorestframework==3.9.4
-pytz==2019.1              # via django
+pytz==2019.3              # via django

requirements/dev.txt

@@ -5,73 +5,71 @@
 #    make upgrade
 #
 argparse==1.4.0
-astroid==1.5.3
+astroid==1.6.6
 atomicwrites==1.3.0
-attrs==19.1.0
-backports.functools-lru-cache==1.5
-backports.os==0.1.1       # via path.py
-caniusepython3==7.1.0
-certifi==2019.6.16
+attrs==19.3.0
+backports.functools-lru-cache==1.6.1
+caniusepython3==7.2.0
+certifi==2019.9.11
 chardet==3.0.4
 click-log==0.3.2
 click==7.0
 codecov==2.0.15
-configparser==3.7.4
-contextlib2==0.5.5
-coverage==4.5.3
+configparser==4.0.2
+contextlib2==0.6.0.post1
+coverage==4.5.4
 ddt==1.2.1
-distlib==0.2.9.post0
-django==1.11.22
+distlib==0.3.0
+django==1.11.26
 djangorestframework==3.9.4
 edx-i18n-tools==0.4.8
-edx-lint==1.3.0
+edx-lint==1.4.1
 enum34==1.1.6
 filelock==3.0.12
 freezegun==0.3.12
 funcsigs==1.0.2
-future==0.17.1            # via backports.os
 futures==3.2.0 ; python_version == "2.7"
 idna==2.8
-importlib-metadata==0.18
+importlib-metadata==0.23
 isort==4.3.21
-lazy-object-proxy==1.4.1
+lazy-object-proxy==1.4.3
 mccabe==0.6.1
 mock==3.0.5
 more-itertools==5.0.0
-packaging==19.0
+packaging==19.2
 path.py==11.5.2           # via edx-i18n-tools
-pathlib2==2.3.4
-pip-tools==3.8.0
-pluggy==0.12.0
+pathlib2==2.3.5
+pip-tools==4.2.0
+pluggy==0.13.0
 polib==1.1.0              # via edx-i18n-tools
 py==1.8.0
 pycodestyle==2.5.0
 pydocstyle==3.0.0
 pylint-celery==0.3
-pylint-django==0.7.2
-pylint-plugin-utils==0.5
-pylint==1.7.6
-pyparsing==2.4.0
-pytest-cov==2.7.1
-pytest-django==3.5.1
-pytest==4.6.4
-python-dateutil==2.8.0
-pytz==2019.1
-pyyaml==5.1.1             # via edx-i18n-tools
+pylint-django==0.11.1
+pylint-plugin-utils==0.6
+pylint==1.9.5
+pyparsing==2.4.4
+pytest-cov==2.8.1
+pytest-django==3.6.0
+pytest==4.6.6
+python-dateutil==2.8.1
+pytz==2019.3
+pyyaml==5.1.2             # via edx-i18n-tools
 requests==2.22.0
 scandir==1.10.0
 singledispatch==3.4.0.3
-six==1.12.0
-snowballstemmer==1.9.0
+six==1.13.0
+snowballstemmer==2.0.0
 toml==0.10.0
 tox-battery==0.5.1
 tox-travis==0.12
-tox==3.13.2
-urllib3==1.25.3
-virtualenv==16.6.1
+tox==3.14.0
+urllib3==1.25.6
+virtualenv==16.7.7
 wcwidth==0.1.7
 wrapt==1.11.2
-zipp==0.5.1
+zipp==0.6.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1        # via caniusepython3
+# setuptools==41.6.0        # via caniusepython3