actions/setup-python
1
0
Fork 0
mirror of https://gitea.com/actions/setup-python.git synced 2025-10-31 00:58:07 +07:00
Code

Improve find-python to add "Scripts" folder to PATH on Windows machines (#169)

Browse Source 
* added 'Scripts' folder to PATH on Windows

* add release code

* update index.js

* rebuild index.js

* remove duplicate block

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
Co-authored-by: Dmitry Shibanov <dmitry-shibanov@github.com>
This commit is contained in:
Nikita Bykov 2020-12-17 18:02:13 +03:00 committed by GitHub
parent 3b3f2de1b1
commit 2831efe49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js vendored
View File

@ -6738,6 +6738,10 @@ function usePyPy(majorVersion, architecture) {
core.exportVariable('pythonLocation', pythonLocation); core.exportVariable('pythonLocation', pythonLocation);
core.addPath(installDir); core.addPath(installDir);
core.addPath(_binDir); core.addPath(_binDir);
// Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
if (IS_WINDOWS) {
core.addPath(path.join(installDir, 'Scripts'));
}
const impl = 'pypy' + majorVersion.toString(); const impl = 'pypy' + majorVersion.toString();
core.setOutput('python-version', impl); core.setOutput('python-version', impl);
return { impl: impl, version: versionFromPath(installDir) }; return { impl: impl, version: versionFromPath(installDir) };

4
src/find-python.ts
View File

@ -66,6 +66,10 @@ function usePyPy(
core.addPath(installDir); core.addPath(installDir);
core.addPath(_binDir); core.addPath(_binDir);
// Starting from PyPy 7.3.1, the folder that is used for pip and anything that pip installs should be "Scripts" on Windows.
if (IS_WINDOWS) {
core.addPath(path.join(installDir, 'Scripts'));
}
const impl = 'pypy' + majorVersion.toString(); const impl = 'pypy' + majorVersion.toString();
core.setOutput('python-version', impl); core.setOutput('python-version', impl);