[pre-commit.ci] pre-commit autoupdate (#767)

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.6.9](astral-sh/ruff-pre-commit@v0.5.0...v0.6.9) * reup linting & formating * Update pyproject.toml --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: James Gaboardi <[email protected]> Co-authored-by: Martin Fleischmann <[email protected]>
pysal · Oct 9, 2024 · e23998a · e23998a
1 parent 281ed1b
commit e23998a
Show file tree

Hide file tree

Showing 11 changed files with 259 additions and 230 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
-files: "libpysal\/"
+files: "libpysal\/|docs\/"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.0"
+    rev: "v0.6.9"
     hooks:
       - id: ruff
       - id: ruff-format

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # libpysal documentation build configuration file, created by
 # sphinx-quickstart on Wed Jun  6 15:54:22 2018.
 #
@@ -17,8 +15,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import sphinx_bootstrap_theme
-import libpysal
 
+import libpysal
 
 # -- General configuration ------------------------------------------------
 

diff --git a/docs/user-guide/data/examples.ipynb b/docs/user-guide/data/examples.ipynb
@@ -35,7 +35,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from libpysal.examples import get_path \n"
+    "from libpysal.examples import get_path"
    ]
   },
   {
@@ -72,6 +72,7 @@
    "outputs": [],
    "source": [
     "import libpysal\n",
+    "\n",
     "dbf = libpysal.io.open(get_path(\"mexicojoin.dbf\"))"
    ]
   },
@@ -357,7 +358,7 @@
     }
    ],
    "source": [
-    "libpysal.examples.load_example('dataset42')"
+    "libpysal.examples.load_example(\"dataset42\")"
    ]
   },
   {
@@ -387,7 +388,7 @@
     }
    ],
    "source": [
-    "balt_url = libpysal.examples.get_url('Baltimore')\n",
+    "balt_url = libpysal.examples.get_url(\"Baltimore\")\n",
     "balt_url"
    ]
   },
@@ -421,7 +422,7 @@
     }
    ],
    "source": [
-    "libpysal.examples.explain('taz')"
+    "libpysal.examples.explain(\"taz\")"
    ]
   },
   {
@@ -430,7 +431,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "taz = libpysal.examples.load_example('taz')"
+    "taz = libpysal.examples.load_example(\"taz\")"
    ]
   },
   {
@@ -485,7 +486,7 @@
     }
    ],
    "source": [
-    "libpysal.examples.explain('Baltimore')"
+    "libpysal.examples.explain(\"Baltimore\")"
    ]
   },
   {
@@ -502,7 +503,7 @@
     }
    ],
    "source": [
-    "balt = libpysal.examples.load_example('Baltimore')"
+    "balt = libpysal.examples.load_example(\"Baltimore\")"
    ]
   },
   {
@@ -673,7 +674,8 @@
    ],
    "source": [
     "from libpysal.examples import explain\n",
-    "explain('Tampa1')"
+    "\n",
+    "explain(\"Tampa1\")"
    ]
   },
   {
@@ -691,7 +693,8 @@
    ],
    "source": [
     "from libpysal.examples import load_example\n",
-    "tampa1 = load_example('Tampa1')"
+    "\n",
+    "tampa1 = load_example(\"Tampa1\")"
    ]
   },
   {
@@ -820,7 +823,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tampa_counties_shp = tampa1.load('tampa_counties.shp')"
+    "tampa_counties_shp = tampa1.load(\"tampa_counties.shp\")"
    ]
   },
   {
@@ -858,7 +861,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tampa_df = geopandas.read_file(tampa1.get_path('tampa_counties.shp'))"
+    "tampa_df = geopandas.read_file(tampa1.get_path(\"tampa_counties.shp\"))"
    ]
   },
   {
@@ -936,7 +939,7 @@
     }
    ],
    "source": [
-    "libpysal.examples.explain('Rio Grande do Sul')"
+    "libpysal.examples.explain(\"Rio Grande do Sul\")"
    ]
   },
   {
@@ -960,7 +963,7 @@
     }
    ],
    "source": [
-    "rio = libpysal.examples.load_example('Rio Grande do Sul')"
+    "rio = libpysal.examples.load_example(\"Rio Grande do Sul\")"
    ]
   },
   {
@@ -1051,7 +1054,7 @@
     }
    ],
    "source": [
-    "libpysal.examples.remote_datasets.datasets # a listing of all remotes"
+    "libpysal.examples.remote_datasets.datasets  # a listing of all remotes"
    ]
   },
   {

diff --git a/docs/user-guide/graph/matching-graph.ipynb b/docs/user-guide/graph/matching-graph.ipynb
@@ -22,13 +22,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import sys\n",
     "import os\n",
-    "sys.path.append(os.path.abspath('..'))\n",
-    "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
+    "import sys\n",
+    "\n",
+    "sys.path.append(os.path.abspath(\"..\"))\n",
     "import geopandas\n",
-    "import pandas"
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np"
    ]
   },
   {
@@ -46,7 +46,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "points = np.row_stack([(10.2, 5.1), (4.7, 2.2), (5.3, 5.7), (2.7, 5.3), (7,4)])\n",
+    "points = np.row_stack([(10.2, 5.1), (4.7, 2.2), (5.3, 5.7), (2.7, 5.3), (7, 4)])\n",
     "gdf = geopandas.GeoDataFrame(geometry=geopandas.points_from_xy(*points.T))"
    ]
   },
