Skip to content

Commit c99b06e

Browse files
committed
Merge branch 'trs/dev/types-boto3-s3'
2 parents 151f98d + b1c2ceb commit c99b06e

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ development source code and as such may not be routinely kept up to date.
1313

1414
# __NEXT__
1515

16+
## Bug fixes
17+
18+
* The dependency on `types-boto3-s3` is now development-only (the `dev` extra).
19+
This eases Conda packaging and is consistent with dev-only dependencies on
20+
other type definition packages.
21+
([#485](https://github.com/nextstrain/cli/pull/485))
22+
1623

1724
# 10.4.0 (13 October 2025)
1825

doc/changes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ development source code and as such may not be routinely kept up to date.
1616
(v-next)=
1717
## __NEXT__
1818

19+
(v-next-bug-fixes)=
20+
### Bug fixes
21+
22+
* The dependency on `types-boto3-s3` is now development-only (the `dev` extra).
23+
This eases Conda packaging and is consistent with dev-only dependencies on
24+
other type definition packages.
25+
([#485](https://github.com/nextstrain/cli/pull/485))
26+
1927

2028
(v10-4-0)=
2129
## 10.4.0 (13 October 2025)

nextstrain/cli/types.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import builtins
77
import sys
88
from pathlib import Path
9-
from typing import Callable, Iterable, List, Mapping, Optional, Protocol, Tuple, Union, TYPE_CHECKING, runtime_checkable
9+
from typing import Any, Callable, Iterable, List, Mapping, Optional, Protocol, Tuple, Union, TYPE_CHECKING, runtime_checkable
1010
# TODO: Use typing.TypeAlias once Python 3.10 is the minimum supported version.
1111
from typing_extensions import TypeAlias
1212

@@ -49,7 +49,11 @@
4949
UpdateStatus = Optional[bool]
5050

5151
# Re-export boto3 S3 resource types we use for convenience.
52-
from types_boto3_s3.service_resource import Bucket as S3Bucket, Object as S3Object # noqa: F401 (for re-export)
52+
if TYPE_CHECKING:
53+
from types_boto3_s3.service_resource import Bucket as S3Bucket, Object as S3Object # noqa: F401 (for re-export)
54+
else:
55+
S3Bucket = Any
56+
S3Object = Any
5357

5458

5559
@runtime_checkable

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ def find_namespaced_packages(namespace):
100100
"pyparsing >=3.0.0",
101101
"pyyaml >=5.3.1",
102102
"requests",
103-
"types-boto3-s3",
104103
"typing_extensions >=3.7.4",
105104
"wcmatch >=6.0",
106105
"wrapt",
@@ -154,6 +153,7 @@ def find_namespaced_packages(namespace):
154153
"sphinx-markdown-tables !=0.0.16",
155154
"sphinx_rtd_theme",
156155
"types-boto3",
156+
"types-boto3-s3",
157157
"types-botocore",
158158

159159
# Only necessary for urllib3 <2.0.0, which we only have to use on

0 commit comments

Comments
 (0)