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

Build(deps): Bump s3path from 0.4.2 to 0.5.0 #1525

Merged
merged 6 commits into from
Aug 23, 2023
Merged

Build(deps): Bump s3path from 0.4.2 to 0.5.0 #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5b2f97
Build(deps): Bump s3path from 0.4.2 to 0.5.0
dependabot[bot] Aug 21, 2023
9c4012d
Merge branch 'main' into dependabot/pip/s3path-0.5.0
cooperlees Aug 21, 2023
c91dd0b
Merge branch 'main' into dependabot/pip/s3path-0.5.0
cooperlees Aug 21, 2023
cf2aced
Pull private type to type our generator
cooperlees Aug 22, 2023
4220d01
Fix import order ...
cooperlees Aug 22, 2023
60a3899
Merge branch 'main' into dependabot/pip/s3path-0.5.0
cooperlees Aug 22, 2023
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
2 changes: 1 addition & 1 deletion requirements_s3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ boto3==1.28.26
botocore==1.31.26
jmespath==1.0.1
python-dateutil==2.8.2
s3path==0.4.2
s3path==0.5.0
s3transfer==0.6.2
six==1.16.0
smart-open==6.3.0
Expand Down
6 changes: 3 additions & 3 deletions src/bandersnatch_storage_plugins/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import boto3
import filelock
from botocore.client import Config
from s3path import PureS3Path, S3DirEntry
from s3path import PureS3Path
from s3path import S3Path as _S3Path
from s3path import register_configuration_parameter
from s3path import _S3DirEntry, register_configuration_parameter

from bandersnatch.storage import PATH_TYPES, StoragePlugin

Expand Down Expand Up @@ -332,7 +332,7 @@ def mkdir(
path = self.PATH_BACKEND(path)
path.joinpath(self.PATH_BACKEND.keep_file).touch()

def scandir(self, path: PATH_TYPES) -> Generator[S3DirEntry, None, None]:
def scandir(self, path: PATH_TYPES) -> Generator[_S3DirEntry, None, None]:
"""Read entries from the provided directory"""
if not isinstance(path, self.PATH_BACKEND):
path = self.PATH_BACKEND(path)
Expand Down