[v2] EdkRepo: Only install packages included with the installer

[edk2-devel] [edk2-staging/EdkRepo] [PATCH v2] EdkRepo: Only install packages included with the installer

Posted by Bjorge, Erik C 4 years ago

When installing packages pip may attempt to download dependencies.  The
installer should contain all dependencies so tell pip where to look
for any dependencies.

Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
---
 edkrepo_installer/linux-scripts/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo_installer/linux-scripts/install.py b/edkrepo_installer/linux-scripts/install.py
index 099954d..0f10ac6 100755
--- a/edkrepo_installer/linux-scripts/install.py
+++ b/edkrepo_installer/linux-scripts/install.py
@@ -666,7 +666,7 @@ def do_install():
             whl = wheels_to_install[whl_name]['wheel']
             install_whl = wheels_to_install[whl_name]['install']
             if install_whl:
-                install_cmd = [def_python, '-m', 'pip', 'install']
+                install_cmd = [def_python, '-m', 'pip', 'install', '--no-index', '--find-links={}'.format(whl_src_dir)]
                 if install_to_local:
                     install_cmd.append('--user')
                 install_cmd.append(os.path.join(whl_src_dir, whl))
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57480): https://edk2.groups.io/g/devel/message/57480
Mute This Topic: https://groups.io/mt/73068193/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2] EdkRepo: Only install packages included with the installer

Posted by Nate DeSimone 4 years ago

Reviewed-by: Nate Desimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bjorge, Erik C
Sent: Thursday, April 16, 2020 5:38 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>
Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2] EdkRepo: Only install packages included with the installer

When installing packages pip may attempt to download dependencies.  The installer should contain all dependencies so tell pip where to look for any dependencies.

Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
---
 edkrepo_installer/linux-scripts/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo_installer/linux-scripts/install.py b/edkrepo_installer/linux-scripts/install.py
index 099954d..0f10ac6 100755
--- a/edkrepo_installer/linux-scripts/install.py
+++ b/edkrepo_installer/linux-scripts/install.py
@@ -666,7 +666,7 @@ def do_install():
             whl = wheels_to_install[whl_name]['wheel']
             install_whl = wheels_to_install[whl_name]['install']
             if install_whl:
-                install_cmd = [def_python, '-m', 'pip', 'install']
+                install_cmd = [def_python, '-m', 'pip', 'install', 
+ '--no-index', '--find-links={}'.format(whl_src_dir)]
                 if install_to_local:
                     install_cmd.append('--user')
                 install_cmd.append(os.path.join(whl_src_dir, whl))
--
2.21.0.windows.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57555): https://edk2.groups.io/g/devel/message/57555
Mute This Topic: https://groups.io/mt/73068193/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2] EdkRepo: Only install packages included with the installer

Posted by Nate DeSimone 4 years ago

Pushed: https://github.com/tianocore/edk2-staging/commit/14b81a10

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bjorge, Erik C
Sent: Thursday, April 16, 2020 5:38 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>
Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2] EdkRepo: Only install packages included with the installer

When installing packages pip may attempt to download dependencies.  The installer should contain all dependencies so tell pip where to look for any dependencies.

Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
---
 edkrepo_installer/linux-scripts/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edkrepo_installer/linux-scripts/install.py b/edkrepo_installer/linux-scripts/install.py
index 099954d..0f10ac6 100755
--- a/edkrepo_installer/linux-scripts/install.py
+++ b/edkrepo_installer/linux-scripts/install.py
@@ -666,7 +666,7 @@ def do_install():
             whl = wheels_to_install[whl_name]['wheel']
             install_whl = wheels_to_install[whl_name]['install']
             if install_whl:
-                install_cmd = [def_python, '-m', 'pip', 'install']
+                install_cmd = [def_python, '-m', 'pip', 'install', 
+ '--no-index', '--find-links={}'.format(whl_src_dir)]
                 if install_to_local:
                     install_cmd.append('--user')
                 install_cmd.append(os.path.join(whl_src_dir, whl))
--
2.21.0.windows.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57556): https://edk2.groups.io/g/devel/message/57556
Mute This Topic: https://groups.io/mt/73068193/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-