Skip to content

Commit 8dcc539

Browse files
Zoran Simiczsimic
authored andcommitted
Corrected default openssl URL
1 parent c100ee3 commit 8dcc539

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

pyproject.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[build-system]
2-
requires = ["setuptools", "wheel"]
2+
requires = ["setuptools", "setupmeta"]
3+
build-backend = "setuptools.build_meta"
34

45
[tool.ruff]
56
cache-dir = ".tox/.ruff_cache"
@@ -58,9 +59,6 @@ ignore = [
5859
"RET503", # Missing explicit `return` at the end of function able to return non-`None` value
5960
]
6061

61-
[tool.ruff.lint.flake8-builtins]
62-
builtins-ignorelist = ["bin", "compile"]
63-
6462
[tool.ruff.lint.isort]
6563
order-by-type = false
6664

src/portable_python/external/xcpython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def auto_select_reason(self):
143143

144144
@property
145145
def url(self):
146-
return f"https://www.openssl.org/source/openssl-{self.version}.tar.gz"
146+
return f"https://github.com/openssl/openssl/releases/download/openssl-{self.version}/openssl-{self.version}.tar.gz"
147147

148148
@property
149149
def version(self):

tests/test_build.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@ def test_build_rc(cli):
3939
"""
4040

4141

42-
def _setup_exes(bin):
43-
runez.ensure_folder(bin, clean=True, logger=None)
44-
runez.touch(bin / "foo-python", logger=None)
45-
runez.touch(bin / "pip3.9", logger=None)
46-
runez.symlink(bin / "foo-python", bin / "python3", logger=None) # Simulate a funky symlink, to test edge cases
47-
runez.write(bin / "some-exe", "#!.../bin/python3\nhello", logger=None)
48-
runez.write(bin / "some-exe2", "#!/bin/sh\nhello", logger=None)
49-
runez.write(bin / "some-exe3", b"\xe4", logger=None) # Non-unicode char to trigger edge case
50-
runez.make_executable(bin / "some-exe", logger=None)
51-
runez.make_executable(bin / "some-exe2", logger=None)
52-
runez.make_executable(bin / "some-exe3", logger=None)
42+
def _setup_exes(bin_folder):
43+
runez.ensure_folder(bin_folder, clean=True, logger=None)
44+
runez.touch(bin_folder / "foo-python", logger=None)
45+
runez.touch(bin_folder / "pip3.9", logger=None)
46+
runez.symlink(bin_folder / "foo-python", bin_folder / "python3", logger=None) # Simulate a funky symlink, to test edge cases
47+
runez.write(bin_folder / "some-exe", "#!.../bin/python3\nhello", logger=None)
48+
runez.write(bin_folder / "some-exe2", "#!/bin/sh\nhello", logger=None)
49+
runez.write(bin_folder / "some-exe3", b"\xe4", logger=None) # Non-unicode char to trigger edge case
50+
runez.make_executable(bin_folder / "some-exe", logger=None)
51+
runez.make_executable(bin_folder / "some-exe2", logger=None)
52+
runez.make_executable(bin_folder / "some-exe3", logger=None)
5353

5454

5555
def test_finalization(cli, monkeypatch):
5656
f = PPG.get_folders(version="3.9.7")
5757
dummy_tarball(f, f"Python-{f.version}.tar.xz")
5858
dummy_tarball(f, "bzip2-1.0.8.tar.gz")
59-
bin = f.resolved_destdir("bin")
59+
bin_folder = f.resolved_destdir("bin")
6060
lib = f.resolved_destdir(f"lib/python{f.mm}")
6161
sys_cfg = lib / "_sysconfigdata__.py"
6262

@@ -67,7 +67,7 @@ def test_finalization(cli, monkeypatch):
6767
runez.touch(lib.parent / "idle_test/foo", logger=None)
6868
runez.touch(lib.parent / "__phello__.foo.py", logger=None)
6969
runez.touch(lib / "site-packages/pip", logger=None)
70-
_setup_exes(bin)
70+
_setup_exes(bin_folder)
7171
runez.touch(lib / "config-3.9/libpython3.9.a", logger=None)
7272

7373
monkeypatch.setenv("PP_X_DEBUG", "direct-finalize")
@@ -80,18 +80,18 @@ def test_finalization(cli, monkeypatch):
8080
assert "selected: bzip2" in cli.logged
8181
assert "Pass 1: Cleaned 1 build artifact (0 B): idle_test" in cli.logged
8282
assert f"PEP 668: Cleaned 2 build artifacts (0 B): pip pip{f.mm}" in cli.logged
83-
assert f"Symlink {bin}/foo-python <- {bin}/python" in cli.logged
84-
assert f"Symlink {bin}/pip{f.mm} <- {bin}/pip" in cli.logged
85-
assert f"Auto-corrected shebang for {bin}/some-exe" in cli.logged
83+
assert f"Symlink {bin_folder}/foo-python <- {bin_folder}/python" in cli.logged
84+
assert f"Symlink {bin_folder}/pip{f.mm} <- {bin_folder}/pip" in cli.logged
85+
assert f"Auto-corrected shebang for {bin_folder}/some-exe" in cli.logged
8686
assert f"Symlink {lib}/config-3.9/libpython3.9.a <- {lib.parent}/libpython3.9.a" in cli.logged
8787

8888
transformed = "\n".join(runez.readlines(sys_cfg))
8989
assert transformed.strip() == SAMPLE_SYS_CONF_REL.strip()
9090

9191
expected = ["#!/bin/sh", '"exec" "$(dirname $0)/foo-python" "$0" "$@"', "# -*- coding: utf-8 -*-", "hello"]
92-
assert list(runez.readlines(bin / "some-exe")) == expected
93-
assert list(runez.readlines(bin / "some-exe2")) == ["#!/bin/sh", "hello"]
94-
assert runez.basename(bin / "python", follow=True) == "foo-python"
92+
assert list(runez.readlines(bin_folder / "some-exe")) == expected
93+
assert list(runez.readlines(bin_folder / "some-exe2")) == ["#!/bin/sh", "hello"]
94+
assert runez.basename(bin_folder / "python", follow=True) == "foo-python"
9595

9696
assert (lib / "EXTERNALLY-MANAGED").read_text().strip() == EXPECTED_EXTERNALLY_MANAGED.strip()
9797

0 commit comments

Comments
 (0)