Remove openssl_variant workaround

We no longer have any use for it.

Author: dean0x7d

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.8.0 | In development
+
+- The `openssl_variant` is now obsolete. The flag is still there for backwards compatibility but it no longer does anything.
+
 ## v1.7.0 | 2023-06-22
 
 - Recipe build performance and Conan cache usage have been improved further (on top of the improvements in v1.6.0) by optimizing the way licenses are gathered. The recipe now takes advantage of a new feature in `pip-license` v4.2.0 to gather licenses from an external environment. This way, we don't need to re-install packages just to gather licenses, thus cutting both build time and Conan cache usage in half.

conanfile.py

@@ -10,7 +10,7 @@
 # noinspection PyUnresolvedReferences
 class EmbeddedPython(ConanFile):
     name = "embedded_python"
-    version = "1.7.0"  # of the Conan package, `options.version` is the Python version
+    version = "1.8.0"  # of the Conan package, `options.version` is the Python version
     license = "PSFL"
     description = "Embedded distribution of Python"
     topics = "embedded", "python"
@@ -24,7 +24,7 @@ class EmbeddedPython(ConanFile):
         "pip_licenses_version": ["ANY"],
         "setuptools_version": ["ANY"],
         "wheel_version": ["ANY"],
-        "openssl_variant": ["lowercase", "uppercase"],  # see explanation in `build_requirements()`
+        "openssl_variant": ["lowercase", "uppercase"],  # OBSOLETE: only here for compatibility
     }
     default_options = {
         "packages": None,
@@ -37,11 +37,10 @@ class EmbeddedPython(ConanFile):
     short_paths = True  # some of the pip packages go over the 260 char path limit on Windows
 
     def requirements(self):
-        self.requires(f"embedded_python-core/1.1.0@{self.user}/{self.channel}")
+        self.requires(f"embedded_python-core/1.2.0@{self.user}/{self.channel}")
 
     def configure(self):
         self.options["embedded_python-core"].version = self.options.version
-        self.options["embedded_python-core"].openssl_variant = self.options.openssl_variant
 
     @property
     def pyversion(self):

core/conanfile.py

@@ -12,7 +12,7 @@
 # noinspection PyUnresolvedReferences
 class EmbeddedPythonCore(ConanFile):
     name = "embedded_python-core"
-    version = "1.1.0"  # of the Conan package, `options.version` is the Python version
+    version = "1.2.0"  # of the Conan package, `options.version` is the Python version
     license = "PSFL"
     description = "The core embedded Python (no extra pip packages)"
     topics = "embedded", "python"
@@ -21,11 +21,9 @@ class EmbeddedPythonCore(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     options = {
         "version": ["ANY"],
-        "openssl_variant": ["lowercase", "uppercase"],  # see explanation in `build_requirements()`
         "zip_stdlib": ["no", "stored", "deflated"],
     }
     default_options = {
-        "openssl_variant": "lowercase",
         "zip_stdlib": "stored",
     }
     exports_sources = "embedded_python_tools.py", "embedded_python.cmake"
@@ -64,14 +62,7 @@ def requirements(self):
             else:
                 self.requires("mpdecimal/2.5.0")
 
-        # The pre-conan-center-index version of `openssl` was capitalized as `OpenSSL`.
-        # Both versions can't live in the same Conan cache so we need this compatibility
-        # option to pick the available version. The cache case-sensitivity issue should
-        # be solved in Conan 2.0, but we need this for now.
-        if self.options.openssl_variant == "lowercase":
-            self.requires("openssl/1.1.1k")
-        else:
-            self.requires("OpenSSL/1.1.1m")
+        self.requires("openssl/1.1.1k")
 
     @property
     def pyversion(self):
@@ -103,8 +94,7 @@ def generate(self):
         files.get(self, url, strip_root=True)
 
         tc = AutotoolsToolchain(self, prefix=pathlib.Path(self.package_folder, "embedded_python"))
-        openssl_pck = "openssl" if self.options.openssl_variant == "lowercase" else "OpenSSL"
-        openssl_path = self.dependencies[openssl_pck].package_folder
+        openssl_path = self.dependencies["openssl"].package_folder
         tc.configure_args += [
             "--enable-shared",
             "--without-static-libpython",