mirror of
https://github.com/clearml/clearml-agent
synced 2025-06-09 07:57:13 +00:00
Fix conda support to install graphviz packages even if matplotlib was installed from pip
This commit is contained in:
parent
8ef78fd058
commit
df10e6ed46
@ -312,6 +312,8 @@ class CondaAPI(PackageManager):
|
|||||||
else:
|
else:
|
||||||
# not in conda, it is a pip package
|
# not in conda, it is a pip package
|
||||||
pip_requirements.append(m)
|
pip_requirements.append(m)
|
||||||
|
if m_name == 'matplotlib':
|
||||||
|
has_matplotlib = True
|
||||||
|
|
||||||
# remove any leftover conda packages (they were removed from the pip list)
|
# remove any leftover conda packages (they were removed from the pip list)
|
||||||
if conda_supported_req_names:
|
if conda_supported_req_names:
|
||||||
@ -320,6 +322,7 @@ class CondaAPI(PackageManager):
|
|||||||
# Conda requirements Hacks:
|
# Conda requirements Hacks:
|
||||||
if has_matplotlib:
|
if has_matplotlib:
|
||||||
reqs.append(MarkerRequirement(Requirement.parse('graphviz')))
|
reqs.append(MarkerRequirement(Requirement.parse('graphviz')))
|
||||||
|
reqs.append(MarkerRequirement(Requirement.parse('python-graphviz')))
|
||||||
reqs.append(MarkerRequirement(Requirement.parse('kiwisolver')))
|
reqs.append(MarkerRequirement(Requirement.parse('kiwisolver')))
|
||||||
if has_torch and cuda_version == 0:
|
if has_torch and cuda_version == 0:
|
||||||
reqs.append(MarkerRequirement(Requirement.parse('cpuonly')))
|
reqs.append(MarkerRequirement(Requirement.parse('cpuonly')))
|
||||||
|
Loading…
Reference in New Issue
Block a user