Skip to content
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

Setup: SNI: separate win7/non-win7 build, update macos naming #4088

Merged
merged 2 commits into from
Oct 26, 2024
Merged

Setup: SNI: separate win7/non-win7 build, update macos naming #4088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6247b8
Setup: fix macos SNI download name
black-sliver Oct 24, 2024
3d50d17
Setup: prefer SNI Windows7 build on py3.8, non-7 on py3.9+
black-sliver Oct 24, 2024
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
8 changes: 5 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def download_SNI() -> None:
platform_name = platform.system().lower()
machine_name = platform.machine().lower()
# force amd64 on macos until we have universal2 sni, otherwise resolve to GOARCH
machine_name = "amd64" if platform_name == "darwin" else machine_to_go.get(machine_name, machine_name)
machine_name = "universal" if platform_name == "darwin" else machine_to_go.get(machine_name, machine_name)
with urllib.request.urlopen("https://api.github.com/repos/alttpo/sni/releases/latest") as request:
data = json.load(request)
files = data["assets"]
Expand All @@ -104,11 +104,13 @@ def download_SNI() -> None:
download_url: str = file["browser_download_url"]
machine_match = download_url.rsplit("-", 1)[1].split(".", 1)[0] == machine_name
if platform_name in download_url and machine_match:
source_url = download_url
# prefer "many" builds
if "many" in download_url:
source_url = download_url
break
source_url = download_url
# prefer the correct windows or windows7 build
if platform_name == "windows" and ("windows7" in download_url) == (sys.version_info < (3, 9)):
break

if source_url and source_url.endswith(".zip"):
with urllib.request.urlopen(source_url) as download:
Expand Down
Loading