From 5aa80267d6a55eaccf79aef4397ae4d978a8b3b0 Mon Sep 17 00:00:00 2001 From: allegroai <> Date: Mon, 10 Jul 2023 11:20:27 +0300 Subject: [PATCH] Version bump to v1.11.2rc0 Small refactoring --- clearml/storage/helper.py | 6 +++--- clearml/storage/util.py | 4 ++-- clearml/version.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clearml/storage/helper.py b/clearml/storage/helper.py index d6ab2ba2..2d3f3fde 100644 --- a/clearml/storage/helper.py +++ b/clearml/storage/helper.py @@ -2414,7 +2414,7 @@ class StorageHelper(object): if self.scheme in StorageHelper._quotable_uri_schemes: # TODO: fix-driver-schema # quote link - result_dest_path = quote_url(result_dest_path) + result_dest_path = quote_url(result_dest_path, StorageHelper._quotable_uri_schemes) return result_dest_path @@ -2436,7 +2436,7 @@ class StorageHelper(object): # quote link def callback(result): - return a_cb(quote_url(result_path) if result else result) + return a_cb(quote_url(result_path, StorageHelper._quotable_uri_schemes) if result else result) # replace callback with wrapper cb = callback @@ -2463,7 +2463,7 @@ class StorageHelper(object): retries=retries, return_canonized=return_canonized) if res: - result_path = quote_url(result_path) + result_path = quote_url(result_path, StorageHelper._quotable_uri_schemes) return result_path def list(self, prefix=None, with_metadata=False): diff --git a/clearml/storage/util.py b/clearml/storage/util.py index c1523fbd..b3c13262 100644 --- a/clearml/storage/util.py +++ b/clearml/storage/util.py @@ -42,9 +42,9 @@ def get_config_object_matcher(**patterns): return _matcher -def quote_url(url): +def quote_url(url, valid_schemes=("http", "https")): parsed = urlparse(url) - if parsed.scheme not in ("http", "https"): + if parsed.scheme not in valid_schemes: return url parsed = parsed._replace(path=quote(parsed.path)) return urlunparse(parsed) diff --git a/clearml/version.py b/clearml/version.py index 522ba08c..aab78e83 100644 --- a/clearml/version.py +++ b/clearml/version.py @@ -1 +1 @@ -__version__ = '1.11.1' +__version__ = '1.11.2rc0'