Bump wrapt to version 2

Version 2 renames ObjectProxy to BaseObjectProxy. It also adds a type
stubs file, but only defines types for Python >=3.10. Since Pyright is
configured to target 3.8, a comment is added to ignore the error caused
by lack of type definitions.

https://wrapt.readthedocs.io/en/latest/changes.html#version-2-0-0

Author: victorlin

CHANGES.md

@@ -26,6 +26,9 @@ development source code and as such may not be routinely kept up to date.
 
 ## Bug fixes
 
+* Updated code to support the latest version of `wrapt`, used to show
+  `--dry-run` outputs.
+  ([#499](https://github.com/nextstrain/cli/pull/499))
 * Updated the dependency list to explicitly include `boto3`, used for various
   commands.
   ([#499](https://github.com/nextstrain/cli/pull/499))

doc/changes.md

@@ -31,6 +31,9 @@ development source code and as such may not be routinely kept up to date.
 (v-next-bug-fixes)=
 ### Bug fixes
 
+* Updated code to support the latest version of `wrapt`, used to show
+  `--dry-run` outputs.
+  ([#499](https://github.com/nextstrain/cli/pull/499))
 * Updated the dependency list to explicitly include `boto3`, used for various
   commands.
   ([#499](https://github.com/nextstrain/cli/pull/499))

nextstrain/cli/console.py

@@ -6,7 +6,7 @@
 from contextlib import contextmanager, ExitStack, redirect_stdout, redirect_stderr
 from functools import wraps
 from typing import Callable, TextIO
-from wrapt import ObjectProxy
+from wrapt import BaseObjectProxy # pyright: ignore[reportAttributeAccessIssue]
 
 
 def auto_dry_run_indicator(getter: Callable[..., bool] = lambda opts, *args, **kwargs: opts.dry_run):
@@ -83,7 +83,7 @@ def dry_run_indicator(dry_run: bool = False):
         yield dry_run
 
 
-class LinePrefixer(ObjectProxy): # pyright: ignore[reportUntypedBaseClass]
+class LinePrefixer(BaseObjectProxy): # pyright: ignore[reportUntypedBaseClass]
     """
     Add *prefix* to every line written to *file*.
 

setup.py

@@ -102,7 +102,7 @@ def find_namespaced_packages(namespace):
         "requests",
         "typing_extensions >=3.7.4",
         "wcmatch >=6.0",
-        "wrapt <2.0.0",
+        "wrapt >=2.0.0",
 
         # We use fsspec's S3 support, which has a runtime dep on s3fs.  s3fs
         # itself requires aiobotocore, which in turn requires very specific