From a0ec4b895b2c6b2c38213a3f88f3b868a68cf342 Mon Sep 17 00:00:00 2001 From: allegroai <> Date: Fri, 30 Oct 2020 09:54:50 +0200 Subject: [PATCH] Do not add setuptools specific version (pip can't install it anyway) --- trains/backend_interface/task/repo/scriptinfo.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/trains/backend_interface/task/repo/scriptinfo.py b/trains/backend_interface/task/repo/scriptinfo.py index 1061a9f2..eaa1ed10 100644 --- a/trains/backend_interface/task/repo/scriptinfo.py +++ b/trains/backend_interface/task/repo/scriptinfo.py @@ -24,6 +24,7 @@ class ScriptInfoError(Exception): class ScriptRequirements(object): _max_requirements_size = 512 * 1024 + _packages_remove_version = ('setuptools', ) def __init__(self, root_folder): self._root_folder = root_folder @@ -33,7 +34,8 @@ class ScriptRequirements(object): try: from ....utilities.pigar.reqs import get_installed_pkgs_detail from ....utilities.pigar.__main__ import GenerateReqs - installed_pkgs = get_installed_pkgs_detail() + installed_pkgs = self._remove_package_versions( + get_installed_pkgs_detail(), self._packages_remove_version) gr = GenerateReqs(save_path='', project_path=self._root_folder, installed_pkgs=installed_pkgs, ignores=['.git', '.hg', '.idea', '__pycache__', '.ipynb_checkpoints', 'site-packages', 'dist-packages']) @@ -214,6 +216,13 @@ class ScriptRequirements(object): else requirements_txt_packages_only, conda_requirements) + @staticmethod + def _remove_package_versions(installed_pkgs, package_names_to_remove_version): + installed_pkgs = {k: (v[0], None if str(k) in package_names_to_remove_version else v[1]) + for k, v in installed_pkgs.items()} + + return installed_pkgs + class _JupyterObserver(object): _thread = None