Skip to content

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

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
konradpabjan merged 7 commits into from
Dec 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97efd31
Merge pull request #2 from actions/main
nikita-bykov Jul 18, 2020
6aa0ca3
Merge branch 'main' of https://github.com/nikita-bykov/setup-python i…
Dec 16, 2020
6e67af9
added 'Scripts' folder to PATH on Windows
Dec 16, 2020
52b59a2
add release code
Dec 17, 2020
09aeb67
update index.js
Dec 17, 2020
dcd7128
rebuild index.js
dmitry-shibanov Dec 17, 2020
bedb244
remove duplicate block
dmitry-shibanov Dec 17, 2020
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: 8 additions & 0 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6738,6 +6738,14 @@ function usePyPy(majorVersion, architecture) {
core.exportVariable('pythonLocation', pythonLocation);
core.addPath(installDir);
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'));
}
if (IS_WINDOWS) {
const scriptDir = path.join(installDir, 'Scripts');
core.addPath(scriptDir);
}
const impl = 'pypy' + majorVersion.toString();
core.setOutput('python-version', impl);
return { impl: impl, version: versionFromPath(installDir) };
Expand Down
9 changes: 9 additions & 0 deletions src/find-python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ function usePyPy(

core.addPath(installDir);
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'));
}

if (IS_WINDOWS) {
const scriptDir = path.join(installDir, 'Scripts');
core.addPath(scriptDir);
}
Comment thread
konradpabjan marked this conversation as resolved.
Resolved

const impl = 'pypy' + majorVersion.toString();
core.setOutput('python-version', impl);
Expand Down