Skip to content

chore: moved from deprecated OpenSSL URL #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behnazh-w merged 1 commit into from
May 28, 2026
Merged

chore: moved from deprecated OpenSSL URL #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/macaron/build_spec_generator/dockerfile/pypi_dockerfile_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
Expand Down
2 changes: 1 addition & 1 deletion tests/build_spec_generator/dockerfile/__snapshots__/test_pypi_dockerfile_output.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# Build OpenSSL 1.1.1w
RUN <<EOF
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
tar xzf openssl-1.1.1w.tar.gz
cd openssl-1.1.1w
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib
Expand Down
6 changes: 5 additions & 1 deletion tests/build_spec_generator/dockerfile/test_pypi_dockerfile_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import pytest

from macaron.build_spec_generator.common_spec.base_spec import BaseBuildSpecDict, SpecBuildCommandDict
from macaron.build_spec_generator.dockerfile import pypi_dockerfile_output
from macaron.build_spec_generator.dockerfile.pypi_dockerfile_output import gen_dockerfile


Expand Down Expand Up @@ -53,6 +54,9 @@ def fixture_base_build_spec() -> 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
2 changes: 1 addition & 1 deletion tests/integration/cases/pypi_cachetools/expected_dockerfile.buildspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN dnf install \

# Build OpenSSL 1.1.1w
RUN <<EOF
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
tar xzf openssl-1.1.1w.tar.gz
cd openssl-1.1.1w
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/cases/pypi_markdown-it-py/expected_dockerfile.buildspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN dnf install \

# Build OpenSSL 1.1.1w
RUN <<EOF
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
tar xzf openssl-1.1.1w.tar.gz
cd openssl-1.1.1w
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/cases/pypi_pytesseract/expected_dockerfile.buildspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN dnf install \

# Build OpenSSL 1.1.1w
RUN <<EOF
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
tar xzf openssl-1.1.1w.tar.gz
cd openssl-1.1.1w
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/cases/pypi_toga/expected_dockerfile.buildspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN dnf install \

# Build OpenSSL 1.1.1w
RUN <<EOF
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz
tar xzf openssl-1.1.1w.tar.gz
cd openssl-1.1.1w
./config --prefix=/opt/openssl --openssldir=/opt/openssl shared zlib
Expand Down
Loading