From b2e609ebe33bc25bc1e8e0f190c969b4365296d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 11 May 2023 08:12:14 -0400 Subject: [PATCH 1/3] Changed OCIO_PYTHON_LOAD_DLLS_FROM_PATH to opt-in instead of opt-out MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- src/bindings/python/package/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/python/package/__init__.py b/src/bindings/python/package/__init__.py index 3ac093f5c3..a6d386190a 100644 --- a/src/bindings/python/package/__init__.py +++ b/src/bindings/python/package/__init__.py @@ -16,7 +16,7 @@ # environment variable to 0. # -if sys.version_info >= (3, 8) and platform.system() == "Windows" and os.getenv("OCIO_PYTHON_LOAD_DLLS_FROM_PATH", "1") == "1": +if sys.version_info >= (3, 8) and platform.system() == "Windows" and os.getenv("OCIO_PYTHON_LOAD_DLLS_FROM_PATH", "0") == "1": for path in os.getenv("PATH", "").split(os.pathsep): if os.path.exists(path) and path != ".": os.add_dll_directory(path) From a76d195a170a47776fec266d7c0416e67e671abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 11 May 2023 09:24:51 -0400 Subject: [PATCH 2/3] Restrict the version of urllib3 to version <2 because version above this is not compatible with the OCIO container images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- docs/requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 53a2a6170e..eaaff1dc84 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,8 @@ +# Fix an issue with the OCIO's Linux container images that have OpenSSL under 1.1.1. +# If the container images are updated with OpenSSL 1.1.1+, the restriction on +# urllib3 version <2 can be removed. +urllib3<2 +# The builds for documentation fails with <0.18.0 docutils>=0.18.1 six testresources From 4dc19ddfcdf0379a8b081422a8e462c46d595232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 11 May 2023 12:27:32 -0400 Subject: [PATCH 3/3] Revert unwanted change from this branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- src/bindings/python/package/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/python/package/__init__.py b/src/bindings/python/package/__init__.py index a6d386190a..3ac093f5c3 100644 --- a/src/bindings/python/package/__init__.py +++ b/src/bindings/python/package/__init__.py @@ -16,7 +16,7 @@ # environment variable to 0. # -if sys.version_info >= (3, 8) and platform.system() == "Windows" and os.getenv("OCIO_PYTHON_LOAD_DLLS_FROM_PATH", "0") == "1": +if sys.version_info >= (3, 8) and platform.system() == "Windows" and os.getenv("OCIO_PYTHON_LOAD_DLLS_FROM_PATH", "1") == "1": for path in os.getenv("PATH", "").split(os.pathsep): if os.path.exists(path) and path != ".": os.add_dll_directory(path)