Skip to content

Commit

Permalink
Bump openssl versions
Browse files Browse the repository at this point in the history
  • Loading branch information
dean0x7d committed Sep 25, 2023
1 parent 5bc101d commit beebfdc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
embedded-py: [3.9.8, 3.11.3]
embedded-py: [3.9.8, 3.11.5]
env:
create_pck: conan create . lumicks/testing -o embedded_python:version=${{ matrix.embedded-py }} --build=missing
steps:
Expand Down
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Fixed packaging error on Windows when the Conan cache path contains spaces.
- Fixed Python include dirs being added twice (didn't cause any issues, just noise on the command line).
- Fixed `openssl` v3 mistakenly being enabled for Python 3.10. While 3.10 has preliminary support for `openssl` v3, Python 3.11 is the real minimum requirement for full support.
- Bumped default `openssl` to 1.1.1w for Python < 3.11 and v3.1.2 for Python >= 3.11.

## v1.8.0 | 2023-07-12

Expand Down
7 changes: 2 additions & 5 deletions core/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,10 @@ def requirements(self):
else:
self.requires("mpdecimal/2.5.0")

# `openssl` v3.1.1 is no-go for macOS ARM: https://github.com/openssl/openssl/issues/20753
# The fix will be in v3.1.2: https://github.com/openssl/openssl/pull/21261
# Go with v3.0.8 until this is resolved.
if self.pyversion >= scm.Version("3.11.0"):
self.requires("openssl/3.0.8")
self.requires("openssl/3.1.2")
else:
self.requires("openssl/1.1.1u")
self.requires("openssl/1.1.1w")

@property
def pyversion(self):
Expand Down
2 changes: 1 addition & 1 deletion test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestEmbeddedPython(ConanFile):
options = {"env": [None, "ANY"]}
default_options = {
"env": None,
"embedded_python:version": "3.11.3",
"embedded_python:version": "3.11.5",
}

def configure(self):
Expand Down

0 comments on commit beebfdc

Please sign in to comment.