Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make botocore an optional test dependency #2768

Merged
merged 3 commits into from
Jan 28, 2025
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
1 change: 1 addition & 0 deletions changes/2768.bugfix.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated the optional test dependencies to include ``botocore`` and ``fsspec``.
2 changes: 2 additions & 0 deletions changes/2768.bugfix.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed the fsspec tests to skip if ``botocore`` is not installed.
Previously they would have failed with an import error.
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ test = [
"coverage",
"pytest",
"pytest-cov",
'zarr[remote]',
"botocore",
"s3fs",
"moto[s3,server]",
"pytest-asyncio",
"pytest-accept",
"moto[s3,server]",
"requests",
"rich",
"mypy",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_store/test_fsspec.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from typing import TYPE_CHECKING

import pytest
from botocore.session import Session
from packaging.version import parse as parse_version

import zarr.api.asynchronous
Expand All @@ -26,6 +25,7 @@
requests = pytest.importorskip("requests")
moto_server = pytest.importorskip("moto.moto_server.threaded_moto_server")
moto = pytest.importorskip("moto")
botocore = pytest.importorskip("botocore")

# ### amended from s3fs ### #
test_bucket_name = "test"
Expand All @@ -52,7 +52,7 @@ def s3_base() -> Generator[None, None, None]:

def get_boto3_client() -> botocore.client.BaseClient:
# NB: we use the sync botocore client for setup
session = Session()
session = botocore.session.Session()
return session.create_client("s3", endpoint_url=endpoint_url)


Expand Down