Fix failing GitHub Actions

Temporary workaround for https://pyup.io/v/51457/f17

.pre-commit-config.yaml

@@ -7,17 +7,8 @@
 #   python: python3.10
 
 repos:
-  #- repo: local
-  #  hooks:
-  #    - id: make-lint-diff
-  #      name: make lint-diff
-  #      entry: bash -c 'git diff master -U0 | ./scripts/flake8-diff.sh'
-  #      language: python
-  #      additional_dependencies:
-  #        - flake8
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-builtin-literals
       - id: check-executables-have-shebangs
@@ -40,7 +31,7 @@ repos:
     rev: 22.10.0
     hooks:
       - id: black
-        language_version: python3  # Should be a command that runs python3.6+
+        language_version: python3
         args:
           - --diff
           - --skip-string-normalization
@@ -50,8 +41,8 @@ repos:
     hooks:
       - id: codespell  # See setup.cfg for args
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
@@ -67,7 +58,7 @@ repos:
           - --profile=black
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.990
+    rev: v0.991
     hooks:
       - id: mypy
         additional_dependencies:
@@ -80,7 +71,7 @@ repos:
           - types-urllib3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args:

internetarchive/cli/ia_download.py

@@ -107,11 +107,11 @@ def main(argv, session: ArchiveSession) -> None:
     try:
         args = s.validate(args)
         if args['--glob'] and args['--format']:
-            raise(SchemaError(None, '--glob and --format cannot be used together.'))
+            raise SchemaError(None, '--glob and --format cannot be used together.')
         elif args['--exclude'] and args['--format']:
-            raise(SchemaError(None, '--exclude and --format cannot be used together.'))
+            raise SchemaError(None, '--exclude and --format cannot be used together.')
         elif args['--exclude'] and not args['--glob']:
-            raise(SchemaError(None, '--exclude should only be used in conjunction with --glob.'))
+            raise SchemaError(None, '--exclude should only be used in conjunction with --glob.')
 
     except SchemaError as exc:
         print(f'{exc}\n{printable_usage(__doc__)}', file=sys.stderr)

internetarchive/cli/ia_search.py

@@ -57,20 +57,27 @@
 
 
 def main(argv, session: ArchiveSession | None = None) -> None:
+    session = session or ArchiveSession()
     args = docopt(__doc__, argv=argv)
 
     # Validate args.
-    s = Schema({
-        str: Use(bool),
-        '<query>': Use(lambda x: ' '.join(x)),
-        '--parameters': Use(lambda x: get_args_dict(x, query_string=True)),
-        '--header': Or(None, And(Use(get_args_dict), dict),
-                       error='--header must be formatted as --header="key:value"'),
-        '--sort': list,
-        '--field': list,
-        '--timeout': Use(lambda x: float(x[0]),
-                         error='--timeout must be integer or float.')
-    })
+    s = Schema(
+        {
+            str: Use(bool),
+            '<query>': Use(lambda x: ' '.join(x)),
+            '--parameters': Use(lambda x: get_args_dict(x, query_string=True)),
+            '--header': Or(
+                None,
+                And(Use(get_args_dict), dict),
+                error='--header must be formatted as --header="key:value"',
+            ),
+            '--sort': list,
+            '--field': list,
+            '--timeout': Use(
+                lambda x: float(x[0]), error='--timeout must be integer or float.'
+            ),
+        }
+    )
     try:
         args = s.validate(args)
     except SchemaError as exc:
@@ -86,13 +93,15 @@ def main(argv, session: ArchiveSession | None = None) -> None:
         'timeout': args['--timeout'],
     }
 
-    search = session.search_items(args['<query>'],  # type: ignore
-                                  fields=fields,
-                                  sorts=sorts,
-                                  params=args['--parameters'],
-                                  full_text_search=args['--fts'],
-                                  dsl_fts=args['--dsl-fts'],
-                                  request_kwargs=r_kwargs)
+    search = session.search_items(
+        args['<query>'],
+        fields=fields,
+        sorts=sorts,
+        params=args['--parameters'],
+        full_text_search=args['--fts'],
+        dsl_fts=args['--dsl-fts'],
+        request_kwargs=r_kwargs,
+    )
 
     try:
         if args['--num-found']:
@@ -110,12 +119,17 @@ def main(argv, session: ArchiveSession | None = None) -> None:
     except ValueError as e:
         print(f'error: {e}', file=sys.stderr)
     except ConnectTimeout as exc:
-        print('error: Request timed out. Increase the --timeout and try again.',
-              file=sys.stderr)
+        print(
+            'error: Request timed out. Increase the --timeout and try again.',
+            file=sys.stderr,
+        )
         sys.exit(1)
     except ReadTimeout as exc:
-        print('error: The server timed out and failed to return all search results,'
-              ' please try again', file=sys.stderr)
+        print(
+            'error: The server timed out and failed to return all search results,'
+            ' please try again',
+            file=sys.stderr,
+        )
         sys.exit(1)
     except AuthenticationError as exc:
         print(f'error: {exc}', file=sys.stderr)

internetarchive/cli/ia_upload.py

@@ -64,10 +64,10 @@
 import csv
 import os
 import sys
-from pathlib import Path
 import webbrowser
 from copy import deepcopy
 from locale import getpreferredencoding
+from pathlib import Path
 from tempfile import TemporaryFile
 
 from docopt import docopt, printable_usage
@@ -146,8 +146,8 @@ def main(argv, session):  # noqa: C901
         '--header': Or(None, And(Use(get_args_dict), dict),
                        error='--header must be formatted as --header="key:value"'),
         '--retries': Use(lambda x: int(x[0]) if x else 0),
-        '--sleep': Use(lambda l: int(l[0]), error='--sleep value must be an integer.'),
-        '--size-hint': Or(Use(lambda l: str(l[0]) if l else None), int, None,
+        '--sleep': Use(lambda lst: int(lst[0]), error='--sleep value must be an integer.'),
+        '--size-hint': Or(Use(lambda lst: str(lst[0]) if lst else None), int, None,
                           error='--size-hint value must be an integer.'),
         '--status-check': bool,
     })

internetarchive/files.py

@@ -37,7 +37,7 @@
     ReadTimeout,
     RetryError,
 )
-from tqdm import tqdm
+from tqdm.auto import tqdm
 
 from internetarchive import auth, iarequest, utils