From 927bc9cb8458868c231d1a074d77fa1984f1fe2a Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Mon, 27 Dec 2021 23:32:46 -0500 Subject: [PATCH] conda-recipe: Ignore run_exports for libjpeg-turbo, to ensure that we don't get libjpeg-turbo as a run dependency --- conda-recipe/meta.yaml | 8 +++++++- conda-recipe/run_test.py | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index e362539..de8ed55 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -22,6 +22,9 @@ build: script_env: - SKIP_LIBDVID_TESTS + ignore_run_exports: + - libjpeg-turbo + requirements: ## ## A note about krb5: @@ -50,7 +53,7 @@ requirements: - lz4-c {{ lz4_c }} - zeromq {{ zeromq }} - libpng 1.6.28 - - libjpeg-turbo # Statically linked, so no runtime dependency below. + - libjpeg-turbo 2 # Statically linked, so no runtime dependency below. # In 7.62.0, CURL_HTTP_VERSION_2TLS became the default setting for CURLOPT_HTTP_VERSION - curl >=7.62.0 @@ -79,6 +82,9 @@ requirements: #- krb5 1.14.6 # See note above test: + requires: + - jpeg # We install libjpeg to ensure that we're not using it. See run_test.py + # Python imports imports: - libdvid diff --git a/conda-recipe/run_test.py b/conda-recipe/run_test.py index e765a3e..408eece 100644 --- a/conda-recipe/run_test.py +++ b/conda-recipe/run_test.py @@ -1,8 +1,11 @@ import sys +import glob import site import platform import subprocess +assert not glob.glob(f"{sys.prefix}/lib/libturbojpeg.*"), \ + "libjpeg-turbo should not be a runtime dependency of libdvid-cpp!" if platform.system() == "Darwin": def get_symbols(lib_path):