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.

Sign up for GitHub

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

restore AbstractBaseClass inheritance #832

Merged
merged 4 commits into from
Oct 1, 2024
Merged

restore AbstractBaseClass inheritance #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5de13bf
restore AbstractBaseClass inheritance
itcarroll Oct 1, 2024
b070f17
restore type and docs
itcarroll Oct 1, 2024
7702639
Mark re-broken unit test as expected fail
mfisher87 Oct 1, 2024
fb78806
Fix misspelled class name
mfisher87 Oct 1, 2024
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
7 changes: 0 additions & 7 deletions docs/user-reference/store/earthaccessfile.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion earthaccess/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def download(
def open(
granules: Union[List[str], List[DataGranule]],
provider: Optional[str] = None,
) -> List[EarthAccessFile]:
) -> List[AbstractFileSystem]:
"""Returns a list of file-like objects that can be used to access files
hosted on S3 or HTTPS by third party libraries like xarray.

Expand Down
6 changes: 3 additions & 3 deletions earthaccess/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
logger = logging.getLogger(__name__)


class EarthAccessFile:
class EarthAccessFile(fsspec.spec.AbstractBufferedFile):
"""Handle for a file-like object pointing to an on-prem or Earthdata Cloud granule."""

def __init__(
Expand Down Expand Up @@ -64,7 +64,7 @@ def _open_files(
url_mapping: Mapping[str, Union[DataGranule, None]],
fs: fsspec.AbstractFileSystem,
threads: Optional[int] = 8,
) -> List[EarthAccessFile]:
) -> List[fsspec.spec.AbstractBufferedFile]:
def multi_thread_open(data: tuple) -> EarthAccessFile:
urls, granule = data
return EarthAccessFile(fs.open(urls), granule)
Expand Down Expand Up @@ -336,7 +336,7 @@ def open(
self,
granules: Union[List[str], List[DataGranule]],
provider: Optional[str] = None,
) -> List[EarthAccessFile]:
) -> List[fsspec.spec.AbstractBufferedFile]:
"""Returns a list of file-like objects that can be used to access files
hosted on S3 or HTTPS by third party libraries like xarray.

Expand Down
1 change: 0 additions & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ nav:
- "Granule Queries": "user-reference/granules/granules-query.md"
- "Granule Results": "user-reference/granules/granules.md"
- Store:
- "EarthAccessFile": "user-reference/store/earthaccessfile.md"
- "Store": "user-reference/store/store.md"
- Auth:
- "Auth": "user-reference/auth/auth.md"
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ def test_store_can_create_s3_fsspec_session(self):
return None


@pytest.mark.xfail(
reason="This test reproduces a bug (#610) which has not yet been fixed."
)
def test_earthaccess_file_getattr():
fs = fsspec.filesystem("memory")
with fs.open("/foo", "wb") as f:
Expand Down
Loading