8000 Fix PyPy installation on Windows to adopt new parameters format by AlenaSviridenko · Pull Request #201 · actions/setup-python · GitHub
[go: up one dir, main page]
Skip to content

Fix PyPy installation on Windows to adopt new parameters format #201

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
merged 11 commits into from
Apr 12, 2021
Merged

Fix PyPy installation on Windows to adopt new parameters format #201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb9573b
test for pypy new version notation
AlenaSviridenko Apr 8, 2021
42c2a27
formatting
AlenaSviridenko Apr 8, 2021
63259a1
uncommented condition
AlenaSviridenko Apr 8, 2021
65839cc
test
AlenaSviridenko Apr 8, 2021
cc3f7d5
added pypy to test matrix
AlenaSviridenko Apr 8, 2021
99e5bb3
test
AlenaSviridenko Apr 8, 2021
32dc6a0
test
AlenaSviridenko Apr 8, 2021
401fc93
restored all tests
AlenaSviridenko Apr 8, 2021
6767fd0
removed logs, added multiarch support for toolcache
AlenaSviridenko Apr 8, 2021
96cc2da
reduced test matrix
AlenaSviridenko Apr 8, 2021
d5b8d9b
removed extra condition about arch
AlenaSviridenko Apr 9, 2021
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
Next Next commit
test for pypy new version notation
  • Loading branch information
@AlenaSviridenko
AlenaSviridenko committed Apr 8, 2021
commit cb9573b913b94894201cf129d7f50fe1997881fb
6 changes: 1 addition & 5 deletions .github/workflows/test-pypy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ jobs:
- 'pypy-2.7'
- 'pypy-3.6'
- 'pypy-3.7'
- 'pypy-2.7-v7.3.2'
- 'pypy-3.6-v7.3.2'
- 'pypy-3.7-v7.3.2'
- 'pypy-3.6-v7.3.x'
- 'pypy-3.7-v7.x'
- 'pypy-3.6-v7.3.3rc1'
- 'pypy-3.7-nightly'
- 'pypy-2.7-v7.3.4rc1'

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions src/find-pypy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export async function findPyPyVersion(
const pypyVersionSpec = parsePyPyVersion(versionSpec);

// PyPy only precompiles binaries for x86, but the architecture parameter defaults to x64.
if (IS_WINDOWS && architecture === 'x64') {
/*if (IS_WINDOWS && architecture === 'x64') {
architecture = 'x86';
}
}*/

({installDir, resolvedPythonVersion, resolvedPyPyVersion} = findPyPyToolCache(
pypyVersionSpec.pythonVersion,
Expand Down
19 changes: 15 additions & 4 deletions src/install-pypy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import fs from 'fs';

import {
IS_WINDOWS,
WINDOWS_ARCHS,
WINDOWS_PLATFORMS,
IPyPyManifestRelease,
createSymlinkInFolder,
isNightlyKeyword,
Expand Down Expand Up @@ -142,10 +144,7 @@ export function findRelease(
isPyPyNightly ||
semver.satisfies(pypyVersionToSemantic(item.pypy_version), pypyVersion);
const isArchPresent =
item.files &&
item.files.some(
file => file.arch === architecture && file.platform === process.platform
);
item.files && (IS_WINDOWS ? isArchPresentForWindows(item) : isArchPresentForMacOrLinux(item, architecture, process.platform));
return isPythonVersionSatisfied && isPyPyVersionSatisfied && isArchPresent;
});

Expand Down Expand Up @@ -191,3 +190,15 @@ export function pypyVersionToSemantic(versionSpec: string) {
const prereleaseVersion = /(\d+\.\d+\.\d+)((?:a|b|rc))(\d*)/g;
return versionSpec.replace(prereleaseVersion, '$1-$2.$3');
}

export function isArchPresentForWindows(item: any) {
return item.files.some(
file => WINDOWS_ARCHS.includes(file.arch) && WINDOWS_PLATFORMS.includes( file.platform)
);
}

export function isArchPresentForMacOrLinux(item: any, architecture: string, platform: string) {
return item.files.some(
file => file.arch === architecture && file.platform === platform
);
}
2 changes: 2 additions & 0 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import * as semver from 'semver';

export const IS_WINDOWS = process.platform === 'win32';
export const IS_LINUX = process.platform === 'linux';
export const WINDOWS_ARCHS = ['x86', 'x64'];
export const WINDOWS_PLATFORMS = ['win32', 'win64'];
const PYPY_VERSION_FILE = 'PYPY_VERSION';

export interface IPyPyManifestAsset {
Expand Down
0