From f9e7a56ee1dcd3f06f02cd0f2d09531efa0521e2 Mon Sep 17 00:00:00 2001 From: Abhinav Pradeep Date: Wed, 27 May 2026 16:54:19 +1000 Subject: [PATCH] fix: moved from deprecated OpenSSL URL Signed-off-by: Abhinav Pradeep --- .../dockerfile/pypi_dockerfile_output.py | 4 ++-- .../__snapshots__/test_pypi_dockerfile_output.ambr | 2 +- .../dockerfile/test_pypi_dockerfile_output.py | 6 +++++- .../cases/pypi_cachetools/expected_dockerfile.buildspec | 2 +- .../cases/pypi_markdown-it-py/expected_dockerfile.buildspec | 2 +- .../cases/pypi_pytesseract/expected_dockerfile.buildspec | 2 +- .../cases/pypi_toga/expected_dockerfile.buildspec | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py b/src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py index 7a3cf9539..f2cfd21db 100644 --- a/src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py +++ b/src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py @@ -173,12 +173,12 @@ def openssl_install_commands(version: Version) -> str: # and 3.6 to 3.9 can be compiled with OpenSSL 1.1.1. Therefore, we compile as below: if version in SpecifierSet(">=3.6"): openssl_version = "1.1.1w" - source_url = "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz" + source_url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz" # From the same document, "Python versions 3.6 to 3.9 are compatible with OpenSSL 1.0.2, # 1.1.0, and 1.1.1". As an attempt to generalize for any >= 3.3, we use OpenSSL 1.0.2. else: openssl_version = "1.0.2u" - source_url = "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz" + source_url = "https://github.com/openssl/openssl/releases/download/OpenSSL_1_0_2u/openssl-1.0.2u.tar.gz" return f"""# Build OpenSSL {openssl_version} RUN < BaseBuildSpecDict: ) -def test_successful_generation(snapshot: str, pypi_build_spec: BaseBuildSpecDict) -> None: +def test_successful_generation( + monkeypatch: pytest.MonkeyPatch, snapshot: str, pypi_build_spec: BaseBuildSpecDict +) -> None: """Ensure that dockerfile is correctly generated for pypi_build_spec""" + monkeypatch.setattr(pypi_dockerfile_output, "get_latest_cpython_patch", lambda _major, _minor: "3.9.25") assert gen_dockerfile(pypi_build_spec) == snapshot diff --git a/tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec b/tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec index 3eb549766..7c09af0ea 100644 --- a/tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec +++ b/tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec @@ -25,7 +25,7 @@ RUN dnf install \ # Build OpenSSL 1.1.1w RUN <