Explorar o código

Patch isolation flag

Valentin Niess %!s(int64=3) %!d(string=hai) anos
pai
achega
e2efafa081
Modificáronse 2 ficheiros con 3 adicións e 6 borrados
  1. 2 1
      python_appimage/commands/build/app.py
  2. 1 5
      python_appimage/utils/compat.py

+ 2 - 1
python_appimage/commands/build/app.py

@@ -8,7 +8,7 @@ import stat
 import struct
 
 from ...appimage import build_appimage
-from ...utils.compat import decode, find_spec, isolation_flag
+from ...utils.compat import decode, find_spec
 from ...utils.deps import PREFIX
 from ...utils.fs import copy_file, copy_tree, make_tree, remove_file, remove_tree
 from ...utils.log import log
@@ -253,6 +253,7 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
                 'WARNING: Running pip as'
             )
 
+            isolation_flag = '-sE' if python_version[0] == '2' else '-I'
             system(('./AppDir/AppRun', isolation_flag, '-m', 'pip', 'install', '-U', in_tree_build,
                    '--no-warn-script-location', 'pip'), exclude=deprecation)
             for requirement in requirements_list:

+ 1 - 5
python_appimage/utils/compat.py

@@ -1,7 +1,7 @@
 import sys
 
 
-__all__ = ['decode', 'find_spec', 'isolation_flag']
+__all__ = ['decode', 'find_spec']
 
 
 def decode(s):
@@ -22,10 +22,6 @@ if sys.version_info[0] == 2:
     def find_spec(name):
         return ModuleSpec(name, imp.find_module(name)[1])
 
-    isolation_flag = '-sE'
-
 else:
     import importlib
     find_spec = importlib.util.find_spec
-
-    isolation_flag = '-I'