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

Allow later versions of s3fs #26

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Allow later versions of s3fs #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1dc9cc
Allow later versions of s3fs
reweeden Oct 9, 2024
8d88676
Bump version number
reweeden Oct 9, 2024
0b540ec
Update dev dependencies
reweeden Oct 9, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ A generic framework for writing satellite data ingest systems
## Installing
Mandible can be installed from GitHub using `pip`.
```
$ pip install git+https://github.com/asfadmin/mandible@v0.2.0
$ pip install git+https://github.com/asfadmin/mandible@v0.7.1
```

To install with all extra dependencies:
```
$ pip install git+https://github.com/asfadmin/mandible@v0.2.0#egg=mandible[all]
$ pip install git+https://github.com/asfadmin/mandible@v0.7.1#egg=mandible[all]
```

To install the latest development version:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "mandible"
version = "0.7.0"
version = "0.7.1"
description = "A generic framework for writing satellite data ingest systems"
authors = ["Rohan Weeden <[email protected]>", "Matt Perry <[email protected]>"]
license = "APACHE-2"
Expand All @@ -15,7 +15,7 @@ build-backend = "poetry.core.masonry.api"
python = ">=3.8"

# Required
s3fs = "^0.4.2"
s3fs = ">=0.4.2"

# Optional
h5py = { version = "^3.6.0", optional = true }
Expand All @@ -32,7 +32,7 @@ xml = ["lxml"]

[tool.poetry.group.dev.dependencies]
boto3 = "^1.18"
moto = "^4.0.1"
moto = "^5.0.0"
pytest = "^8.0.2"
pytest-cov = "^4.0.0"
pytest-mock = "^3.8.2"
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import boto3
import pytest
from moto import mock_s3
from moto import mock_aws


@pytest.fixture
Expand All @@ -18,7 +18,7 @@ def aws_credentials():

@pytest.fixture
def s3_resource(aws_credentials):
with mock_s3():
with mock_aws():
yield boto3.resource("s3")


Expand Down
9 changes: 6 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ python =
allowlist_externals = poetry
deps =
boto3~=1.18
moto~=4.0
pytest~=7.1
pytest-mock~=3.8.2
moto~=5.0
pytest~=8.1
pytest-mock~=3.8
jp14: jsonpath-ng~=1.4.0
jp15: jsonpath-ng~=1.5.0
jp16: jsonpath-ng~=1.6.0
# s3fs + moto breaks due to an issue with aiobotocore.
# https://github.com/aio-libs/aiobotocore/issues/755
s3fs~=0.4.2
extras =
Xnone:
Xall: all
Expand Down