Skip to content

Commit 00fb5dc

Browse files
slivercn2ygk
authored andcommitted
Adjust to new flake8 3.6.0 version (#501)
1 parent d0debda commit 00fb5dc

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

‎requirements-development.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ django-filter>=2.0
44
django-polymorphic>=2.0
55
factory-boy
66
Faker
7-
flake8
7+
flake8==3.6.0
88
flake8-isort
99
isort
1010
mock

‎rest_framework_json_api/relations.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,12 @@ def get_links(self, obj=None, lookup_field='pk'):
116116
})
117117
self_link = self.get_url('self', self.self_link_view_name, self_kwargs, request)
118118

119-
"""
120-
Assuming RelatedField will be declared in two ways:
121-
1. url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
122-
AuthorViewSet.as_view({'get': 'retrieve_related'}))
123-
2. url(r'^authors/(?P<author_pk>[^/.]+)/bio/$',
124-
AuthorBioViewSet.as_view({'get': 'retrieve'}))
125-
So, if related_link_url_kwarg == 'pk' it will add 'related_field' parameter to reverse()
126-
"""
119+
# Assuming RelatedField will be declared in two ways:
120+
# 1. url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
121+
# AuthorViewSet.as_view({'get': 'retrieve_related'}))
122+
# 2. url(r'^authors/(?P<author_pk>[^/.]+)/bio/$',
123+
# AuthorBioViewSet.as_view({'get': 'retrieve'}))
124+
# So, if related_link_url_kwarg == 'pk' it will add 'related_field' parameter to reverse()
127125
if self.related_link_url_kwarg == 'pk':
128126
related_kwargs = self_kwargs
129127
else:

‎setup.cfg

+9-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ test = pytest
55
universal = 1
66

77
[flake8]
8-
ignore = F405
8+
ignore = F405,W504
99
max-line-length = 100
1010
exclude =
11-
docs/conf.py,
1211
build,
12+
docs/conf.py,
1313
migrations,
14+
.eggs
1415
.tox,
1516

1617
[isort]
@@ -21,7 +22,12 @@ known_localfolder = example
2122
known_standard_library = mock
2223
line_length = 100
2324
multi_line_output = 3
24-
skip=migrations,.tox,docs/conf.py
25+
skip=
26+
build,
27+
docs/conf.py,
28+
migrations,
29+
.eggs
30+
.tox,
2531

2632
[coverage:report]
2733
omit=

0 commit comments

Comments
 (0)