summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/__init__.py2
-rw-r--r--python/scriptingprovider.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/python/__init__.py b/python/__init__.py
index 697dfff8..1b36b2db 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -310,7 +310,7 @@ def load(*args, **kwargs) -> BinaryView:
"""
`load` is a convenience wrapper for :py:class:`BinaryViewType.load` that opens a BinaryView object.
- :param Union[str, bytes, bytearray, 'databuffer.DataBuffer', 'os.PathLike'] source: a file or byte stream for which load load into a virtual memory space
+ :param Union[str, bytes, bytearray, 'databuffer.DataBuffer', 'os.PathLike'] source: a file or byte stream to load into a virtual memory space
:param bool update_analysis: whether or not to run :func:`update_analysis_and_wait` after opening a :py:class:`BinaryView`, defaults to ``True``
:param callback progress_func: optional function to be called with the current progress and total count
:param dict options: a dictionary in the form {setting identifier string : object value}
diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index a8ce3c0a..1f4bc602 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -1447,12 +1447,12 @@ class PythonScriptingProvider(ScriptingProvider):
)
return False
- args: List[str] = [str(python_bin), "-m", "pip", "--isolated", "--disable-pip-version-check", "--upgrade", "--upgrade-strategy", "only-if-needed"]
+ args: List[str] = [str(python_bin), "-m", "pip", "--isolated", "--disable-pip-version-check"]
proxy_settings = settings.Settings().get_string("network.httpsProxy")
if proxy_settings:
args.extend(["--proxy", proxy_settings])
- args.extend(["install", "--verbose"])
+ args.extend(["install", "--upgrade", "--upgrade", "--upgrade-strategy", "only-if-needed"])
venv = settings.Settings().get_string("python.virtualenv")
in_virtual_env = 'VIRTUAL_ENV' in os.environ
if venv is not None and venv.endswith("site-packages") and Path(venv).is_dir() and not in_virtual_env: