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

nikita-bykov · Nikita Bykov · dmitry-shibanov · web-flow · commit 2831efe49a72 · 2020-12-17T16:02:13.000+01:00
* added 'Scripts' folder to PATH on Windows

* add release code

* update index.js

* rebuild index.js

* remove duplicate block

Co-authored-by: Nikita Bykov &lt;v-nibyko@microsoft.com&gt;
Co-authored-by: Dmitry Shibanov &lt;dmitry-shibanov@github.com&gt;
diff --git a/dist/index.js b/dist/index.js
@@ -6738,6 +6738,10 @@ 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'));
+    }
     const impl = 'pypy' + majorVersion.toString();
     core.setOutput('python-version', impl);
     return { impl: impl, version: versionFromPath(installDir) };
diff --git a/src/find-python.ts b/src/find-python.ts
@@ -66,6 +66,10 @@ 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'));
+  }
 
   const impl = 'pypy' + majorVersion.toString();
   core.setOutput('python-version', impl);
