actions/setup-python
3
0
Fork 0
mirror of https://github.com/actions/setup-python synced 2025-04-06 07:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use pypyX.Y for PyPy python-version input (#349)

Browse Source 
This versioning scheme is consistent with other
tools in the python ecosystem so it feels more natural
and allows better interaction with other tools.

fixes #346
This commit is contained in:
Matthieu Darbois
2022-05-18 15:20:53 +02:00
committed by GitHub
parent c57f79353b
commit fff15a21cc
6 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dist/setup/index.js vendored
View File

@ -6073,7 +6073,7 @@ const os = __importStar(__webpack_require__(87));
const cache_factory_1 = __webpack_require__(633);
const utils_1 = __webpack_require__(163);
function isPyPyVersion(versionSpec) {
return versionSpec.startsWith('pypy-');
return versionSpec.startsWith('pypy');
}
function cacheDependencies(cache, pythonVersion) {
return __awaiter(this, void 0, void 0, function* () {
@ -52411,8 +52411,12 @@ function findPyPyToolCache(pythonVersion, pypyVersion, architecture) {
exports.findPyPyToolCache = findPyPyToolCache;
function parsePyPyVersion(versionSpec) {
const versions = versionSpec.split('-').filter(item => !!item);
if (/^(pypy)(.+)/.test(versions[0])) {
let pythonVersion = versions[0].replace('pypy', '');
versions.splice(0, 1, 'pypy', pythonVersion);
}
if (versions.length < 2 || versions[0] != 'pypy') {
throw new Error("Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy-<python-version>'. See README for examples and documentation.");
throw new Error("Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy<python-version>' or 'pypy-<python-version>'. See README for examples and documentation.");
}
const pythonVersion = versions[1];
let pypyVersion;