From cfb043c15cf6e3a1eb02bb10e1eadcf81c71b8cc Mon Sep 17 00:00:00 2001 From: Rosie Wood Date: Wed, 28 May 2025 15:10:39 +0100 Subject: [PATCH 1/4] fix tests --- mapreader/spot_text/runner_base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mapreader/spot_text/runner_base.py b/mapreader/spot_text/runner_base.py index 2aba806e..e8725cb1 100644 --- a/mapreader/spot_text/runner_base.py +++ b/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, From 435b36fae7f7b9b38a0723a7f4ed68ed823692ad Mon Sep 17 00:00:00 2001 From: Rosie Wood Date: Mon, 2 Jun 2025 16:08:14 +0100 Subject: [PATCH 2/4] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 00703f9d..0e88a520 100644 --- a/setup.py +++ b/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", ], From 17b847008729ffc65fb7d42e8b92c01f1afc2044 Mon Sep 17 00:00:00 2001 From: Rosie Wood Date: Mon, 2 Jun 2025 19:51:47 +0100 Subject: [PATCH 3/4] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0e88a520..345544be 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ "pytest<9.0.0", "pytest-cov>=4.1.0,<6.0.0", "timm<1.0.0", - "transformers=<4.51.3, !=4.50.0", + "transformers<4.51.3, !=4.50.0", "black>=23.7.0,<25.0.0", "flake8>=6.0.0,<8.0.0", ], From 698774a6d245469eecdd7f14df95d5f3e0b0167d Mon Sep 17 00:00:00 2001 From: Rosie Wood Date: Tue, 3 Jun 2025 07:04:27 +0100 Subject: [PATCH 4/4] Update changelog.yml --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index af185c50..a23c02c8 100644 --- a/.github/workflows/changelog.yml +++ b/.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: