Use 'isort' to fix order of imports

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

.gitlab-ci.yml

@@ -21,14 +21,14 @@ static_python:
   before_script:
     - pip install tox~=3.8.0
   script:
-    - tox -e "py2-{flake8,yapf}"
+    - tox -e "py2-{flake8,isort,yapf}"
 static_python3:
   stage: static
   image: python:3
   before_script:
     - pip install tox~=3.8.0
   script:
-    - tox -e "py3-{flake8,yapf}"
+    - tox -e "py3-{flake8,isort,yapf}"
 docs:
   stage: build
   image: python:2

auth0login/auth0backend.py

@@ -1,4 +1,5 @@
 import requests
+
 from social_core.backends.oauth import BaseOAuth2
 
 

auth0login/urls.py

@@ -1,4 +1,5 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
+
 from . import views
 
 urlpatterns = [

db/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import
 
+from ._version import get_versions
 from .celery import app as celery_app  # noqa
 
 __all__ = ['celery_app']
 
-from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions

db/api/filters.py

@@ -1,8 +1,7 @@
-from django_filters.rest_framework import FilterSet
-from django_filters import rest_framework as filters
 import django_filters
-
-from db.base.models import Transmitter, DemodData, Satellite
+from db.base.models import DemodData, Satellite, Transmitter
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import FilterSet
 
 
 class TransmitterViewFilter(FilterSet):

db/api/serializers.py

@@ -1,7 +1,7 @@
+from db.base.models import TRANSMITTER_STATUS, DemodData, Mode, Satellite, \
+    Transmitter
 from rest_framework import serializers
 
-from db.base.models import Mode, Satellite, Transmitter, DemodData, TRANSMITTER_STATUS
-
 
 class ModeSerializer(serializers.ModelSerializer):
     class Meta:

db/api/tests.py

@@ -1,9 +1,9 @@
 import pytest
-
-from rest_framework import status
 from django.test import TestCase
 
-from db.base.tests import ModeFactory, SatelliteFactory, TransmitterFactory, DemodDataFactory
+from db.base.tests import DemodDataFactory, ModeFactory, SatelliteFactory, \
+    TransmitterFactory
+from rest_framework import status
 
 
 @pytest.mark.django_db(transaction=True)

db/api/urls.py

@@ -1,6 +1,5 @@
-from rest_framework import routers
-
 from db.api import views
+from rest_framework import routers
 
 router = routers.DefaultRouter()
 

db/api/views.py

@@ -1,13 +1,12 @@
-from rest_framework import viewsets, mixins, status
-from rest_framework.parsers import FormParser, FileUploadParser
-from rest_framework.permissions import AllowAny
-from rest_framework.response import Response
-
 from django.core.files.base import ContentFile
 
-from db.api import serializers, filters, pagination
-from db.base.models import Mode, Satellite, Transmitter, DemodData
+from db.api import filters, pagination, serializers
+from db.base.models import DemodData, Mode, Satellite, Transmitter
 from db.base.tasks import update_satellite
+from rest_framework import mixins, status, viewsets
+from rest_framework.parsers import FileUploadParser, FormParser
+from rest_framework.permissions import AllowAny
+from rest_framework.response import Response
 
 
 class ModeView(viewsets.ReadOnlyModelViewSet):

db/base/admin.py

@@ -1,17 +1,16 @@
-from datetime import datetime
 import logging
+from datetime import datetime
 from socket import error as socket_error
 
 from django.conf.urls import url
 from django.contrib import admin, messages
-from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
+from django.urls import reverse
 
-from db.base.models import (
-    Mode, Satellite, TransmitterEntry, TransmitterSuggestion, Transmitter, DemodData, Telemetry
-)
-from db.base.tasks import check_celery, reset_decoded_data, decode_all_data
+from db.base.models import DemodData, Mode, Satellite, Telemetry, \
+    Transmitter, TransmitterEntry, TransmitterSuggestion
+from db.base.tasks import check_celery, decode_all_data, reset_decoded_data
 
 logger = logging.getLogger('db')
 

db/base/context_processors.py

@@ -1,8 +1,9 @@
 from django.conf import settings
 from django.template.loader import render_to_string
-from db import __version__
 from satnogsdecoders import __version__ as satnogsdecoders_version
 
+from db import __version__
+
 
 def analytics(request):
     """Returns analytics code."""

db/base/forms.py

@@ -2,7 +2,7 @@ from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
-from db.base.models import TransmitterEntry, Transmitter
+from db.base.models import Transmitter, TransmitterEntry
 
 
 class TransmitterEntryForm(forms.ModelForm):

db/base/helpers.py

@@ -1,7 +1,7 @@
-from rest_framework.authtoken.models import Token
-
 from django.core.cache import cache
 
+from rest_framework.authtoken.models import Token
+
 UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWX'
 LOWER = 'abcdefghijklmnopqrstuvwx'
 

db/base/management/commands/decode_data.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from db.base.models import Satellite, Telemetry, DemodData
+from db.base.models import DemodData, Satellite, Telemetry
 
 
 class Command(BaseCommand):

db/base/management/commands/fetch_data.py

@@ -1,12 +1,12 @@
-import requests
 from datetime import datetime, timedelta
-from pytz import timezone
 
+import requests
+from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
-from django.conf import settings
+from pytz import timezone
 
-from db.base.models import Satellite, TransmitterEntry, DemodData
+from db.base.models import DemodData, Satellite, TransmitterEntry
 
 
 class Command(BaseCommand):

db/base/management/commands/initialize.py

@@ -1,5 +1,5 @@
-from django.core.management.base import BaseCommand
 from django.core.management import call_command
+from django.core.management.base import BaseCommand
 
 
 class Command(BaseCommand):

db/base/models.py

@@ -1,9 +1,6 @@
-import logging
 import json
-
-from markdown import markdown
+import logging
 from os import path
-from shortuuidfield import ShortUUIDField
 from uuid import uuid4
 
 from django.conf import settings
@@ -13,8 +10,10 @@ from django.db import models
 from django.db.models import OuterRef, Subquery
 from django.db.models.signals import post_save, pre_save
 from django.utils.timezone import now
+from markdown import markdown
 
 from db.base.helpers import gridsquare
+from shortuuidfield import ShortUUIDField
 
 logger = logging.getLogger('db')
 

db/base/tasks.py

@@ -3,21 +3,18 @@ import logging
 from datetime import datetime, timedelta
 
 from django.conf import settings
-from django.core.mail import send_mail
 from django.contrib.sites.models import Site
+from django.core.mail import send_mail
 from django.template.loader import render_to_string
 from django.utils.timezone import make_aware
 from influxdb import InfluxDBClient
-
 from sgp4.earth_gravity import wgs72
 from sgp4.io import twoline2rv
 
-from satellite_tle import fetch_tle_from_celestrak, fetch_tles
-
-from db.base.models import Satellite, DemodData
+from db.base.models import DemodData, Satellite
+from db.base.utils import cache_statistics, decode_data
 from db.celery import app
-from db.base.utils import decode_data
-from db.base.utils import cache_statistics
+from satellite_tle import fetch_tle_from_celestrak, fetch_tles
 
 logger = logging.getLogger('db')
 

db/base/tests.py

@@ -1,16 +1,15 @@
 import random
 from datetime import datetime, timedelta
-import pytest
 
-import factory
-from factory import fuzzy
+import pytest
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.utils.timezone import now
 
-from db.base.models import (
-    DATA_SOURCES, Mode, Satellite, Transmitter, TransmitterSuggestion, Telemetry, DemodData
-)
+import factory
+from db.base.models import DATA_SOURCES, DemodData, Mode, Satellite, \
+    Telemetry, Transmitter, TransmitterSuggestion
+from factory import fuzzy
 
 DATA_SOURCE_IDS = [c[0] for c in DATA_SOURCES]
 

db/base/utils.py

@@ -1,14 +1,15 @@
-import logging
 import binascii
-
+import logging
 from datetime import datetime, timedelta
-from db.base.models import Satellite, Transmitter, Mode, DemodData, Telemetry
-from django.db.models import Count, Max
+
 from django.conf import settings
+from django.core.cache import cache
+from django.db.models import Count, Max
 from django.utils.timezone import make_aware
 from influxdb import InfluxDBClient
 from satnogsdecoders import decoder
-from django.core.cache import cache
+
+from db.base.models import DemodData, Mode, Satellite, Telemetry, Transmitter
 
 logger = logging.getLogger('db')
 

db/base/views.py

@@ -1,24 +1,25 @@
 import logging
 
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.contrib.sites.shortcuts import get_current_site
-from django.contrib import messages
 from django.core.cache import cache
-from django.urls import reverse
-from django.http import HttpResponseNotFound, HttpResponseServerError, HttpResponse, JsonResponse
-from django.shortcuts import render, redirect, get_object_or_404
+from django.http import HttpResponse, HttpResponseNotFound, \
+    HttpResponseServerError, JsonResponse
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.views.decorators.http import require_POST
 
-from db.base.models import Mode, Satellite, DemodData, Transmitter, TransmitterSuggestion
-from db.base.models import TRANSMITTER_TYPE, TRANSMITTER_STATUS
+from _mysql_exceptions import OperationalError
 from db.base.forms import TransmitterEntryForm
 from db.base.helpers import get_apikey
+from db.base.models import TRANSMITTER_STATUS, TRANSMITTER_TYPE, DemodData, \
+    Mode, Satellite, Transmitter, TransmitterSuggestion
 from db.base.tasks import export_frames
 from db.base.utils import cache_statistics
-from _mysql_exceptions import OperationalError
 
 logger = logging.getLogger('db')
 

db/celery.py

@@ -3,11 +3,10 @@ from __future__ import absolute_import
 import os
 
 from celery import Celery
+from django.conf import settings  # noqa
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'db.settings')
 
