added Scripts to PATH on Windows (#173)

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/workflow.yml

@@ -9,12 +9,12 @@ jobs:
         operating-system: [ubuntu-latest, windows-latest]
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v2
 
-    - name: Set Node.js 10.x
-      uses: actions/setup-node@master
+    - name: Set Node.js 12.x
+      uses: actions/setup-node@v1
       with:
-        node-version: 10.x
+        node-version: 12.x
 
     - name: npm install
       run: npm install

__tests__/finder.test.ts

@@ -5,21 +5,13 @@ import path = require('path');
 const toolDir = path.join(
   __dirname,
   'runner',
-  path.join(
-    Math.random()
-      .toString(36)
-      .substring(7)
-  ),
+  path.join(Math.random().toString(36).substring(7)),
   'tools'
 );
 const tempDir = path.join(
   __dirname,
   'runner',
-  path.join(
-    Math.random()
-      .toString(36)
-      .substring(7)
-  ),
+  path.join(Math.random().toString(36).substring(7)),
   'temp'
 );
 

package.json

@@ -23,27 +23,27 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.3",
-    "semver": "^6.1.1"
+    "@actions/core": "^1.2.6",
+    "semver": "^7.1.3"
   },
   "devDependencies": {
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^1.3.2",
-    "@types/jest": "^24.9.1",
-    "@types/node": "^12.12.29",
-    "@types/semver": "^6.2.1",
-    "@zeit/ncc": "^0.20.5",
-    "husky": "^3.1.0",
-    "jest": "^24.9.0",
-    "jest-circus": "^24.9.0",
-    "prettier": "^1.19.1",
-    "ts-jest": "^24.3.0",
+    "@actions/tool-cache": "^1.3.3",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^12.12.31",
+    "@types/semver": "^7.1.0",
+    "@zeit/ncc": "^0.22.0",
+    "husky": "^4.2.3",
+    "jest": "^25.1.0",
+    "jest-circus": "^25.1.0",
+    "prettier": "^2.0.2",
+    "ts-jest": "^25.2.1",
     "typescript": "^3.8.3"
   },
   "husky": {
     "skipCI": true,
     "hooks": {
-      "pre-commit": "npm run build && npm run format"
+      "pre-commit": "npm run build && npm run format-check"
     }
   }
 }

src/find-python.ts

@@ -51,8 +51,11 @@ function binDir(installDir: string): string {
 // A particular version of PyPy may contain one or more versions of the Python interpreter.
 // For example, PyPy 7.0 contains Python 2.7, 3.5, and 3.6-alpha.
 // We only care about the Python version, so we don't use the PyPy version for the tool cache.
-function usePyPy(majorVersion: 2 | 3, architecture: string): InstalledVersion {
-  const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion.toString());
+function usePyPy(
+  majorVersion: '2' | '3.6',
+  architecture: string
+): InstalledVersion {
+  const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion);
   let installDir: string | null = findPyPy(architecture);
 
   if (!installDir && IS_WINDOWS) {
@@ -77,6 +80,10 @@ function usePyPy(majorVersion: 2 | 3, architecture: string): InstalledVersion {
 
   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);
@@ -186,9 +193,10 @@ export async function findPythonVersion(
 ): Promise<InstalledVersion> {
   switch (version.toUpperCase()) {
     case 'PYPY2':
-      return usePyPy(2, architecture);
+      return usePyPy('2', architecture);
     case 'PYPY3':
-      return usePyPy(3, architecture);
+      // keep pypy3 pointing to 3.6 for backward compatibility
+      return usePyPy('3.6', architecture);
     default:
       return await useCpythonVersion(version, architecture);
   }