From 1ce308808af558cfbcb7218da3af37d92e033ad1 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Thu, 28 Apr 2022 15:26:17 +0200 Subject: [PATCH] Create missing `pypyX.Y` symlinks (#347) `pypyX.Y.exe` executables are missing from PyPy archives on Windows before v7.3.9 (X.Y < 3.9) `pypy2.7` symlinks are also missing from macOS/Linux PyPy archives before v7.3.9 relates to #346 --- .github/workflows/test-pypy.yml | 14 ++++++++++++++ dist/setup/index.js | 3 +++ src/install-pypy.ts | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/.github/workflows/test-pypy.yml b/.github/workflows/test-pypy.yml index 2bd0441..f636206 100644 --- a/.github/workflows/test-pypy.yml +++ b/.github/workflows/test-pypy.yml @@ -44,3 +44,17 @@ jobs: - name: Run simple code run: python -c 'import math; print(math.factorial(5))' + + - name: Assert PyPy is running + run: | + import platform + assert platform.python_implementation().lower() == "pypy" + shell: python + + - name: Assert expected binaries (or symlinks) are present + run: | + EXECUTABLE=${{ matrix.pypy }} + EXECUTABLE=${EXECUTABLE/-/} # remove the first '-' in "pypy-X.Y" -> "pypyX.Y" to match executable name + EXECUTABLE=${EXECUTABLE%%-*} # remove any -* suffixe + ${EXECUTABLE} --version + shell: bash diff --git a/dist/setup/index.js b/dist/setup/index.js index c51a5f7..7c47a47 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -10283,11 +10283,14 @@ function createPyPySymlink(pypyBinaryPath, pythonVersion) { return __awaiter(this, void 0, void 0, function* () { const version = semver.coerce(pythonVersion); const pythonBinaryPostfix = semver.major(version); + const pythonMinor = semver.minor(version); const pypyBinaryPostfix = pythonBinaryPostfix === 2 ? '' : '3'; + const pypyMajorMinorBinaryPostfix = `${pythonBinaryPostfix}.${pythonMinor}`; let binaryExtension = utils_1.IS_WINDOWS ? '.exe' : ''; core.info('Creating symlinks...'); utils_1.createSymlinkInFolder(pypyBinaryPath, `pypy${pypyBinaryPostfix}${binaryExtension}`, `python${pythonBinaryPostfix}${binaryExtension}`, true); utils_1.createSymlinkInFolder(pypyBinaryPath, `pypy${pypyBinaryPostfix}${binaryExtension}`, `python${binaryExtension}`, true); + utils_1.createSymlinkInFolder(pypyBinaryPath, `pypy${pypyBinaryPostfix}${binaryExtension}`, `pypy${pypyMajorMinorBinaryPostfix}${binaryExtension}`, true); }); } function installPip(pythonLocation) { diff --git a/src/install-pypy.ts b/src/install-pypy.ts index 402525a..c3718b7 100644 --- a/src/install-pypy.ts +++ b/src/install-pypy.ts @@ -98,7 +98,9 @@ async function createPyPySymlink( ) { const version = semver.coerce(pythonVersion)!; const pythonBinaryPostfix = semver.major(version); + const pythonMinor = semver.minor(version); const pypyBinaryPostfix = pythonBinaryPostfix === 2 ? '' : '3'; + const pypyMajorMinorBinaryPostfix = `${pythonBinaryPostfix}.${pythonMinor}`; let binaryExtension = IS_WINDOWS ? '.exe' : ''; core.info('Creating symlinks...'); @@ -115,6 +117,13 @@ async function createPyPySymlink( `python${binaryExtension}`, true ); + + createSymlinkInFolder( + pypyBinaryPath, + `pypy${pypyBinaryPostfix}${binaryExtension}`, + `pypy${pypyMajorMinorBinaryPostfix}${binaryExtension}`, + true + ); } async function installPip(pythonLocation: string) {