Merge pull request #565 from maps-as-data/fix-example-notebooks

Fix bug raised by example notebooks

Author: rwood-97

.github/workflows/changelog.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   Check-Changelog:
     name: Check Changelog Action
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: tarides/changelog-check-action@v2
         with:

mapreader/spot_text/runner_base.py

@@ -711,8 +711,8 @@ def explore_predictions(
 
         preds_df = self._dict_to_dataframe(self.geo_predictions)
         preds_df.drop(
-            columns=["pixel_geometry"], inplace=True
-        )  # drop pixel_geometry since we can't have two polygon columns
+            columns=["pixel_geometry", "pixel_line", "line"], inplace=True
+        )  # drop other geometry since we can't have more than one geometry columns
 
         return preds_df[preds_df["image_id"] == parent_id].explore(
             tiles=tiles,
@@ -1163,8 +1163,8 @@ def explore_search_results(
         geo_search_results = self._get_geo_search_results()
         geo_df = self._dict_to_dataframe(geo_search_results)
         geo_df.drop(
-            columns=["pixel_geometry"], inplace=True
-        )  # drop pixel_geometry since we can't have two polygon columns
+            columns=["pixel_geometry", "pixel_line", "line"], inplace=True
+        )  # drop other geometry since we can't have more than one geometry columns
 
         return geo_df[geo_df["image_id"] == parent_id].explore(
             tiles=tiles,

setup.py

@@ -71,7 +71,7 @@
             "pytest<9.0.0",
             "pytest-cov>=4.1.0,<6.0.0",
             "timm<1.0.0",
-            "transformers<5.0.0, !=4.50.0",
+            "transformers<4.51.3, !=4.50.0",
             "black>=23.7.0,<25.0.0",
             "flake8>=6.0.0,<8.0.0",
         ],