make isort and black work together

batch_calculator/process_results.py

@@ -1,25 +1,20 @@
-import click
 import json
 import os
-import pandas
 import shutil
 import zipfile
-
-from batch_calculator.rain_series_simulations import (
-    printProgressBar,
-    api_call,
-)
 from math import floor
 from pathlib import Path
+from typing import Dict, List
+from urllib.request import urlretrieve
+
+import click
+import pandas
 from threedi_api_client import ThreediApi
 from threedi_api_client.openapi.models import SimulationStatus
 from threedi_api_client.versions import V3BetaApi
-from typing import (
-    Dict,
-    List,
-)
 from threedigrid.admin.gridresultadmin import GridH5AggregateResultAdmin
-from urllib.request import urlretrieve
+
+from batch_calculator.rain_series_simulations import api_call, printProgressBar
 
 
 def repetition_time_volumes(weir_results, n, stats=[1, 2, 5, 10]):

batch_calculator/rain_series_simulations.py

@@ -1,20 +1,18 @@
-from urllib.request import urlretrieve
-import click
-import numpy as np
 import json
 import os
 import shutil
-import pytz
-import netCDF4 as nc4
 import zipfile
-
-
 from datetime import datetime
 from pathlib import Path
-from sqlalchemy import (
-    create_engine,
-    text,
-)
+from time import sleep
+from typing import Dict, List
+from urllib.request import urlretrieve
+
+import click
+import netCDF4 as nc4
+import numpy as np
+import pytz
+from sqlalchemy import create_engine, text
 from sqlalchemy.orm import Session
 from threedi_api_client import ThreediApi
 from threedi_api_client.files import upload_file
@@ -32,11 +30,6 @@
     UploadEventFile,
 )
 from threedi_api_client.versions import V3BetaApi
-from time import sleep
-from typing import (
-    Dict,
-    List,
-)
 
 RAIN_EVENTS_START_DATE = datetime(1955, 1, 1)
 REQUIRED_AGGREGATION_METHODS = {"cum", "cum_negative", "cum_positive"}

pyproject.toml

@@ -37,3 +37,7 @@ version = {attr = "batch_calculator.__version__"}
 
 [tool.zest-releaser]
 release = false
+
+[tool.isort]
+profile = "black"
+force_alphabetical_sort_within_sections = true

setup.cfg

@@ -1,2 +1,3 @@
 [flake8]
-max-line-length = 90
+max-line-length = 88
+extend-ignore = E203,E701