From 859591bee6206ae59920e8f31d594b67b8a73942 Mon Sep 17 00:00:00 2001 From: Dean Moldovan Date: Fri, 17 Nov 2023 13:34:56 +0100 Subject: [PATCH] Fix `openssl` and `zlib` version compatibility This matches recent conan-center-index practices. --- changelog.md | 3 ++- core/conanfile.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index b882200..a931dbc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,9 @@ # Changelog -## v1.8.2 | In development +## v1.8.2 | 2023-11-17 - Fixed a packaging error on Linux in case the `bin` directory was not created during build. +- Fixed `openssl` and `zlib` version compatibility by requiring version ranges instead of exact versions. ## v1.8.1 | 2023-10-02 diff --git a/core/conanfile.py b/core/conanfile.py index 16198b4..3136d0d 100644 --- a/core/conanfile.py +++ b/core/conanfile.py @@ -53,7 +53,7 @@ def requirements(self): self.requires("sqlite3/3.42.0") self.requires("bzip2/1.0.8") self.requires("xz_utils/5.4.2") - self.requires("zlib/1.2.13") + self.requires("zlib/[>=1.2.11 <2]") if self.settings.os == "Linux": self.requires("libffi/3.4.4") self.requires("libuuid/1.0.3") @@ -63,7 +63,7 @@ def requirements(self): self.requires("mpdecimal/2.5.0") if self.pyversion >= scm.Version("3.11.0"): - self.requires("openssl/3.1.2") + self.requires("openssl/[>=3 <4]") else: self.requires("openssl/1.1.1w")