Merge pull request #5626 from rpkilby/update-reqs

Update test requirements

.isort.cfg

@@ -3,5 +3,5 @@ skip=.tox
 atomic=true
 multi_line_output=5
 known_standard_library=types
-known_third_party=pytest,django
+known_third_party=pytest,_pytest,django
 known_first_party=rest_framework

requirements/requirements-codestyle.txt

@@ -1,7 +1,7 @@
 # PEP8 code linting, which we run on all commits.
-flake8==3.4.1
+flake8==3.5.0
 flake8-tidy-imports==1.1.0
-pep8==1.7.0
+pycodestyle==2.3.1
 
 # Sort and lint imports
-isort==4.2.5
+isort==4.2.15

requirements/requirements-optionals.txt

@@ -2,6 +2,6 @@
 pytz==2017.2
 markdown==2.6.4
 django-guardian==1.4.9
-django-filter==1.0.4
+django-filter==1.1.0
 coreapi==2.3.1
 coreschema==0.0.4

requirements/requirements-testing.txt

@@ -1,4 +1,4 @@
 # PyTest for running the tests.
-pytest==3.2.2
+pytest==3.2.5
 pytest-django==3.1.2
 pytest-cov==2.5.1

rest_framework/schemas/inspectors.py

@@ -260,7 +260,7 @@ class AutoSchema(ViewInspector):
                 # Attempt to infer a field description if possible.
                 try:
                     model_field = model._meta.get_field(variable)
-                except:
+                except Exception:
                     model_field = None
 
                 if model_field is not None and model_field.verbose_name:

rest_framework/templatetags/rest_framework.py

@@ -10,6 +10,7 @@ from django.utils import six
 from django.utils.encoding import force_text, iri_to_uri
 from django.utils.html import escape, format_html, smart_urlquote
 from django.utils.safestring import SafeData, mark_safe
+
 from rest_framework.compat import apply_markdown, pygments_highlight
 from rest_framework.renderers import HTMLFormRenderer
 from rest_framework.utils.urls import replace_query_param

rest_framework/utils/encoders.py

@@ -61,7 +61,7 @@ class JSONEncoder(json.JSONEncoder):
         elif hasattr(obj, '__getitem__'):
             try:
                 return dict(obj)
-            except:
+            except Exception:
                 pass
         elif hasattr(obj, '__iter__'):
             return tuple(item for item in obj)

rest_framework/validators.py

@@ -19,7 +19,6 @@ from rest_framework.utils.representation import smart_repr
 # Robust filter and exist implementations. Ensures that queryset.exists() for
 # an invalid value returns `False`, rather than raising an error.
 # Refs https://github.com/encode/django-rest-framework/issues/3381
-
 def qs_exists(queryset):
     try:
         return queryset.exists()

tests/importable/test_installed.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+
 from tests import importable
 
 

tests/test_description.py

@@ -33,9 +33,9 @@ indented
 }]
 ```"""
 
+
 # If markdown is installed we also test it's working
 # (and that our wrapped forces '=' to h2 and '-' to h3)
-
 MARKED_DOWN_HILITE = """
 <div class="highlight"><pre><span></span><span \
 class="p">[{</span><br />    <span class="nt">&quot;alpha&quot;</span><span\

tests/test_one_to_one_with_inheritance.py

@@ -10,7 +10,6 @@ from tests.test_multitable_inheritance import ChildModel
 
 
 # Regression test for #4290
-
 class ChildAssociatedModel(RESTFrameworkModel):
     child_model = models.OneToOneField(ChildModel, on_delete=models.CASCADE)
     child_name = models.CharField(max_length=100)