From fc8f9a8c351aa1c540336e29f8245c381fba4d5e Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Sat, 27 Jul 2019 14:45:19 -0400 Subject: [PATCH] Linting for C0412 There are clashes between the positioning and ordering of our imports between pylint and isort, just ignoring them on the pylint side for now.. Signed-off-by: Corey Shields --- .pylintrc | 1 - db/base/tests.py | 3 ++- db/settings.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 3496951..2e141b7 100644 --- a/.pylintrc +++ b/.pylintrc @@ -5,6 +5,5 @@ ignored-argument-names=args|kwargs [MESSAGES CONTROL] disable= - C0412, R0801, # needs to remain disabled see https://github.com/PyCQA/pylint/issues/214 W0511, diff --git a/db/base/tests.py b/db/base/tests.py index 0684ab3..bfd593b 100644 --- a/db/base/tests.py +++ b/db/base/tests.py @@ -11,7 +11,8 @@ import pytest from django.contrib.auth.models import User from django.test import TestCase from django.utils.timezone import now -from factory import fuzzy +# C0412 below clashes with isort +from factory import fuzzy # pylint: disable=C0412 from db.base.models import DATA_SOURCES, DemodData, Mode, Satellite, \ Telemetry, Transmitter, TransmitterSuggestion diff --git a/db/settings.py b/db/settings.py index ac225e3..58b7c5c 100644 --- a/db/settings.py +++ b/db/settings.py @@ -10,7 +10,8 @@ from __future__ import absolute_import, division, print_function, \ import sentry_sdk from decouple import Csv, config from dj_database_url import parse as db_url -from sentry_sdk.integrations.django import DjangoIntegration +# C0412 below clashes with isort +from sentry_sdk.integrations.django import DjangoIntegration # pylint: disable=C0412 from unipath import Path ROOT = Path(__file__).parent