File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -523,7 +523,6 @@ def _job_popen(
523
523
if stderr_path is not None :
524
524
stderr = open (stderr_path , "wb" )
525
525
526
- print ("ZZZ" , commands )
527
526
sproc = subprocess .Popen (commands ,
528
527
shell = False ,
529
528
close_fds = not onWindows (),
Original file line number Diff line number Diff line change @@ -178,7 +178,7 @@ def rewrite_id(r, mainuri):
178
178
if isinstance (dcr , CommentedSeq ):
179
179
dcr = dcr [0 ]
180
180
dcr = cast (CommentedMap , dcr )
181
- if not isinstance (dcr , dict ):
181
+ if not isinstance (dcr , MutableMapping ):
182
182
continue
183
183
for doc in (dcr , metadata ):
184
184
if "$schemas" in doc :
Original file line number Diff line number Diff line change @@ -602,11 +602,13 @@ def __init__(self,
602
602
603
603
loadingContext = loadingContext .copy ()
604
604
605
- loadingContext .requirements = (getdefault (loadingContext .requirements , []) +
606
- toolpath_object .get ("requirements" , []) +
607
- get_overrides (getdefault (loadingContext .overrides_list , []),
605
+ loadingContext .requirements = copy . deepcopy (getdefault (loadingContext .requirements , []))
606
+ loadingContext . requirements . extend ( toolpath_object .get ("requirements" , []))
607
+ loadingContext . requirements . extend ( get_overrides (getdefault (loadingContext .overrides_list , []),
608
608
self .id ).get ("requirements" , []))
609
- loadingContext .hints = getdefault (loadingContext .hints , []) + toolpath_object .get ("hints" , [])
609
+
610
+ loadingContext .hints = copy .deepcopy (getdefault (loadingContext .hints , []))
611
+ loadingContext .hints .extend (toolpath_object .get ("hints" , []))
610
612
611
613
try :
612
614
if isinstance (toolpath_object ["run" ], MutableMapping ):
You can’t perform that action at this time.
0 commit comments