Skip to content
This repository has been archived by the owner on Jul 9, 2020. It is now read-only.

Commit

Permalink
[qa] Reconfigured isort
Browse files Browse the repository at this point in the history
  • Loading branch information
nemesifier committed Jul 5, 2017
1 parent a6847b5 commit bd3ab20
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 13 deletions.
3 changes: 1 addition & 2 deletions django_netjsonconfig/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.contrib import admin

from .base.admin import (AbstractConfigForm, AbstractConfigInline,
AbstractDeviceAdmin, AbstractTemplateAdmin,
from .base.admin import (AbstractConfigForm, AbstractConfigInline, AbstractDeviceAdmin, AbstractTemplateAdmin,
AbstractVpnAdmin, AbstractVpnForm, BaseForm)
from .models import Config, Device, Template, Vpn

Expand Down
3 changes: 1 addition & 2 deletions django_netjsonconfig/controller/generics.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
from django.views.generic.detail import SingleObjectMixin

from .. import settings
from ..utils import (ControllerResponse, forbid_unallowed, get_object_or_404,
send_config, update_last_ip)
from ..utils import ControllerResponse, forbid_unallowed, get_object_or_404, send_config, update_last_ip


class BaseConfigView(SingleObjectMixin, View):
Expand Down
3 changes: 1 addition & 2 deletions django_netjsonconfig/controller/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from ..models import Device
from .generics import (BaseChecksumView, BaseDownloadConfigView,
BaseRegisterView, BaseReportStatusView)
from .generics import BaseChecksumView, BaseDownloadConfigView, BaseRegisterView, BaseReportStatusView


class ChecksumView(BaseChecksumView):
Expand Down
1 change: 0 additions & 1 deletion django_netjsonconfig/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from django.contrib.auth.models import User
from django.test import TestCase
from django.urls import reverse

from django_x509.models import Ca

from . import CreateConfigMixin, TestVpnX509Mixin
Expand Down
2 changes: 1 addition & 1 deletion django_netjsonconfig/tests/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from django.core.exceptions import ValidationError
from django.db.transaction import atomic
from django.test import TestCase

from django_x509.models import Ca

from netjsonconfig import OpenWrt

from . import CreateConfigMixin, CreateTemplateMixin, TestVpnX509Mixin
Expand Down
2 changes: 1 addition & 1 deletion django_netjsonconfig/tests/test_template.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.conf import settings
from django.core.exceptions import ValidationError
from django.test import TestCase

from django_x509.models import Ca

from netjsonconfig import OpenWrt

from . import CreateConfigMixin, CreateTemplateMixin, TestVpnX509Mixin
Expand Down
1 change: 0 additions & 1 deletion django_netjsonconfig/tests/test_vpn.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.core.exceptions import ValidationError
from django.test import TestCase

from django_x509.models import Ca, Cert

from . import CreateConfigMixin, CreateTemplateMixin, TestVpnX509Mixin
Expand Down
2 changes: 1 addition & 1 deletion runisort
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
set -e
isort --check-only --recursive --diff --skip migrations || exit 1
isort --check-only --recursive --diff || exit 1
7 changes: 7 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
[bdist_wheel]
universal=1

[isort]
known_third_party = django
known_first_party = netjsonconfig,openwisp_utils
line_length=110
default_section = THIRDPARTY
skip = migrations
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import os
import sys

from setuptools import find_packages, setup

from django_netjsonconfig import get_version
from setuptools import find_packages, setup


def get_install_requires():
Expand Down

0 comments on commit bd3ab20

Please sign in to comment.