aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Hasan-Ahmad <[email protected]>2018-10-27 17:08:24 +0100
committerGravatar Hasan-Ahmad <[email protected]>2018-10-27 17:08:24 +0100
commit5365572e47625a8a8880921450cd1fb572940221 (patch)
tree79ad8003ef8d6a6d430fa4c90d52d1f0c1988bf4
parenttrailing comma extermination (diff)
parentDrop extra whitespace. (diff)
Merge branch 'special_snakes' of https://gitlab.com/python-discord/projects/site into special_snakes
-rw-r--r--.flake81
-rw-r--r--api/tests/base.py2
-rw-r--r--pysite/hosts.py6
3 files changed, 5 insertions, 4 deletions
diff --git a/.flake8 b/.flake8
index 7c2490f8..2f0a95fb 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,6 @@
[flake8]
max-line-length=100
+ignore=S106
application_import_names=admin,api,home,pysite,wiki
exclude=__pycache__, venv, .venv, **/migrations
import-order-style=pycharm
diff --git a/api/tests/base.py b/api/tests/base.py
index 395dc55c..5d8ccf8c 100644
--- a/api/tests/base.py
+++ b/api/tests/base.py
@@ -5,7 +5,7 @@ from rest_framework.test import APITestCase
test_user, _created = User.objects.get_or_create(
username='test',
- password='testpass', # flake8: noqa - S106
+ password='testpass', # noqa: S106
is_superuser=True,
is_staff=True
)
diff --git a/pysite/hosts.py b/pysite/hosts.py
index 3cf41e7f..9d4c1ce9 100644
--- a/pysite/hosts.py
+++ b/pysite/hosts.py
@@ -4,10 +4,10 @@ from django_hosts import host, patterns
host_patterns = patterns(
'',
# > | Subdomain | URL Module | Host entry name |
- host(r'admin', 'admin.urls', name="admin"),
- host(r'api', 'api.urls', name='api'),
+ host(r'admin', 'admin.urls', name="admin"),
+ host(r'api', 'api.urls', name='api'),
# host(r"staff", "staff", name="staff"),
# host(r"wiki", "wiki", name="wiki"),
# host(r"ws", "ws", name="ws"),
- host(r'.*', 'home.urls', name=settings.DEFAULT_HOST)
+ host(r'.*', 'home.urls', name=settings.DEFAULT_HOST)
)