Skip to content

Commit 68d14f3

Browse files
authored
Enable import sorting with ruff (#1208)
* add import sorting rule to ruff * update pre-commit-config * update pre-commit-config * add uxarray as known first party
1 parent 4257f71 commit 68d14f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+417
-430
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ repos:
1616
# Ruff version.
1717
rev: v0.11.5
1818
hooks:
19-
# Run the linter.
2019
- id: ruff
21-
args: [ --fix ]
20+
name: lint with ruff
2221
types_or: [ python, pyi, jupyter ]
23-
24-
# Run the formatter.
22+
- id: ruff
23+
name: sort imports with ruff
24+
args: [ --select, I, --fix ]
2525
- id: ruff-format
26+
name: format with ruff
2627
types_or: [ python, pyi, jupyter ]
2728

2829
- repo: https://github.com/keewis/blackdoc

docs/conf.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55

66
# -- Project information -----------------------------------------------------
77

8+
import datetime
89
import os
9-
import sys
1010
import pathlib
11+
import sys
12+
from textwrap import dedent, indent
13+
14+
import matplotlib.pyplot
15+
import sphinx_autosummary_accessors
1116
import yaml
1217
from sphinx.application import Sphinx
13-
import sphinx_autosummary_accessors
1418
from sphinx.util import logging
15-
from textwrap import dedent, indent
16-
import datetime
1719

1820
import uxarray
19-
import matplotlib.pyplot
2021

2122
__all__ = (uxarray, matplotlib.pyplot)
2223

docs/examples/e3sm-calc-workflow.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -780,19 +780,19 @@
780780
"\n",
781781
"warnings.filterwarnings(\"ignore\")\n",
782782
"\n",
783-
"from dask.distributed import Client, LocalCluster\n",
784-
"import uxarray as ux\n",
783+
"import glob\n",
784+
"import sys\n",
785+
"\n",
785786
"import cartopy.crs as ccrs\n",
787+
"import cmocean\n",
788+
"import dask.distributed\n",
786789
"import geoviews as gv\n",
787790
"import geoviews.feature as gf\n",
788791
"import holoviews as hv\n",
789-
"import cmocean\n",
790-
"import glob\n",
791-
"\n",
792-
"import sys\n",
793-
"\n",
794792
"import panel as pn\n",
795-
"import dask.distributed\n",
793+
"from dask.distributed import Client, LocalCluster\n",
794+
"\n",
795+
"import uxarray as ux\n",
796796
"\n",
797797
"# Set-up for HoloViz plots\n",
798798
"hv.extension(\"matplotlib\")\n",

docs/examples/visualization/3_75km_mpas.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
"metadata": {},
2424
"outputs": [],
2525
"source": [
26-
"import uxarray as ux\n",
2726
"import cartopy.crs as ccrs\n",
2827
"import geoviews.feature as gf\n",
2928
"\n",
29+
"import uxarray as ux\n",
30+
"\n",
3031
"\n",
3132
"def features(projection):\n",
3233
" return gf.coastline(projection=projection, linewidth=1, scale=\"50m\") * gf.states(\n",

docs/examples/visualization/e3sm-load-viz.ipynb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,11 +641,13 @@
641641
}
642642
],
643643
"source": [
644-
"import uxarray as ux\n",
644+
"import warnings\n",
645+
"\n",
645646
"import cartopy.crs as ccrs\n",
646647
"import geoviews as gv\n",
647648
"import geoviews.feature as gf\n",
648-
"import warnings"
649+
"\n",
650+
"import uxarray as ux"
649651
]
650652
},
651653
{

docs/user-guide/area_calc.ipynb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,12 @@
202202
}
203203
],
204204
"source": [
205-
"import uxarray as ux\n",
206-
"import numpy as np\n",
207-
"import matplotlib.pyplot as plt\n",
208205
"import cartopy.crs as ccrs\n",
209-
"import cartopy.feature as cfeature"
206+
"import cartopy.feature as cfeature\n",
207+
"import matplotlib.pyplot as plt\n",
208+
"import numpy as np\n",
209+
"\n",
210+
"import uxarray as ux"
210211
]
211212
},
212213
{

docs/user-guide/cross-sections.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"metadata": {},
1818
"outputs": [],
1919
"source": [
20-
"import uxarray as ux\n",
21-
"import geoviews.feature as gf\n",
22-
"\n",
2320
"import cartopy.crs as ccrs\n",
2421
"import geoviews as gv\n",
22+
"import geoviews.feature as gf\n",
23+
"\n",
24+
"import uxarray as ux\n",
2525
"\n",
2626
"projection = ccrs.Robinson()"
2727
]

docs/user-guide/custom-grid.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
"metadata": {},
1818
"outputs": [],
1919
"source": [
20-
"import uxarray as ux\n",
20+
"import numpy as np\n",
2121
"import xarray as xr\n",
22-
"import numpy as np"
22+
"\n",
23+
"import uxarray as ux"
2324
]
2425
},
2526
{

docs/user-guide/data-structures.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
},
4242
"outputs": [],
4343
"source": [
44-
"import uxarray as ux\n",
45-
"import xarray as xr"
44+
"import xarray as xr\n",
45+
"\n",
46+
"import uxarray as ux"
4647
]
4748
},
4849
{

docs/user-guide/dual-mesh.ipynb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
},
3535
"outputs": [],
3636
"source": [
37-
"import uxarray as ux\n",
3837
"import warnings\n",
38+
"\n",
3939
"import cartopy.crs as ccrs\n",
4040
"\n",
41+
"import uxarray as ux\n",
42+
"\n",
4143
"warnings.filterwarnings(\"ignore\")"
4244
]
4345
},

0 commit comments

Comments
 (0)