diff --git a/.github/workflows/joss-draft-pdf.yml b/.github/workflows/joss-draft-pdf.yml index eecf0d13..76fdc926 100644 --- a/.github/workflows/joss-draft-pdf.yml +++ b/.github/workflows/joss-draft-pdf.yml @@ -14,7 +14,7 @@ jobs: # This should be the path to the paper within your repo. paper-path: paper/paper.md - name: Upload - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: paper # This is the output path where Pandoc will write the compiled diff --git a/mapreader/classify/classifier.py b/mapreader/classify/classifier.py index 925f4dc6..9ae67b39 100644 --- a/mapreader/classify/classifier.py +++ b/mapreader/classify/classifier.py @@ -25,10 +25,6 @@ from .datasets import PatchDataset -# import pickle -# from tqdm.autonotebook import tqdm -# from torch.nn.modules.module import _addindent - class ClassifierContainer: """ diff --git a/mapreader/download/sheet_downloader.py b/mapreader/download/sheet_downloader.py index 6b860a1a..d4af0a79 100644 --- a/mapreader/download/sheet_downloader.py +++ b/mapreader/download/sheet_downloader.py @@ -18,7 +18,7 @@ from pyproj.crs import CRS from shapely.geometry import LineString, Point, Polygon, shape from shapely.ops import unary_union -from tqdm.auto import tqdm +from tqdm.autonotebook import tqdm from .downloader_utils import get_grid_bb_from_polygon, get_polygon_from_grid_bb from .tile_loading import DEFAULT_TEMP_FOLDER, TileDownloader diff --git a/mapreader/download/tile_loading.py b/mapreader/download/tile_loading.py index 40f257e8..e1fbe7c0 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 import tqdm +from tqdm.autonotebook import tqdm from .data_structures import GridBoundingBox, GridIndex diff --git a/mapreader/download/tile_merging.py b/mapreader/download/tile_merging.py index b26db605..bcb7671e 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 import tqdm +from tqdm.autonotebook 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 3d62acee..b6c9c8ee 100644 --- a/mapreader/load/images.py +++ b/mapreader/load/images.py @@ -24,7 +24,7 @@ from rasterio.plot import reshape_as_raster from shapely import wkt from shapely.geometry import Polygon, box -from tqdm.auto import tqdm +from tqdm.autonotebook 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 b92a35f4..75a2281b 100644 --- a/mapreader/process/context_post_process.py +++ b/mapreader/process/context_post_process.py @@ -5,7 +5,7 @@ from itertools import product import pandas as pd -from tqdm import tqdm +from tqdm.autonotebook import tqdm class ContextPostProcessor: diff --git a/mapreader/process/occlusion_analysis.py b/mapreader/process/occlusion_analysis.py index 82930711..97a0f343 100644 --- a/mapreader/process/occlusion_analysis.py +++ b/mapreader/process/occlusion_analysis.py @@ -11,7 +11,7 @@ from PIL import Image from torch import nn from torchvision import transforms -from tqdm import tqdm +from tqdm.autonotebook import tqdm class OcclusionAnalyzer: diff --git a/mapreader/spot_text/runner_base.py b/mapreader/spot_text/runner_base.py index 936923c1..5cb0dfe5 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.auto import tqdm +from tqdm.autonotebook import tqdm class Runner: