Upgrade dependencies

elliotwutingfeng · Aug 15, 2024 · 8f4fbf0 · 8f4fbf0
1 parent 810be73
commit 8f4fbf0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 39 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,15 +25,15 @@ jobs:
 
             - uses: actions/setup-python@v5
               with:
-                python-version: '3.12' 
+                python-version: '3.12'
 
             - name: Install poetry
               run: |
                   pipx install poetry
 
             - name: Check lock file consistency
               run: |
-                  poetry lock --check
+                  poetry --check lock
 
             - name: Install dependencies
               run: |

diff --git a/analysis/analysis.ipynb b/analysis/analysis.ipynb
@@ -14,7 +14,6 @@
     "import pandas as pd\n",
     "import plotly.express as px\n",
     "import plotly.graph_objects as go\n",
-    "from IPython.display import display\n",
     "\n",
     "from railrailrail.network.stage import Stage\n",
     "from railrailrail.railgraph import RailGraph\n",
@@ -143,22 +142,22 @@
     "    # Stations within interchanges have different geographic coordinates.\n",
     "    # This causes them to have different average circuity. For example, see BP1/NS4 Choa Chu Kang.\n",
     "\n",
-    "    station_agg_stats_by_stage_from_nel[stage][\n",
-    "        \"planning_area\"\n",
-    "    ] = station_agg_stats_by_stage_from_nel[stage].apply(\n",
-    "        lambda row: next(\n",
-    "            (\n",
-    "                feature[\"Planning Area\"]\n",
-    "                for _, feature in planning_areas.iterrows()\n",
-    "                if contains_point(\n",
-    "                    feature[\"geometry\"],\n",
-    "                    row[\"latitude\"],\n",
-    "                    row[\"longitude\"],\n",
-    "                )\n",
+    "    station_agg_stats_by_stage_from_nel[stage][\"planning_area\"] = (\n",
+    "        station_agg_stats_by_stage_from_nel[stage].apply(\n",
+    "            lambda row: next(\n",
+    "                (\n",
+    "                    feature[\"Planning Area\"]\n",
+    "                    for _, feature in planning_areas.iterrows()\n",
+    "                    if contains_point(\n",
+    "                        feature[\"geometry\"],\n",
+    "                        row[\"latitude\"],\n",
+    "                        row[\"longitude\"],\n",
+    "                    )\n",
+    "                ),\n",
+    "                None,\n",
     "            ),\n",
-    "            None,\n",
-    "        ),\n",
-    "        axis=1,\n",
+    "            axis=1,\n",
+    "        )\n",
     "    )\n",
     "\n",
     "    station_agg_stats_by_stage_from_nel[stage] = station_agg_stats_by_stage_from_nel[\n",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ tomlkit = "^0.13.2"
 xlrd = "^2.0.1"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.5.7"
+ruff = "^0.6.0"
 pytest = "^8.3.2"
 pytest-cov = "^5.0.0"
 pytest-mock = "^3.14.0"