Skip to content

Commit

Permalink
Remove briefcase specific workarounds (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp authored Jun 12, 2023
1 parent 96a35cc commit fec0493
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions napari_plugin_manager/qt_package_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
from napari._version import version_tuple as _napari_version_tuple
from napari.plugins import plugin_manager
from napari.plugins.npe2api import _user_agent
from napari.utils._appdirs import user_plugin_dir, user_site_packages
from napari.utils.misc import StringEnum, running_as_bundled_app
from napari.utils.misc import StringEnum
from napari.utils.translations import trans
from npe2 import PluginManager
from qtpy.QtCore import QObject, QProcess, QProcessEnvironment, Signal
Expand Down Expand Up @@ -127,28 +126,13 @@ def arguments(self) -> Tuple[str, ...]:
args.append('-vvv')
if self.prefix is not None:
args.extend(['--prefix', str(self.prefix)])
elif running_as_bundled_app(
check_conda=False
) and sys.platform.startswith('linux'):
args += [
'--no-warn-script-location',
'--prefix',
user_plugin_dir(),
]
return (*args, *self.pkgs)

def environment(
self, env: QProcessEnvironment = None
) -> QProcessEnvironment:
if env is None:
env = QProcessEnvironment.systemEnvironment()
combined_paths = os.pathsep.join(
[
user_site_packages(),
env.systemEnvironment().value("PYTHONPATH"),
]
)
env.insert("PYTHONPATH", combined_paths)
env.insert("PIP_USER_AGENT_USER_DATA", _user_agent())
return env

Expand Down

0 comments on commit fec0493

Please sign in to comment.