Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ filetype
Flask
frozendict>=2.4.0
gitpython
gdown
gdown < 6 ; python_version < '3.10'
gdown >= 6 ; python_version >= '3.10'
httpx>=0.22.0
importlib_metadata ; python_version < '3.8'
importlib_resources ; python_version < '3.10'
Expand Down
2 changes: 1 addition & 1 deletion src/ocrd/resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

# pylint: enable=wrong-import-position

from ocrd_validators import OcrdResourceListValidator

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, macos-latest)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, macos-latest)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, macos-latest)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 33 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, macos-latest)

E402

module level import not at top of file
from ocrd_utils import getLogger, directory_size, get_moduledir, guess_media_type, config

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, macos-latest)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, macos-latest)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, macos-latest)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 34 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, macos-latest)

E402

module level import not at top of file
from ocrd_utils.constants import RESOURCES_DIR_SYSTEM, RESOURCE_TYPES, MIME_TO_EXT

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, macos-latest)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, macos-latest)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.12, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.9, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, macos-latest)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.11, ubuntu-22.04)

E402

module level import not at top of file

Check failure on line 35 in src/ocrd/resource_manager.py

View workflow job for this annotation

GitHub Actions / build (3.10, macos-latest)

E402

module level import not at top of file
from ocrd_utils.os import get_processor_resource_types, is_git_url, list_all_resources, pushd_popd, get_ocrd_tool_json
from .constants import RESOURCE_USER_LIST_COMMENT

Expand Down Expand Up @@ -289,7 +289,7 @@
def _download_impl(log: Logger, url: str, filename):
log.info(f"Downloading {url} to {filename}")
try:
gdrive_file_id, is_gdrive_download_link = gparse_url(url, warning=False)
gdrive_file_id, is_gdrive_download_link = gparse_url(url)
if gdrive_file_id:
if not is_gdrive_download_link:
url = f"https://drive.google.com/uc?id={gdrive_file_id}"
Expand Down
Loading