-from django.conf import settings  # noqa
-
 RUN_EVERY_15 = 60 * 15
 RUN_HOURLY = 60 * 60
 RUN_DAILY = 60 * 60 * 24

db/settings.py

@@ -1,8 +1,9 @@
-from decouple import config, Csv
-from dj_database_url import parse as db_url
-from unipath import Path
 import sentry_sdk
+from dj_database_url import parse as db_url
 from sentry_sdk.integrations.django import DjangoIntegration
+from unipath import Path
+
+from decouple import Csv, config
 
 ROOT = Path(__file__).parent
 

db/urls.py

@@ -1,12 +1,11 @@
-from django.conf.urls import url, include
 from django.conf import settings
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.static import serve
 
 from allauth import urls as allauth_urls
-
-from db.base.urls import base_urlpatterns
 from db.api.urls import api_urlpatterns
+from db.base.urls import base_urlpatterns
 
 handler404 = 'db.base.views.custom_404'
 handler500 = 'db.base.views.custom_500'

db/wsgi.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import os
+
 from django.core.wsgi import get_wsgi_application
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'db.settings')

setup.cfg

@@ -88,6 +88,13 @@ column_limit = 99
 split_before_first_argument = True
 dedent_closing_brackets = True
 
+[tool:isort]
+use_parentheses = True
+skip_glob = migrations
+skip = _version.py
+line_width = 99
+multi_line_output = 2
+
 [tool:pytest]
 addopts = -v --cov --cov-report=term-missing
 python_files = tests.py

setup.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
 from setuptools import setup
+
 import versioneer
 
 setup(

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py2,py3}-{flake8,yapf},pytest,py2,py3
+envlist = {py2,py3}-{flake8,isort,yapf},pytest,py2,py3
 
 [testenv:flake8]
 deps =
@@ -10,6 +10,24 @@ commands = flake8 \
     db \
     auth0login
 
+[testenv:py2-isort]
+deps =
+    isort
+skip_install = True
+commands = isort -rc -c -df \
+    setup.py \
+    db \
+    auth0login
+
+[testenv:py3-isort]
+deps =
+    isort
+skip_install = True
+commands = isort -rc -c -df \
+    setup.py \
+    db \
+    auth0login
+
 [testenv:py2-yapf]
 deps =
     yapf