Skip to content

Commit 5693d82

Browse files
SG-41399 - Make sure package installed with custom python are isolated (#1019)
### Make sure package installed with custom python are isolated ### Linked issues n/a ### Summarize your change. 1) Removed `dohq-artifactory` (not used) 2) Added pip options (same options used in make_python.py): 1) -s : Don't add user site-packages to sys.path 2) -E : Ignore all PYTHON* environment variables 3) -I : Isolated mode ### Describe the reason for the change. Some issue where the custom python was seeing the site-packages from the system python ### Describe what you have tested and on which operating system. CI ### Add a list of changes, and note any that might need special attention during the review. ### If possible, provide screenshots. --------- Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent 61c5c76 commit 5693d82

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

cmake/dependencies/python3.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ SET(_requirements_install_command
281281
${CMAKE_COMMAND} -E env
282282
${_otio_debug_env}
283283
"CMAKE_ARGS=-DPYTHON_LIBRARY=${_python3_cmake_library} -DPYTHON_INCLUDE_DIR=${_include_dir} -DPYTHON_EXECUTABLE=${_python3_executable}"
284-
"${_python3_executable}" -m pip install --upgrade --no-cache-dir --force-reinstall -r "${_requirements_output_file}"
284+
"${_python3_executable}" -s -E -I -m pip install --upgrade --no-cache-dir --force-reinstall -r "${_requirements_output_file}"
285285
)
286286

287287
IF(RV_TARGET_WINDOWS)

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ pyzstd==0.15.9; python_version <= '3.8' # License: BSD License (BSD-3-Clause)
77
pyzstd; python_version > '3.8' # License: BSD License (BSD-3-Clause)
88
py7zr==0.22.0; python_version <= '3.8' # License: GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL-2.1-or-later)
99
py7zr; python_version > '3.8' # License: GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL-2.1-or-later)
10-
dohq-artifactory # License: MIT License (MIT License)
1110
pre-commit # License: MIT License (MIT)

0 commit comments

Comments
 (0)