@@ -153,7 +153,7 @@ var _ = Describe("Supply", func() {
153153 Expect (ioutil .WriteFile (filepath .Join (buildDir , "requirements.txt" ), []byte {}, 0644 )).To (Succeed ())
154154 mockStager .EXPECT ().LinkDirectoryInDepDir (gomock .Any (), gomock .Any ())
155155
156- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" )
156+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" )
157157 Expect (supplier .RunPipUnvendored ()).To (Succeed ())
158158 })
159159 })
@@ -179,7 +179,7 @@ var _ = Describe("Supply", func() {
179179 Expect (ioutil .WriteFile (filepath .Join (buildDir , "requirements.txt" ), []byte {}, 0644 )).To (Succeed ())
180180 mockStager .EXPECT ().LinkDirectoryInDepDir (gomock .Any (), gomock .Any ())
181181
182- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" )
182+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" )
183183 Expect (supplier .RunPipUnvendored ()).To (Succeed ())
184184 })
185185 })
@@ -548,15 +548,15 @@ cffi`
548548 })
549549
550550 It ("Runs and outputs pip" , func () {
551- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" )
551+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" )
552552 Expect (supplier .RunPipUnvendored ()).To (Succeed ())
553553 })
554554 })
555555
556556 Context ("requirements.txt exists in dep dir and pip install fails" , func () {
557557 BeforeEach (func () {
558558 Expect (ioutil .WriteFile (filepath .Join (buildDir , "requirements.txt" ), []byte {}, 0644 )).To (Succeed ())
559- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" ).Return (fmt .Errorf ("exit 28" ))
559+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" ).Return (fmt .Errorf ("exit 28" ))
560560 })
561561
562562 const proTip = "Running pip install failed. You need to include all dependencies in the vendor directory."
@@ -590,7 +590,7 @@ MarkupSafe==2.0.1
590590 })
591591
592592 It ("check index_url, find_links, allow_hosts values" , func () {
593- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" )
593+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" )
594594 Expect (supplier .RunPipUnvendored ()).To (Succeed ())
595595 filePath := filepath .Join (os .Getenv ("HOME" ), ".pydistutils.cfg" )
596596 fileContents , err := ioutil .ReadFile (filePath )
@@ -621,7 +621,7 @@ MarkupSafe==2.0.1
621621
622622 It ("installs the vendor directory" , func () {
623623 mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "--no-build-isolation" , "-h" ).Return (nil )
624- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--no-index" , fmt .Sprintf ("--find-links=file://%s/vendor" , buildDir ), "--disable-pip-version-check" , "--no-build-isolation" )
624+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--no-index" , fmt .Sprintf ("--find-links=file://%s/vendor" , buildDir ), "--disable-pip-version-check" , "--no-warn-script-location" , "--no- build-isolation" )
625625 Expect (supplier .RunPipVendored ()).To (Succeed ())
626626 })
627627 })
@@ -631,8 +631,8 @@ MarkupSafe==2.0.1
631631 Expect (ioutil .WriteFile (filepath .Join (buildDir , "requirements.txt" ), []byte {}, 0644 )).To (Succeed ())
632632 Expect (os .Mkdir (filepath .Join (buildDir , "vendor" ), 0755 )).To (Succeed ())
633633 mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "--no-build-isolation" , "-h" ).Return (nil )
634- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--no-index" , fmt .Sprintf ("--find-links=file://%s/vendor" , buildDir ), "--disable-pip-version-check" , "--no-build-isolation" ).Return (fmt .Errorf ("exit 28" ))
635- mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" ).Return (fmt .Errorf ("exit 28" ))
634+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--no-index" , fmt .Sprintf ("--find-links=file://%s/vendor" , buildDir ), "--disable-pip-version-check" , "--no-warn-script-location" , "--no- build-isolation" ).Return (fmt .Errorf ("exit 28" ))
635+ mockCommand .EXPECT ().Execute (buildDir , gomock .Any (), gomock .Any (), "python" , "-m" , "pip" , "install" , "-r" , filepath .Join (buildDir , "requirements.txt" ), "--ignore-installed" , "--exists-action=w" , fmt .Sprintf ("--src=%s/src" , depDir ), "--disable-pip-version-check" , "--no-warn-script-location" ).Return (fmt .Errorf ("exit 28" ))
636636 })
637637
638638 const proTip = "Running pip install failed. You need to include all dependencies in the vendor directory."
0 commit comments