@@ -108,8 +108,8 @@
     }
    ],
    "source": [
-    "f, ax =plt.subplots(1,3)\n",
-    "for i,g in enumerate((g1, g2, g3)):\n",
+    "f, ax = plt.subplots(1, 3)\n",
+    "for i, g in enumerate((g1, g2, g3)):\n",
     "    g.plot(gdf, ax=ax[i])\n",
     "    ax[i].set_title(f\"k = {i+1}\")"
    ]
@@ -128,6 +128,7 @@
    "outputs": [],
    "source": [
     "import geodatasets\n",
+    "\n",
     "stores = geopandas.read_file(geodatasets.get_path(\"geoda liquor_stores\")).explode(\n",
     "    index_parts=False\n",
     ")"
@@ -261,8 +262,8 @@
     }
    ],
    "source": [
-    "f, ax =plt.subplots(1,3)\n",
-    "for i,g in enumerate((g1, g5, g10)):\n",
+    "f, ax = plt.subplots(1, 3)\n",
+    "for i, g in enumerate((g1, g5, g10)):\n",
     "    g.plot(stores, ax=ax[i], nodes=False)\n",
     "    ax[i].set_title(f\"k = {(1, 5, 10)[i]}\")"
    ]
@@ -293,8 +294,8 @@
    "source": [
     "sources = stores.sample(100)\n",
     "sinks = stores[~stores.index.isin(sources.index)].sample(100)\n",
-    "ax = sources.plot(color='red')\n",
-    "sinks.plot(color='blue', ax=ax)\n",
+    "ax = sources.plot(color=\"red\")\n",
+    "sinks.plot(color=\"blue\", ax=ax)\n",
     "plt.show()"
    ]
   },
@@ -304,8 +305,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from libpysal.graph._matching import _spatial_matching\n",
-    "import shapely"
+    "import shapely\n",
+    "\n",
+    "from libpysal.graph._matching import _spatial_matching"
    ]
   },
   {
@@ -334,7 +336,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "crosspattern_heads, crosspattern_tails, weights, mip = _spatial_matching(x=sink_coordinates, y = source_coordinates, n_matches=1, return_mip=True)"
+    "crosspattern_heads, crosspattern_tails, weights, mip = _spatial_matching(\n",
+    "    x=sink_coordinates, y=source_coordinates, n_matches=1, return_mip=True\n",
+    ")"
    ]
   },
   {
@@ -364,12 +368,13 @@
    "outputs": [],
    "source": [
     "lines = shapely.linestrings(\n",
-    "    list( \n",
-    "    zip(\n",
-    "        map(list, source_coordinates[crosspattern_heads]),\n",
-    "        map(list, sink_coordinates[crosspattern_tails])\n",
+    "    list(\n",
+    "        zip(\n",
+    "            map(list, source_coordinates[crosspattern_heads]),\n",
+    "            map(list, sink_coordinates[crosspattern_tails]),\n",
+    "            strict=False,\n",
+    "        )\n",
     "    )\n",
-    ")\n",
     ")"
    ]
   },
@@ -390,9 +395,9 @@
     }
    ],
    "source": [
-    "ax = sources.plot(color='red')\n",
-    "sinks.plot(color='blue', ax=ax)\n",
-    "geopandas.GeoSeries(lines).plot(linewidth=1, color='k', ax=ax)\n",
+    "ax = sources.plot(color=\"red\")\n",
+    "sinks.plot(color=\"blue\", ax=ax)\n",
+    "geopandas.GeoSeries(lines).plot(linewidth=1, color=\"k\", ax=ax)\n",
     "plt.show()"
    ]
   }

diff --git a/docs/user-guide/graph/w_g_migration.ipynb b/docs/user-guide/graph/w_g_migration.ipynb
@@ -47,8 +47,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from libpysal import weights\n",
-    "from libpysal import graph"
+    "from libpysal import graph, weights"
    ]
   },
   {
@@ -85,11 +84,10 @@
    "source": [
     "%matplotlib inline\n",
     "\n",
-    "import seaborn as sns\n",
-    "import pandas as pd\n",
     "import geopandas as gpd\n",
-    "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
+    "import pandas as pd\n",
+    "import seaborn as sns\n",
+    "\n",
     "from libpysal import examples\n",
     "\n",
     "%load_ext watermark\n",
@@ -2710,7 +2708,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w_queen.transform = 'r'\n",
+    "w_queen.transform = \"r\"\n",
     "wlag = lag_spatial(w_queen, y)"
    ]
   },
@@ -3111,7 +3109,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ngdf = gdf.set_index('NAME')"
+    "ngdf = gdf.set_index(\"NAME\")"
    ]
   },
   {
@@ -3162,7 +3160,7 @@
     }
    ],
    "source": [
-    "g['Ashe']"
+    "g[\"Ashe\"]"
    ]
   },
   {
@@ -3742,9 +3740,9 @@
     }
    ],
    "source": [
-    "m = ngdf.loc[g['Ashe'].index].explore(color=\"#25b497\")\n",
-    "ngdf.loc[['Ashe']].explore(m=m, color=\"#fa94a5\")\n",
-    "g.explore(ngdf, m=m, focal='Ashe')"
+    "m = ngdf.loc[g[\"Ashe\"].index].explore(color=\"#25b497\")\n",
+    "ngdf.loc[[\"Ashe\"]].explore(m=m, color=\"#fa94a5\")\n",
+    "g.explore(ngdf, m=m, focal=\"Ashe\")"
    ]
   },
   {