Merge pull request #568 from maps-as-data/update_ci_cd

Update ci/cd to work with IIIFDownloader

Author: rwood-97

.github/workflows/mr_ci.yml

@@ -34,6 +34,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install ".[dev]"
+          python -m pip install 'git+https://github.com/rwood-97/piffle.git@iiif_dataclasses'
           python -m pip install pytest-cov
 
       - name: Quality Assurance

.github/workflows/mr_ci_text_spotting.yml

@@ -16,6 +16,7 @@ jobs:
     env:
       # point datasets to ~/.torch so it's cached by CI
       DETECTRON2_DATASETS: ~/.torch/datasets
+      PYTHONIOENCODING: utf-8
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -48,6 +49,7 @@ jobs:
           python -m pip install 'git+https://github.com/maps-as-data/DeepSolo.git'
           python -m pip install 'git+https://github.com/maps-as-data/DPText-DETR.git'
           python -m pip install 'git+https://github.com/maps-as-data/MapTextPipeline.git'
+          python -m pip install 'git+https://github.com/rwood-97/piffle.git@iiif_dataclasses'
 
 
       - name: Clone DPText-DETR

.github/workflows/mr_pip_ci.yml

@@ -36,6 +36,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install mapreader[dev]
+          python -m pip install 'git+https://github.com/rwood-97/piffle.git@iiif_dataclasses'
 
       - name: Quality Assurance
         run: |

CHANGELOG.md

@@ -14,6 +14,8 @@ The following table shows which versions of MapReader are compatible with which
 ## Pre-release
 _Add new changes here_
 
+### Added
+- Added tests for the `IIIFDownloader` class ([#568](https://github.com/maps-as-data/MapReader/pull/568))
 
 ## [v1.7.0](https://github.com/Living-with-machines/MapReader/releases/tag/v1.7.0) (2025-04-02)
 

…download/skipped_test_iiif_downloader.py …ts/test_download/test_iiif_downloader.pytests/test_download/skipped_test_iiif_downloader.py renamed to tests/test_download/test_iiif_downloader.py tests/test_download/skipped_test_iiif_downloader.py renamed to tests/test_download/test_iiif_downloader.py

@@ -108,15 +108,12 @@ def test_iiif_uris(mock_get_manifest):
         iiif_uris="https://annotations.allmaps.org/manifests/a0d6d3379cfd9f0a",
     )
     assert isinstance(downloader, IIIFDownloader)
-    assert (
-        downloader.iiif[0].id
-        == "https://annotations.allmaps.org/manifests/a0d6d3379cfd9f0a"
-    )
+    assert downloader.iiif[0].id is None
 
 
 def test_missing_id(mock_get_manifest):
-    with pytest.raises(ValueError, match="missing an 'id' field"):
-        IIIFDownloader("annotationpage3.json", 3)
+    iiif_downloader = IIIFDownloader("annotationpage3.json", 3)
+    assert isinstance(iiif_downloader, IIIFDownloader)  # we want it to load fine
 
 
 def test_save_georeferenced_maps(tmp_path, mock_get_manifest, mock_download_image):
@@ -167,17 +164,17 @@ def test_save_georeferenced_map_from_str(
             assert src.crs.to_epsg() == 4326
 
 
-def test_save_georeferenced_map_value_error(
-    tmp_path, mock_get_manifest, mock_download_image
-):
-    downloader = IIIFDownloader(
-        [],
-    )
-    with pytest.raises(ValueError, match="missing an 'id' field"):
-        downloader.save_georeferenced_map(
-            "annotationpage3.json",
-            path_save=tmp_path,
-        )
+# def test_save_georeferenced_map_value_error(
+#     tmp_path, mock_get_manifest, mock_download_image
+# ):
+#     downloader = IIIFDownloader(
+#         [],
+#     )
+#     with pytest.raises(ValueError, match="missing an 'id' field"):
+#         downloader.save_georeferenced_map(
+#             "annotationpage3_missing_id.json",
+#             path_save=tmp_path,
+#         )
 
 
 def test_save_maps(tmp_path, mock_download_image, mock_get_manifest):
@@ -238,15 +235,15 @@ def test_save_map_from_str(tmp_path, mock_download_image, mock_get_manifest):
     assert all([file in os.listdir(tmp_path) for file in files])
 
 
-def test_save_map_value_error(tmp_path, mock_download_image, mock_get_manifest):
-    downloader = IIIFDownloader(
-        [],
-    )
-    with pytest.raises(ValueError, match="missing an 'id' field"):
-        downloader.save_map(
-            "annotationpage3.json",
-            path_save=tmp_path,
-        )
+# def test_save_map_value_error(tmp_path, mock_download_image, mock_get_manifest):
+#     downloader = IIIFDownloader(
+#         [],
+#     )
+#     with pytest.raises(ValueError, match="missing an 'id' field"):
+#         downloader.save_map(
+#             "annotationpage3_missing_id.json",
+#             path_save=tmp_path,
+#         )
 
 
 def test_save_map_unknown_class_error(tmp_path, mock_download_image, mock_get_manifest):

tests/test_import.py

@@ -12,5 +12,5 @@ def test_import():
         PatchContextDataset,
         Downloader,
         SheetDownloader,
-        # IIIFDownloader,
+        IIIFDownloader,
     )