Skip to content

Commit 5da4038

Browse files
committed
Expand OpenSSL version check
1 parent 50cdcaa commit 5da4038

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

recipe/meta.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ outputs:
211211
- ripgrep
212212
- cmake
213213
- ninja
214+
# Pin to the openssl version used during the build to check whether
215+
# we load the conda-forge version.
216+
- openssl {{ openssl }}
214217
- {{ stdlib('c') }}
215218
- {{ compiler('c') }}
216219
# Tried to use enable_language(C) to avoid needing this. It does not work.

recipe/run_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102

103103
import ssl
104104
print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION)
105-
CONDA_OPENSSL_VERSION = os.getenv('openssl').split(".")[0]
106-
assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION
105+
CONDA_OPENSSL_VERSION = os.getenv('openssl')
106+
assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION, f"{CONDA_OPENSSL_VERSION} not found in {ssl.OPENSSL_VERSION}"
107107

108108
# See https://github.com/conda-forge/python-feedstock/issues/718 for context:
109109
assert sys.hash_info.algorithm.startswith("siphash")

0 commit comments

Comments
 (0)