From 55bd2157de06e827f228751e6f60672cec639f7d Mon Sep 17 00:00:00 2001 From: Rosie Wood Date: Tue, 17 Sep 2024 09:43:48 +0100 Subject: [PATCH] use tqdm auto --- mapreader/download/sheet_downloader.py | 2 +- mapreader/download/tile_loading.py | 2 +- mapreader/download/tile_merging.py | 2 +- mapreader/load/images.py | 2 +- mapreader/process/context_post_process.py | 2 +- mapreader/process/occlusion_analysis.py | 2 +- mapreader/spot_text/runner_base.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mapreader/download/sheet_downloader.py b/mapreader/download/sheet_downloader.py index fe9f1531..ae2d6348 100644 --- a/mapreader/download/sheet_downloader.py +++ b/mapreader/download/sheet_downloader.py @@ -13,7 +13,7 @@ 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 diff --git a/mapreader/download/tile_loading.py b/mapreader/download/tile_loading.py index e1fbe7c0..2dc26244 100644 --- a/mapreader/download/tile_loading.py +++ b/mapreader/download/tile_loading.py @@ -6,7 +6,7 @@ import urllib.request from joblib import Parallel, delayed -from tqdm.autonotebook import tqdm +from tqdm.auto import tqdm from .data_structures import GridBoundingBox, GridIndex diff --git a/mapreader/download/tile_merging.py b/mapreader/download/tile_merging.py index fbfa50d5..7ff315be 100644 --- a/mapreader/download/tile_merging.py +++ b/mapreader/download/tile_merging.py @@ -5,7 +5,7 @@ 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 diff --git a/mapreader/load/images.py b/mapreader/load/images.py index 21b66f46..7edea170 100644 --- a/mapreader/load/images.py +++ b/mapreader/load/images.py @@ -24,7 +24,7 @@ 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 diff --git a/mapreader/process/context_post_process.py b/mapreader/process/context_post_process.py index 485a0e82..86eae4a4 100644 --- a/mapreader/process/context_post_process.py +++ b/mapreader/process/context_post_process.py @@ -7,7 +7,7 @@ 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 diff --git a/mapreader/process/occlusion_analysis.py b/mapreader/process/occlusion_analysis.py index 695df012..c91ab342 100644 --- a/mapreader/process/occlusion_analysis.py +++ b/mapreader/process/occlusion_analysis.py @@ -13,7 +13,7 @@ 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 diff --git a/mapreader/spot_text/runner_base.py b/mapreader/spot_text/runner_base.py index d7b2d736..3ea13dc9 100644 --- a/mapreader/spot_text/runner_base.py +++ b/mapreader/spot_text/runner_base.py @@ -12,7 +12,7 @@ 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