ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-06-26 18:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix python 2.7 support

Browse Source
This commit is contained in:
allegroai 2022-09-18 14:18:40 +03:00
parent 0c5d12b830
commit 59932e4f4c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clearml/backend_config/utils.py
View File

@ -1,7 +1,7 @@
import base64
import os
from os.path import expandvars, expanduser
from pathlib import Path
from pathlib2 import Path
from typing import List, TYPE_CHECKING
from ..utilities.pyhocon import HOCONConverter, ConfigTree

4
clearml/backend_interface/task/repo/scriptinfo.py
View File

@ -705,11 +705,13 @@ class ScriptInfo(object):
@classmethod
def _get_entry_point(cls, repo_root, script_path):
repo_root = Path(repo_root).absolute()
script_path = Path(script_path)
try:
# Use os.path.relpath as it calculates up dir movements (../)
entry_point = os.path.relpath(
str(os.path.realpath(script_path)), str(cls._get_working_dir(repo_root, return_abs=True)))
str(os.path.realpath(script_path.as_posix())),
str(cls._get_working_dir(repo_root, return_abs=True)))
except ValueError:
# Working directory not under repository root
entry_point = script_path.relative_to(repo_root)

3
clearml/backend_interface/task/task.py
View File

@ -2206,7 +2206,8 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
# make sure we have str as values:
for key in requirements.keys():
if requirements[key] and not isinstance(requirements[key], str):
# fix python2 support (str/unicode)
if requirements[key] and not isinstance(requirements[key], six.string_types):
requirements[key] = '\n'.join(requirements[key])
# protection, Old API might not support it

3
clearml/datasets/dataset.py
View File

@ -1558,7 +1558,8 @@ class Dataset(object):
raise ValueError("Dataset selection criteria not met. Didn't provide id/name/project/tags correctly.")
if not alias:
LoggerRoot.get_base_logger().info(
"Dataset.get() did not specify alias. Dataset information won’t be automatically logged in ClearML Server.")
"Dataset.get() did not specify alias. Dataset information "
"will not be automatically logged in ClearML Server.")
mutually_exclusive(dataset_id=dataset_id, dataset_project=dataset_project, _require_at_least_one=False)
mutually_exclusive(dataset_id=dataset_id, dataset_name=dataset_name, _require_at_least_one=False)