From 1d43c7182989b605f17a2e8fc8ab4eb3c91ca6b6 Mon Sep 17 00:00:00 2001 From: Andrews Medina Date: Sun, 13 Nov 2016 03:47:08 -0200 Subject: [PATCH] Fix tests (#448) * tox: disable development mode * fix django-extra-views and djangorestframework versions * using get_field instead get_field_by_name to fix compatibility with Django 1.10 * travis: dont test Django 1.10 with Python 3.3 --- .travis.yml | 2 ++ djadmin2/templatetags/admin2_tags.py | 2 +- djadmin2/tests/test_renderers.py | 2 +- djadmin2/utils.py | 2 +- docs/ref/meta.rst | 5 +---- requirements.txt | 4 ++-- setup.py | 6 +++--- tox.ini | 2 -- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5a79e6..cf0a661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ matrix: exclude: - python: '3.3' env: DJANGO=1.9 + - python: '3.3' + env: DJANGO=1.10 - python: '3.3' env: DJANGO=master allow_failures: diff --git a/djadmin2/templatetags/admin2_tags.py b/djadmin2/templatetags/admin2_tags.py index 8fb3f36..7625ed7 100644 --- a/djadmin2/templatetags/admin2_tags.py +++ b/djadmin2/templatetags/admin2_tags.py @@ -138,7 +138,7 @@ def render(context, model_instance, attribute_name): # Apply renderer and return value try: - field = model_instance._meta.get_field_by_name(attribute_name)[0] + field = model_instance._meta.get_field(attribute_name) except FieldDoesNotExist: # There is no field with the specified name. # It must be a method instead. diff --git a/djadmin2/tests/test_renderers.py b/djadmin2/tests/test_renderers.py index fdecc96..3e53b20 100644 --- a/djadmin2/tests/test_renderers.py +++ b/djadmin2/tests/test_renderers.py @@ -117,6 +117,6 @@ class NumberRendererTest(TestCase): self.assertEqual(number, out) def testFieldDecimal(self): - field = RendererTestModel._meta.get_field_by_name('decimal')[0] + field = RendererTestModel._meta.get_field('decimal') out = self.renderer(Decimal('0.123456789'), field) self.assertEqual('0.12345', out) diff --git a/djadmin2/utils.py b/djadmin2/utils.py index a831864..40a50db 100644 --- a/djadmin2/utils.py +++ b/djadmin2/utils.py @@ -73,7 +73,7 @@ def model_field_verbose_name(model, field_name): Returns the verbose name of a model field. """ meta = model_options(model) - field = meta.get_field_by_name(field_name)[0] + field = meta.get_field(field_name) return field.verbose_name diff --git a/docs/ref/meta.rst b/docs/ref/meta.rst index 926c8fd..e48cba3 100644 --- a/docs/ref/meta.rst +++ b/docs/ref/meta.rst @@ -149,7 +149,7 @@ Attributes ``admin`` Is ``None``. Doesn't seem to be used anywhere. So we don't need to document it. - + TODO: Create a django ticket to suggest removing it. ``auto_created`` @@ -251,9 +251,6 @@ Methods ``get_field(self, name, many_to_many=True)`` TODO ... -``get_field_by_name(self, name)`` - TODO ... - ``get_all_field_names(self)`` TODO ... diff --git a/requirements.txt b/requirements.txt index 86ae9a2..7c9be15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -django-extra-views>=0.8.0 +django-extra-views<=0.7.1 django-braces>=1.3.0 -djangorestframework>=3.5.3 +djangorestframework<=3.3.3 django-filter>=0.15.3 django-debug-toolbar>=1.5 future>=0.15.2 diff --git a/setup.py b/setup.py index 000d2b5..f74ee11 100644 --- a/setup.py +++ b/setup.py @@ -128,10 +128,10 @@ setup( #test_suite='runtests.runtests', install_requires=[ 'django>=1.8.0', - 'django-extra-views>=0.6.5', + 'django-extra-views<=0.7.1', 'django-braces>=1.3.0', - 'djangorestframework>=3.3.3', - 'django-filter>=0.13.0', + 'djangorestframework<=3.3.3', + 'django-filter>=0.15.3', 'pytz==2016.4', 'future>=0.15.2', ], diff --git a/tox.ini b/tox.ini index 6511148..eca4d89 100644 --- a/tox.ini +++ b/tox.ini @@ -21,8 +21,6 @@ deps = 1.9: Django>=1.9,<1.10 1.10: Django>=1.10,<1.11 master: https://github.com/django/django/tarball/master -usedevelop = True setenv= DJANGO_SETTINGS_MODULE = example.settings PYTHONPATH = {toxinidir}/example:{toxinidir} -