mapreader 1.4.0__tar.gz → 1.5.1__tar.gz

{mapreader-1.4.0 → mapreader-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.4.0
+Version: 1.5.1
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch>=1.10.0
-Requires-Dist: torchvision<0.17.3,>=0.11.1
+Requires-Dist: torch<=2.2.2,>=1.10.0
+Requires-Dist: torchvision<=0.17.2,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-12T19:16:25+0100",
+ "date": "2024-10-30T15:17:42+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "2651e3de148e0069aa93151268b18534108dbe91",
- "version": "1.4.0"
+ "full-revisionid": "84e07090b5fcf274c83ab845faba8a999182927e",
+ "version": "1.5.1"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/download/sheet_downloader.py

@@ -13,7 +13,7 @@ import matplotlib.image as mpimg
 import matplotlib.pyplot as plt
 import pandas as pd
 from shapely.geometry import LineString, Point, Polygon
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from mapreader.utils.load_frames import load_from_geojson
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/download/tile_loading.py

@@ -6,7 +6,7 @@ import os
 import urllib.request
 
 from joblib import Parallel, delayed
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from .data_structures import GridBoundingBox, GridIndex
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/download/tile_merging.py

@@ -5,7 +5,7 @@ import logging
 import os
 
 from PIL import Image
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from .data_structures import GridBoundingBox, GridIndex
 from .tile_loading import DEFAULT_IMG_DOWNLOAD_FORMAT, DEFAULT_TEMP_FOLDER

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/load/images.py

@@ -24,7 +24,7 @@ from PIL import Image, ImageOps, ImageStat
 from pyproj import Transformer
 from rasterio.plot import reshape_as_raster
 from shapely.geometry import box
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from mapreader.download.data_structures import GridBoundingBox, GridIndex
 from mapreader.download.downloader_utils import get_polygon_from_grid_bb

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/process/context_post_process.py

@@ -7,7 +7,7 @@ from itertools import product
 
 import geopandas as gpd
 import pandas as pd
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from mapreader.utils.load_frames import load_from_csv, load_from_geojson
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/process/occlusion_analysis.py

@@ -13,7 +13,7 @@ import torch
 from PIL import Image
 from torch import nn
 from torchvision import transforms
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from mapreader.utils.load_frames import load_from_csv, load_from_geojson
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/spot_text/deepsolo_runner.py

@@ -4,27 +4,21 @@ import pathlib
 import pickle
 
 try:
-    import adet
+    from detectron2.engine import DefaultPredictor
+except ImportError:
+    raise ImportError("[ERROR] Please install Detectron2")
+
+try:
+    import deepsolo  # noqa
 except ImportError:
     raise ImportError(
-        "[ERROR] Please install DeepSolo from the following link: https://github.com/rwood-97/DeepSolo"
+        "[ERROR] Please install DeepSolo from the following link: https://github.com/maps-as-data/DeepSolo"
     )
 
 import geopandas as gpd
 import pandas as pd
 import torch
-from adet.config import get_cfg
-
-try:
-    from detectron2.engine import DefaultPredictor
-except ImportError:
-    raise ImportError("[ERROR] Please install Detectron2")
-
-# first assert we are using the deep solo version of adet
-if adet.__version__ != "0.2.0-deepsolo":
-    raise ImportError(
-        "[ERROR] Please install DeepSolo from the following link: https://github.com/rwood-97/DeepSolo"
-    )
+from deepsolo.config import get_cfg
 
 from .rec_runner_base import RecRunner
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/spot_text/dptext_detr_runner.py

@@ -3,31 +3,24 @@ from __future__ import annotations
 import pathlib
 
 try:
-    import adet
+    from detectron2.engine import DefaultPredictor
+except ImportError:
+    raise ImportError("[ERROR] Please install Detectron2")
+
+try:
+    import dptext_detr  # noqa
 except ImportError:
     raise ImportError(
-        "[ERROR] Please install DPText-DETR from the following link: https://github.com/rwood-97/DPText-DETR"
+        "[ERROR] Please install DPText-DETR from the following link: https://github.com/maps-as-data/DPText-DETR"
     )
 
 import geopandas as gpd
 import numpy as np
 import pandas as pd
 import torch
-from adet.config import get_cfg
-
-try:
-    from detectron2.engine import DefaultPredictor
-except ImportError:
-    raise ImportError("[ERROR] Please install Detectron2")
-
+from dptext_detr.config import get_cfg
 from shapely import MultiPolygon, Polygon
 
-# first assert we are using the dptext detr version of adet
-if adet.__version__ != "0.2.0-dptext-detr":
-    raise ImportError(
-        "[ERROR] Please install DPText-DETR from the following link: https://github.com/rwood-97/DPText-DETR"
-    )
-
 from .runner_base import Runner
 
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/spot_text/maptext_runner.py

@@ -4,29 +4,21 @@ import pathlib
 import pickle
 
 try:
-    import adet
+    from detectron2.engine import DefaultPredictor
+except ImportError:
+    raise ImportError("[ERROR] Please install Detectron2")
+
+try:
+    import maptextpipeline  # noqa
 except ImportError:
     raise ImportError(
-        "[ERROR] Please install DeepSolo from the following link: https://github.com/rwood-97/DeepSolo"
+        "[ERROR] Please install MapTextPipeline from the following link: https://github.com/maps-as-data/MapTextPipeline"
     )
 
 import geopandas as gpd
 import pandas as pd
 import torch
-from adet.config import get_cfg
-
-try:
-    from detectron2.engine import DefaultPredictor
-except ImportError:
-    raise ImportError("[ERROR] Please install Detectron2")
-
-from adet.utils.vitae_predictor import ViTAEPredictor
-
-# first assert we are using the deep solo version of adet
-if adet.__version__ != "0.2.0-maptextpipeline":
-    raise ImportError(
-        "[ERROR] Please install MapTextPipeline from the following link: https://github.com/rwood-97/MapTextPipeline"
-    )
+from maptextpipeline.config import get_cfg
 
 from .rec_runner_base import RecRunner
 
@@ -375,6 +367,8 @@ class MapTextRunner(RecRunner):
 
         # setup the predictor
         if "vitae" in cfg.MODEL.BACKBONE.NAME.lower():
+            from maptextpipeline.utils.vitae_predictor import ViTAEPredictor
+
             self.predictor = ViTAEPredictor(cfg)
         self.predictor = DefaultPredictor(cfg)
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader/spot_text/runner_base.py

@@ -12,7 +12,7 @@ import numpy as np
 import pandas as pd
 from PIL import Image
 from shapely import Polygon
-from tqdm.autonotebook import tqdm
+from tqdm.auto import tqdm
 
 from mapreader.utils.load_frames import load_from_csv, load_from_geojson
 

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.4.0
+Version: 1.5.1
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch>=1.10.0
-Requires-Dist: torchvision<0.17.3,>=0.11.1
+Requires-Dist: torch<=2.2.2,>=1.10.0
+Requires-Dist: torchvision<=0.17.2,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0

{mapreader-1.4.0 → mapreader-1.5.1}/mapreader.egg-info/requires.txt

@@ -8,8 +8,8 @@ Shapely<3.0.0,>=2.0.0
 nest-asyncio<2.0.0,>=1.5.1
 scikit-image>=0.18.3
 scikit-learn<2.0.0,>=1.0.1
-torch>=1.10.0
-torchvision<0.17.3,>=0.11.1
+torch<=2.2.2,>=1.10.0
+torchvision<=0.17.2,>=0.11.1
 jupyter<2.0.0,>=1.0.0
 ipykernel<7.0.0,>=6.5.1
 ipywidgets<9.0.0,>=8.0.0

{mapreader-1.4.0 → mapreader-1.5.1}/setup.py

@@ -38,8 +38,8 @@ setuptools.setup(
         "nest-asyncio>=1.5.1,<2.0.0",
         "scikit-image>=0.18.3",
         "scikit-learn>=1.0.1,<2.0.0",
-        "torch>=1.10.0",
-        "torchvision>=0.11.1,<0.17.3",
+        "torch>=1.10.0,<=2.2.2",
+        "torchvision>=0.11.1,<=0.17.2",
         "jupyter>=1.0.0,<2.0.0",
         "ipykernel>=6.5.1,<7.0.0",
         "ipywidgets>=8.0.0,<9.0.0",