new format lint

cities/modeling/model_interactions.py

@@ -3,10 +3,10 @@
 from typing import Optional
 
 import dill
+import pyro
 import pyro.distributions as dist
 import torch
 
-import pyro
 from cities.modeling.modeling_utils import (
     prep_wide_data_for_inference,
     train_interactions_model,

cities/modeling/modeling_utils.py

@@ -2,13 +2,13 @@
 
 import matplotlib.pyplot as plt
 import pandas as pd
+import pyro
 import torch
 from pyro.infer import SVI, Trace_ELBO
 from pyro.infer.autoguide import AutoNormal
 from pyro.optim import Adam  # type: ignore
 from scipy.stats import spearmanr
 
-import pyro
 from cities.utils.data_grabber import (
     DataGrabber,
     list_available_features,

cities/queries/causal_insight.py

@@ -5,10 +5,10 @@
 import numpy as np
 import pandas as pd
 import plotly.graph_objects as go
+import pyro
 import torch
 from sklearn.preprocessing import StandardScaler
 
-import pyro
 from cities.modeling.model_interactions import model_cities_interaction
 from cities.modeling.modeling_utils import prep_wide_data_for_inference
 from cities.utils.cleaning_utils import (
@@ -576,7 +576,8 @@ def estimate_ATE(self):
             label=f"mean = {tau_samples.mean():.3f}",
         )
         plt.title(
-            f"ATE for {self.intervention_dataset}  and  {self.outcome_dataset} with forward shift = {self.forward_shift}"
+            f"ATE for {self.intervention_dataset} and {self.outcome_dataset} "
+            f"with forward shift = {self.forward_shift}"
         )
         plt.ylabel("counts")
         plt.xlabel("ATE")

scripts/clean.sh

@@ -1,22 +1,8 @@
 #!/bin/bash
 set -euxo pipefail
 
-# isort suspended as conflicting with black
-# nbqa isort docs/guides/
-
-
-# this sometimes conflicts with black but does some
-# preliminary import sorting
-# and is then overriden by black
-isort cities/ tests/
-
-black ./cities/ ./tests/ ./docs/guides/
-
-black docs/guides/
-
+isort --profile="black" cities/ tests/
 autoflake --remove-all-unused-imports --in-place --recursive ./cities ./tests
-
-nbqa autoflake --nbqa-shell --remove-all-unused-imports --recursive --in-place docs/guides/ 
-
-#nbqa black docs/guides/
-
+nbqa --nbqa-shell isort --profile="black" docs/guides/ 
+nbqa --nbqa-shell autoflake  --nbqa-shell --remove-all-unused-imports --recursive --in-place docs/guides/   
+black ./cities ./tests docs/guides/ 

scripts/lint.sh

@@ -1,12 +1,8 @@
 #!/bin/bash
 set -euxo pipefail
 
-mypy --ignore-missing-imports cities/
-#isort --check --diff cities/ tests/
-black --check cities/ tests/
-flake8 cities/ tests/ --ignore=E203,W503 --max-line-length=127
-
-
-nbqa autoflake -v --recursive --check docs/guides/
-#nbqa isort --check  docs/guides/
-nbqa black --check docs/guides/
+mypy --ignore-missing-imports cities/ tests/
+isort --check --profile="black" --diff cities/ tests/
+black --check cities/ tests/ docs/guides/
+flake8 cities/ tests/
+nbqa --nbqa-shell autoflake --nbqa-shell --recursive --check docs/guides/