isort all imports (#62)

* requirements: Add isort.

Much like `black`, having an opinionated sorting tool for imports
helps keep them consistent and tidy.

* isort all python files.

.github/workflows/test.yml

@@ -37,6 +37,9 @@ jobs:
     - name: Run Black
       run: |
         black --check --diff .
+    - name: Run isort
+      run: |
+        isort --check .
     - name: Run tests
       env:
         DJANGO_SECRET_KEY: secret for running tests

README.md

@@ -80,6 +80,6 @@ To run the tests, change directory to the `vaccinate` folder and run `pytest`.
 
 ## Code formatting
 
-This repository uses [Black](https://github.com/psf/black) to enforce coding style as part of the CI tests.
+This repository uses [Black](https://github.com/psf/black) and [isort](https://pycqa.github.io/isort/) to enforce coding style as part of the CI tests.
 
-Run `black .` in the top-level directory to ensure your code is formatted correctly, then enjoy never having to think about how to best indent your Python code ever again.
+Run `black .` and `isort .` in the top-level directory to ensure your code is formatted correctly, then enjoy never having to think about how to best indent your Python code ever again.

pyproject.toml

@@ -0,0 +1,5 @@
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+
+

requirements.in

@@ -46,6 +46,7 @@ time-machine
 
 # Formatting
 black
+isort
 
 # Dependency management
 pip-tools

requirements.txt

@@ -222,6 +222,10 @@ iniconfig==1.1.1 \
     --hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
     --hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
     # via pytest
+isort==5.7.0 \
+    --hash=sha256:c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e \
+    --hash=sha256:fff4f0c04e1825522ce6949973e83110a6e907750cd92d128b0d14aaaadbffdc
+    # via -r requirements.in
 libcst==0.3.17 \
     --hash=sha256:2766671c107263daa3fc34e39d55134a6fe253701564d7670586f30eee2c201c \
     --hash=sha256:4638e4e8f166f4c74df399222d347ce3e1d316e206b550d8a6254d51b4cf7275

scripts/replay_api_logs_from_csv.py

@@ -1,12 +1,13 @@
+import csv
+import json
+import time
 from collections import defaultdict
-from dateutil import parser
 from urllib.parse import urlencode
+
 import click
-import csv
 import httpx
-import json
 import pytz
-import time
+from dateutil import parser
 
 
 @click.command()

vaccinate/api/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from .models import ApiLog
 
 

vaccinate/api/migrations/0001_initial.py

@@ -1,9 +1,9 @@
 # Generated by Django 3.1.7 on 2021-03-03 20:19
 
 import core.fields
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

vaccinate/api/models.py

@@ -1,6 +1,6 @@
+from core.fields import CharTextField
 from django.db import models
 from django.utils import timezone
-from core.fields import CharTextField
 
 
 class ApiLog(models.Model):

vaccinate/api/test_submit_report.py

@@ -1,8 +1,9 @@
-from core.models import Report, Location
-from api.models import ApiLog
 import json
 import pathlib
+
 import pytest
+from api.models import ApiLog
+from core.models import Location, Report
 
 tests_dir = pathlib.Path(__file__).parent / "test-data" / "submitReport"
 

vaccinate/api/utils.py

@@ -1,6 +1,7 @@
+import json
 from functools import wraps
+
 from .models import ApiLog
-import json
 
 
 def log_api_requests(view_fn):

vaccinate/api/views.py

@@ -1,15 +1,17 @@
+import json
+from typing import List, Optional
+
+import pytz
 from auth0login.auth0_utils import decode_and_verify_jwt
+from core.import_utils import derive_appointment_tag, resolve_availability_tags
+from core.models import AppointmentTag, AvailabilityTag, Location, Report, Reporter
 from dateutil import parser
 from django.http import JsonResponse
 from django.shortcuts import render
 from django.views.decorators.csrf import csrf_exempt
-from pydantic import BaseModel, validator, ValidationError, Field
-from typing import List, Optional
-from core.models import AppointmentTag, AvailabilityTag, Location, Report, Reporter
-from core.import_utils import derive_appointment_tag, resolve_availability_tags
+from pydantic import BaseModel, Field, ValidationError, validator
+
 from .utils import log_api_requests
-import json
-import pytz
 
 
 class ReportValidator(BaseModel):

vaccinate/auth0login/auth0_utils.py

@@ -1,6 +1,6 @@
+import requests
 from django.conf import settings
 from jose import jwt
-import requests
 
 
 def decode_and_verify_jwt(jwt_id_token, try_fallback=False):

vaccinate/auth0login/auth0backend.py

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

vaccinate/auth0login/tests.py

@@ -1,9 +1,10 @@
 import datetime
-from django.contrib.sessions.models import Session
-from django.contrib.auth.models import User
-import pytest
 import urllib
 
+import pytest
+from django.contrib.auth.models import User
+from django.contrib.sessions.models import Session
+
 
 @pytest.mark.django_db
 def test_login_with_auth0_start(client):

vaccinate/auth0login/views.py

@@ -1,7 +1,8 @@
-from django.contrib.auth import logout as log_out
-from django.http import HttpResponseRedirect
 from urllib.parse import urlencode
+
 from django.conf import settings
+from django.contrib.auth import logout as log_out
+from django.http import HttpResponseRedirect
 
 
 def logout(request):

vaccinate/config/settings.py

@@ -1,9 +1,10 @@
-import dj_database_url
-from django.conf.locale.en import formats as en_formats
+import os
 from pathlib import Path
+
+import dj_database_url
 import sentry_sdk
+from django.conf.locale.en import formats as en_formats
 from sentry_sdk.integrations.django import DjangoIntegration
-import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

vaccinate/config/urls.py

@@ -1,11 +1,10 @@
+from api import views as api_views
+from auth0login.views import logout
+from core import views as core_views
 from django.contrib import admin
 from django.http.response import HttpResponsePermanentRedirect
-from django.urls import path, include
 from django.shortcuts import redirect
-from auth0login.views import logout
-from api import views as api_views
-from core import views as core_views
-
+from django.urls import include, path
 
 urlpatterns = [
     path("", core_views.index),

vaccinate/config/wsgi.py

@@ -1,9 +1,8 @@
 import io
 import os
 
-from django.core.wsgi import get_wsgi_application
-
 from config.env import load_env
+from django.core.wsgi import get_wsgi_application
 
 load_env()
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")

vaccinate/conftest.py

@@ -1,6 +1,6 @@
-import pytest
 import datetime
 
+import pytest
 
 # Copied from https://vaccinateca.us.auth0.com/.well-known/jwks.json on 24th Feb 2021:
 MOCK_JWKS = {

vaccinate/core/admin.py

@@ -1,24 +1,26 @@
+import json
+
 from django.contrib import admin
 from django.db.models import Count, Max
 from django.template.loader import render_to_string
-from django.utils.safestring import mark_safe
 from django.utils.html import escape
-import json
+from django.utils.safestring import mark_safe
+
 from .models import (
-    LocationType,
-    ProviderType,
-    Provider,
-    State,
-    County,
-    Location,
-    Reporter,
-    AvailabilityTag,
     AppointmentTag,
-    Report,
-    EvaReport,
-    CallRequestReason,
+    AvailabilityTag,
     CallRequest,
+    CallRequestReason,
+    County,
+    EvaReport,
+    Location,
+    LocationType,
+    Provider,
+    ProviderType,
     PublishedReport,
+    Report,
+    Reporter,
+    State,
 )
 
 # Simple models first

vaccinate/core/import_utils.py

@@ -1,15 +1,16 @@
 from github_contents import GithubContents
+
 from .models import (
     AppointmentTag,
     AvailabilityTag,
-    Report,
+    County,
     Location,
-    State,
     LocationType,
     Provider,
-    County,
     ProviderType,
+    Report,
     Reporter,
+    State,
 )
 
 FIX_COUNTIES = {

vaccinate/core/management/commands/import_airtable_locations.py

@@ -1,7 +1,8 @@
-from django.core.management.base import BaseCommand, CommandError
-from core.import_utils import load_airtable_backup, import_airtable_location
 import json
 
+from core.import_utils import import_airtable_location, load_airtable_backup
+from django.core.management.base import BaseCommand, CommandError
+
 
 class Command(BaseCommand):
     def add_arguments(self, parser):

vaccinate/core/management/commands/import_airtable_reports.py

@@ -1,7 +1,8 @@
+import json
+
+from core.import_utils import import_airtable_report, load_airtable_backup
 from core.models import AvailabilityTag
 from django.core.management.base import BaseCommand, CommandError
-from core.import_utils import load_airtable_backup, import_airtable_report
-import json
 
 
 class Command(BaseCommand):

vaccinate/core/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # Generated by Django 3.1.7 on 2021-02-24 02:45
 
 import core.fields
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

vaccinate/core/migrations/0003_populate_ca_counties.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 counties = {
     "06001": "Alameda",
     "06003": "Alpine",

vaccinate/core/migrations/0006_populate_county_airtable_ids.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 counties = {
     "Glenn": "rec0QOd7EXzSuZZvN",
     "Shasta": "rec1rvcyGSS6AgQEq",

vaccinate/core/migrations/0007_populate_call_request_reasons.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 reasons = ("Stale report", "New location", "Eva tip", "Data corrections tip")
 
 

vaccinate/core/migrations/0009_callreport_created_at.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.7 on 2021-02-25 01:29
 
 import datetime
+
 from django.db import migrations, models
 
 

vaccinate/core/migrations/0011_more_availability_tags.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 availability_tags = (
     (
         "No: may be a vaccination site in the future",

vaccinate/core/migrations/0012_location_county_can_be_null.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.7 on 2021-02-26 07:23
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

vaccinate/core/migrations/0015_populate_appointmenttag_slug.py

@@ -1,6 +1,5 @@
 from django.db import migrations
 
-
 appointment_tag_slugs = {
     "County website": "county_website",
     "myturn.ca.gov": "myturn_ca_gov",

vaccinate/core/migrations/0020_populate_new_reporter_fields.py

@@ -1,5 +1,5 @@
 from django.db import migrations
-from django.db.models import F, Value, CharField
+from django.db.models import CharField, F, Value
 from django.db.models.functions import Concat
 
 

vaccinate/core/migrations/0023_related_name_call_reports_is_now_reports.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.7 on 2021-03-01 22:37
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

vaccinate/core/migrations/0031_auto_20210303_2019.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.1.7 on 2021-03-03 20:19
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):