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

Jump to bottom

Support minio 6 #94

Merged
merged 5 commits into from
Aug 6, 2020
Merged

Support minio 6 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c611c5
adjust to new minio api changes
Aug 5, 2020
4f910d7
new minio
Aug 5, 2020
145971e
more minio API changes
Aug 5, 2020
f9c3246
even more minio API changes
Aug 5, 2020
cec0996
those API changes are not backward compatible
Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions anonlinkclient/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
from clkhash.schema import SchemaError, validate_schema_dict, convert_to_latest_version
from minio import Minio
from .progress import Progress
from minio.credentials import Credentials, Chain, Static
from minio.credentials.file_aws_credentials import FileAWSCredentials
from minio.credentials import Credentials, Chain, Static, FileAWSCredentials

from .rest_client import ClientWaitingConfiguration, ServiceError, format_run_status, RestClient

Expand Down Expand Up @@ -406,7 +405,7 @@ def upload(clk_json, project, apikey, output, blocks, server, retry_multiplier,
object_store_credential_providers.append(
Static(access_key=credentials['AccessKeyId'],
secret_key=credentials['SecretAccessKey'],
token=credentials['SessionToken']))
session_token=credentials['SessionToken']))


mc = Minio(
Expand Down
4 changes: 2 additions & 2 deletions anonlinkclient/progress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import time
from threading import Thread

from minio.compat import queue, queue_empty
from queue import Queue, Empty

_BAR_SIZE = 20
_KILOBYTE = 1024
Expand Down Expand Up @@ -68,7 +68,7 @@ def __init__(self, interval=1, stdout=sys.stdout):
self.last_printed_len = 0
self.current_size = 0

self.display_queue = queue()
self.display_queue = Queue()
self.initial_time = time.time()
self.stdout = stdout
self.start()
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ click == 7.1.2
clkhash == 0.16.0b1
jsonschema == 3.2.0
numpy == 1.19.1
minio == 5.0.10
minio == 6.0.0
pandas == 1.1.0
pytest == 6.0.0
requests == 2.24.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"clkhash >= 0.16.0b1",
"jsonschema >= 3.2.0",
"requests >= 2.22.0",
"minio >= 5.0.10",
"minio >= 6.0.0",
"bashplotlib >= 0.6.5",
"retrying>=1.3.3",
]
Expand Down