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

Fix GIT user/pass in requirements and support for '-e git+http' lines

Browse Source
This commit is contained in:
allegroai 2020-07-30 14:30:23 +03:00
parent 52c1772b04
commit e4111c830b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
trains_agent/helper/package/external_req.py
View File

@ -1,3 +1,4 @@
import re
from collections import OrderedDict from collections import OrderedDict
from typing import Text from typing import Text
@ -33,6 +34,9 @@ class ExternalRequirements(SimpleSubstitution):
freeze_base = '' freeze_base = ''
req_line = req.tostr(markers=False) req_line = req.tostr(markers=False)
if req_line.strip().startswith('-e ') or req_line.strip().startswith('--editable'):
req_line = re.sub(r'^(-e|--editable=?)\s*', '', req_line, count=1)
if req.req.vcs and req_line.startswith('git+'): if req.req.vcs and req_line.startswith('git+'):
try: try:
url_no_frag = furl(req_line) url_no_frag = furl(req_line)
@ -47,9 +51,10 @@ class ExternalRequirements(SimpleSubstitution):
vcs._set_ssh_url() vcs._set_ssh_url()
new_req_line = 'git+{}{}'.format(vcs.url_with_auth, fragment) new_req_line = 'git+{}{}'.format(vcs.url_with_auth, fragment)
if new_req_line != req_line: if new_req_line != req_line:
url_pass = furl(new_req_line).password furl_line = furl(new_req_line)
print('Replacing original pip vcs \'{}\' with \'{}\''.format( print('Replacing original pip vcs \'{}\' with \'{}\''.format(
req_line, new_req_line.replace(url_pass, '****', 1) if url_pass else new_req_line)) req_line,
furl_line.set(password='xxxxxx').tostr() if furl_line.password else new_req_line))
req_line = new_req_line req_line = new_req_line
except Exception: except Exception:
print('WARNING: Failed parsing pip git install, using original line {}'.format(req_line)) print('WARNING: Failed parsing pip git install, using original line {}'.format(req_line))