Fix matrix value for non-default py version example (#100)

* Updated self-hosted guidelines

* Apply suggestions from code review

Co-authored-by: Brian Cristante <33549821+brcrista@users.noreply.github.com>

* PR Feedback

* Apply suggestions from code review

Co-authored-by: Brian Cristante <33549821+brcrista@users.noreply.github.com>

Co-authored-by: Brian Cristante <33549821+brcrista@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Which version of the action are you using?**
+
+- [ ] `v1`
+- [ ] `v2`
+- [ ] Some other tag (such as `v2.0.1` or `master`)
+
+**Environment**
+- [ ] self-hosted
+- [ ] Linux
+- [ ] Windows
+- [ ] Mac
+
+If applicable, please specify if you're using a container
+
+**Python Versions**
+Please list all of the effected versions of Python (`3.8.2`, etc.)
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Run/Repo Url**
+If applicable, and if your repo/run is public, please include a URL so it is easier for us to investigate.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,45 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  schedule:
+    - cron: '25 3 * * 5'
+
+jobs:
+  CodeQL-Build:
+
+    strategy:
+      fail-fast: false
+
+    # CodeQL runs on ubuntu-latest and windows-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/lint-yaml.yml

@@ -1,12 +0,0 @@
-name: Lint YAML
-on: [pull_request]
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Lint action.yml
-      uses: ibiqlik/action-yamllint@master
-      with:
-        file_or_dir: action.yml
-        config_file: yaml-lint-config.yml

.github/workflows/test.yml

@@ -1,8 +1,15 @@
 name: Validate 'setup-python'
 on: 
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
   pull_request:
     paths-ignore:
       - '**.md'
+  schedule:
+    - cron: 0 0 * * *
 
 jobs:
   default-version:
@@ -11,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
+        os: [macos-latest, windows-latest, ubuntu-16.04, ubuntu-18.04]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -25,14 +32,14 @@ jobs:
     - name: Run simple python code
       run: python -c 'import math; print(math.factorial(5))'
 
-  setup-python:
+  setup-versions-from-manifest:
     name: Setup ${{ matrix.python }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
+        os: [macos-latest, windows-latest, ubuntu-16.04, ubuntu-18.04]
-        python: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -45,7 +52,7 @@ jobs:
     - name: Validate version
       run: |
         $pythonVersion = (python --version)
-        if ("$pythonVersion" -notlike "Python ${{ matrix.python }}.*"){
+        if ("Python ${{ matrix.python }}" -ne "$pythonVersion"){
           Write-Host "The current version is $pythonVersion; expected version is ${{ matrix.python }}"
           exit 1
         }
@@ -54,24 +61,3 @@ jobs:
 
     - name: Run simple code
       run: python -c 'import math; print(math.factorial(5))'
-
-  setup-pypy:
-    name: Setup PyPy ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: setup-python pypy3
-      uses: ./
-      with:
-        python-version: 'pypy3'
-
-    - name: setup-python pypy2
-      uses: ./
-      with:
-        python-version: 'pypy2'

.github/workflows/workflow.yml

@@ -1,5 +1,13 @@
 name: Main workflow
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
 jobs:
   run:
     name: Run
@@ -24,3 +32,59 @@ jobs:
 
     - name: npm test
       run: npm test
+
+    - name: Run with setup-python 2.7
+      uses: ./
+      with:
+        python-version: 2.7
+    - name: Verify 2.7
+      run: python __tests__/verify-python.py 2.7
+
+    - name: Run with setup-python 3.5
+      uses: ./
+      with:
+        python-version: 3.5
+    - name: Verify 3.5
+      run: python __tests__/verify-python.py 3.5
+
+    - name: Run with setup-python 3.6
+      uses: ./
+      with:
+        python-version: 3.6
+    - name: Verify 3.6
+      run: python __tests__/verify-python.py 3.6
+
+    - name: Run with setup-python 3.7
+      uses: ./
+      with:
+        python-version: 3.7
+    - name: Verify 3.7
+      run: python __tests__/verify-python.py 3.7
+
+    - name: Run with setup-python 3.8
+      uses: ./
+      with:
+        python-version: 3.8
+    - name: Verify 3.8
+      run: python __tests__/verify-python.py 3.8
+    
+    - name: Run with setup-python 3.7.5
+      uses: ./
+      with:
+        python-version: 3.7.5
+    - name: Verify 3.7.5
+      run: python __tests__/verify-python.py 3.7.5
+
+    - name: Run with setup-python 3.6.7
+      uses: ./
+      with:
+        python-version: 3.6.7
+    - name: Verify 3.6.7
+      run: python __tests__/verify-python.py 3.6.7
+
+    - name: Run with setup-python 3.8.1
+      uses: ./
+      with:
+        python-version: 3.8.1
+    - name: Verify 3.8.1
+      run: python __tests__/verify-python.py 3.8.1

README.md

@@ -1,4 +1,4 @@
-# setup-python
+# setup-python V2
 
 <p align="left">
   <a href="https://github.com/actions/setup-python"><img alt="GitHub Actions status" src="https://github.com/actions/setup-python/workflows/Main%20workflow/badge.svg"></a>
@@ -6,9 +6,17 @@
 
 This action sets up a Python environment for use in actions by:
 
-- optionally installing a version of Python and adding to PATH. Note that this action only uses versions of Python already installed in the cache. The action will fail if no matching versions are found.
+- optionally installing and adding to PATH a version of Python that is already installed in the tools cache
+- downloading, installing and adding to PATH an available version of Python from GitHub Releases ([actions/python-versions](https://github.com/actions/python-versions/releases)) if a specific version is not available in the tools cache
+- failing if a specific version of Python is not preinstalled or available for download
 - registering problem matchers for error output
 
+# What's new
+
+- Ability to download, install and set up Python packages from `actions/python-versions` that do not come preinstalled on runners
+  - Allows for pinning to a specific patch version of Python without the worry of it ever being removed or changed
+- Automatic setup and download of Python packages if using a self-hosted runner
+
 # Usage
 
 See [action.yml](action.yml)
@@ -17,7 +25,7 @@ Basic:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-python@v1
+- uses: actions/setup-python@v2
   with:
     python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
     architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -36,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -60,20 +68,50 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Display Python version
         run: python -c "import sys; print(sys.version)"
 ```
 
+Download and set up a version of Python that does not come preinstalled on an image:
+```yaml
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+        # in this example, there is a newer version already installed, 3.7.7, so the older version will be downloaded
+        python-version: [3.5, 3.6, 3.7.4, 3.8]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - run: python my_script.py
+
+```
+
 # Getting started with Python + Actions
 
 Check out our detailed guide on using [Python with GitHub Actions](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/using-python-with-github-actions).
 
+# Available versions of Python
+
+`setup-python` is able to configure Python from two sources:
+
+- Preinstalled versions of Python in the tools cache on GitHub-hosted runners
+    - For detailed information regarding the available versions of Python that are installed see [Software installed on GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners).
+    - For every minor version of Python, expect only the latest patch to be preinstalled.
+    - If `3.8.1` is installed for example, and `3.8.2` is released, expect `3.8.1` to be removed and replaced by `3.8.2` in the tools cache.
+    - If the exact patch version doesn't matter to you, specifying just the major and minor version will get you the latest preinstalled patch version. In the previous example, the version spec `3.8` will use the `3.8.2` Python version found in the cache.
+- Downloadable Python versions from GitHub Releases ([actions/python-versions](https://github.com/actions/python-versions/releases))
+    - All available versions are listed in the [version-manifest.json](https://github.com/actions/python-versions/blob/master/versions-manifest.json) file.
+    - If there is a specific version of Python that is not available, you can open an issue here
+
 # Hosted Tool Cache
 
-GitHub hosted runners have a tools cache that comes with Python + PyPy already installed. This tools cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tools cache and there is where you will find Python and PyPy installed. `setup-python` works by taking a specific version of Python or PyPy in this tools cache and adding it to PATH.
+GitHub hosted runners have a tools cache that comes with a few versions of Python + PyPy already installed. This tools cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tools cache and there is where you will find Python and PyPy installed. `setup-python` works by taking a specific version of Python or PyPy in this tools cache and adding it to PATH.
 
 || Location |
 |------|-------|
@@ -85,35 +123,61 @@ GitHub virtual environments are setup in [actions/virtual-environments](https://
 - [Tools cache setup for Ubuntu](https://github.com/actions/virtual-environments/blob/master/images/linux/scripts/installers/hosted-tool-cache.sh)
 - [Tools cache setup for Windows](https://github.com/actions/virtual-environments/blob/master/images/win/scripts/Installers/Download-ToolCache.ps1)
 
+# Specifying a Python version
+
+If there is a specific version of Python that you need and you don't want to worry about any potential breaking changes due to patch updates (going from `3.7.5` to `3.7.6` for example), you should specify the exact major, minor, and patch version (such as `3.7.5`)
+  - The only downside to this is that set up will take a little longer since the exact version will have to be downloaded if the exact version is not already installed on the runner due to more recent versions.
+  - MSI installers are used on Windows for this, so runs will take a little longer to set up vs Mac and Linux.
+
+You should specify only a major and minor version if you are okay with the most recent patch version being used.
+  - There will be a single patch version already installed on each runner for every minor version of Python that is supported.
+  - The patch version that will be preinstalled, will generally be the latest and every time there is a new patch released, the older version that is preinstalled will be replaced.
+  - Using the most recent patch version will result in a very quick setup since no downloads will be required since a locally installed version Python on the runner will be used.
+
 # Using `setup-python` with a self hosted runner
 
-If you would like to use `setup-python` on a self-hosted runner, you will need to download all versions of Python & PyPy that you would like and setup a similar tools cache locally for your runner.
+If you would like to use `setup-python` and a self-hosted runner, there are a few extra things you need to make sure are set up so that new versions of Python can be downloaded and configured on your runner.
+
+### Windows
+
+- Your runner needs to be running with administrator privileges so that the appropriate directories and files can be set up when downloading and installing a new version of Python for the first time.
+- If your runner is configured as a service, make sure the account that is running the service has the appropriate write permissions so that Python can get installed. The default `NT AUTHORITY\NETWORK SERVICE` should be sufficient.
+- You need `7zip` installed and added to your `PATH` so that the downloaded versions of Python files can be extracted properly during first-time setup.
+- MSI installers are used when setting up Python on Windows. A word of caution as MSI installers update registry settings.
+- The 3.8 MSI installer for Windows will not let you install another 3.8 version of Python. If `setup-python` fails for a 3.8 version of Python, make sure any previously installed versions are removed by going to "Apps & Features" in the Settings app.
+
+### Linux
+
+- The Python packages that are downloaded from `actions/python-versions` are originally compiled from source in `/opt/hostedtoolcache/` with the [--enable-shared](https://github.com/actions/python-versions/blob/94f04ae6806c6633c82db94c6406a16e17decd5c/builders/ubuntu-python-builder.psm1#L35) flag, which makes them non-relocatable.
+- Create an environment variable called `AGENT_TOOLSDIRECTORY` and set it to `/opt/hostedtoolcache`. This controls where the runner downloads and installs tools.
+  - In the same shell that your runner is using, type `export AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache`
+  - A more permanent way of setting the environment variable is to create a `.env` file in the same directory as your runner and to add `AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache`. This ensures the variable is always set if your runner is configured as a service.
+- Create a directory called `hostedtoolcache` inside `/opt`.
+- The user starting the runner must have write permission to the `/opt/hostedtoolcache` directory. It is not possible to start the Linux runner with `sudo` and the `/opt` directory usually requires root privileges to write to. Check the current user and group that the runner belongs to by typing `ls -l` inside the runners root directory.
+- The runner can be granted write access to the `/opt/hostedtoolcache` directory using a few techniques:
+  - The user starting the runner is the owner, and the owner has write permission
+  - The user starting the runner is in the owning group, and the owning group has write permission
+  - All users have write permission
+- One quick way to grant access is to change the user and group of `/opt/hostedtoolcache` to be the same as the runners using `chown`
+    - `sudo chown runner-user:runner-group opt/hostedtoolcache/`
+- If your runner is configured as a service and you run into problems, make sure the user that the service is running as is correct. For more information, you can [check the status of your self-hosted runner](https://help.github.com/en/actions/hosting-your-own-runners/configuring-the-self-hosted-runner-application-as-a-service#checking-the-status-of-the-service).
+
+### Mac
+
+- The same setup that applies to `Linux` also applies to `Mac`, just with a different tools cache directory.
+- Create a directory called `/Users/runner/hostedtoolcache`
+- Set the `AGENT_TOOLSDIRECTORY` environment variable to `/Users/runner/hostedtoolcache`.
+- Change the permissions of `/Users/runner/hostedtoolcache` so that the runner has write access.
 
-- Create an global environment variable called `AGENT_TOOLSDIRECTORY` that will point to the root directory of where you want the tools installed. The env variable is preferrably global as it must be set in the shell that will install the tools cache, along with the shell that the runner will be using.
-    - This env variable is used internally by the runner to set the `RUNNER_TOOL_CACHE` env variable
-    - Example for Administrator Powershell: `[System.Environment]::SetEnvironmentVariable("AGENT_TOOLSDIRECTORY", "C:\hostedtoolcache\windows", [System.EnvironmentVariableTarget]::Machine)` (restart the shell afterwards)
--  Download the appropriate NPM packages from the [GitHub Actions NPM registry](https://github.com/orgs/actions/packages)
-    - Make sure to have `npm` installed, and then [configure npm for use with GitHub packages](https://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages#authenticating-to-github-package-registry)
-    - Create an empty npm project for easier installation (`npm init`) in the tools cache directory. You can delete `package.json`, `package.lock.json` and `node_modules` after all tools get installed
-    - Before downloading a specific package, create an empty folder for the version of Python/PyPY that is being installed. If downloading Python 3.6.8 for example, create `C:\hostedtoolcache\windows\Python\3.6.8`
-    - Once configured, download a specific package by calling `npm install`. Note (if downloading a PyPy package on Windows, you will need 7zip installed along with `7z.exe` added to your PATH)
-- Each NPM package has multiple versions that determine the version of Python or PyPy that should be installed. 
-    - `npm install @actions/toolcache-python-windows-x64@3.7.61579791175` for example installs Python 3.7.6 while `npm install @actions/toolcache-python-windows-x64@3.6.81579791177` installs Python 3.6.8
-    - You can browse and find all available versions of a package by searching the GitHub Actions NPM registry
-![image](https://user-images.githubusercontent.com/16109154/76194005-87aeb400-61e5-11ea-9b21-ef9111247f84.png)
 
 # Using Python without `setup-python`
 
 `setup-python` helps keep your dependencies explicit and ensures consistent behavior between different runners. If you use `python` in a shell on a GitHub hosted runner without `setup-python` it will default to whatever is in PATH. The default version of Python in PATH vary between runners and can change unexpectedly so we recommend you always use `setup-python`.
 
-# Available versions of Python
-
-For detailed information regarding the available versions of Python that are installed see [Software installed on GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners)
-
 # License
 
 The scripts and documentation in this project are released under the [MIT License](LICENSE)
 
 # Contributions
 
-Contributions are welcome!  See [Contributor's Guide](docs/contributors.md)
+Contributions are welcome! See our [Contributor's Guide](docs/contributors.md)

__tests__/data/python-release.json

@@ -0,0 +1,13 @@
+{
+    "version": "1.2.3",
+    "stable": true,
+    "release_url": "https://github.com/actions/sometool/releases/tag/1.2.3-20200402.6",
+    "files": [
+      {
+        "filename": "sometool-1.2.3-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://github.com/actions/sometool/releases/tag/1.2.3-20200402.6/sometool-1.2.3-linux-x64.tar.gz"
+      }      
+    ]
+}

__tests__/finder.test.ts

@@ -18,19 +18,48 @@ const tempDir = path.join(
 process.env['RUNNER_TOOL_CACHE'] = toolDir;
 process.env['RUNNER_TEMP'] = tempDir;
 
+import * as tc from '@actions/tool-cache';
 import * as finder from '../src/find-python';
+import * as installer from '../src/install-python';
+
+const pythonRelease = require('./data/python-release.json');
 
 describe('Finder tests', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+    jest.clearAllMocks();
+  });
+
   it('Finds Python if it is installed', async () => {
     const pythonDir: string = path.join(toolDir, 'Python', '3.0.0', 'x64');
     await io.mkdirP(pythonDir);
     fs.writeFileSync(`${pythonDir}.complete`, 'hello');
-    // This will throw if it doesn't find it in the cache (because no such version exists)
+    // This will throw if it doesn't find it in the cache and in the manifest (because no such version exists)
     await finder.findPythonVersion('3.x', 'x64');
   });
 
+  it('Finds Python if it is not installed, but exists in the manifest', async () => {
+    const findSpy: jest.SpyInstance = jest.spyOn(
+      installer,
+      'findReleaseFromManifest'
+    );
+    findSpy.mockImplementation(() => <tc.IToolRelease>pythonRelease);
+
+    const installSpy: jest.SpyInstance = jest.spyOn(
+      installer,
+      'installCpythonFromRelease'
+    );
+    installSpy.mockImplementation(async () => {
+      const pythonDir: string = path.join(toolDir, 'Python', '1.2.3', 'x64');
+      await io.mkdirP(pythonDir);
+      fs.writeFileSync(`${pythonDir}.complete`, 'hello');
+    });
+    // This will throw if it doesn't find it in the cache and in the manifest (because no such version exists)
+    await finder.findPythonVersion('1.2.3', 'x64');
+  });
+
   it('Errors if Python is not installed', async () => {
-    // This will throw if it doesn't find it in the cache (because no such version exists)
+    // This will throw if it doesn't find it in the cache and in the manifest (because no such version exists)
     let thrown = false;
     try {
       await finder.findPythonVersion('3.300000', 'x64');

__tests__/verify-python.py

@@ -0,0 +1,22 @@
+import sys
+argCount = len(sys.argv) - 1
+
+if argCount == 1:
+    expectedVersion = sys.argv[1]
+    versions = len(expectedVersion.split("."))
+    majorMinor = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
+
+    if versions == 2:
+        # Test only major and minor version
+        if expectedVersion != majorMinor:
+            raise Exception("Incorrect major + minor version detected\nExpected: " + expectedVersion + "\nActual: " + majorMinor)
+    elif versions == 3:
+        # Test major, minor and micro version
+        majorMinorMicro = majorMinor + '.' + str(sys.version_info[2])
+        if expectedVersion != majorMinorMicro:
+            raise Exception("Incorrect major + minor + micro version detected\nExpected: " + expectedVersion + "\nActual: " + majorMinorMicro)
+    else: 
+        raise Exception("Incorrect number of arguments supplied")
+    print("Correct version of Python " + expectedVersion + " detected")
+else:
+    raise Exception("Incorrect number of arguments supplied")

action.yml

@@ -8,7 +8,9 @@ inputs:
     default: '3.x'
   architecture:
     description: 'The target architecture (x86, x64) of the Python interpreter.'
-    default: 'x64'
+  token:
+    description: Used to pull python distributions from actions/python-versions. Since there's a default, this is typically not supplied by the user.
+    default: ${{ github.token }}
 outputs:
   python-version:
     description: "The installed python version. Useful when given a version range as input."

docs/contributors.md

@@ -16,11 +16,11 @@ If you're developing locally, you can run
 ```
 npm install
 tsc
-ncc build
+ncc build src/setup-python.ts
 ```
 Any files generated using `tsc` will be added to `lib/`, however those files also are not uploaded to the repository and are exluded using `.gitignore`.
 
-During the commit step, Husky will take care of formatting all files with [Prettier](https://github.com/prettier/prettier)
+During the commit step, Husky will take care of formatting all files with [Prettier](https://github.com/prettier/prettier) (to run manually, use `npm run format`).
 
 ### Testing
 

package-lock.json

@@ -1,46 +1,27 @@
 {
   "name": "setup-python",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@actions/core": {
-      "version": "1.10.0",
+      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.3.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+      "integrity": "sha512-Wp4xnyokakM45Uuj4WLUxdsa8fJjKVl1fDTsPbTEcTcuu0Nb26IPQbOtjmnfaCPGcaoPOOqId8H9NapZ8gii4w=="
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "@actions/http-client": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
-          "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
-          "requires": {
-            "tunnel": "^0.0.6"
-          }
-        },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        }
-      }
     },
     "@actions/exec": {
-      "version": "1.0.3",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.4.tgz",
-      "integrity": "sha512-TogJGnueOmM7ntCi0ASTUj4LapRRtDfj57Ja4IhPmg2fls28uVOPbAn8N+JifaOumN2UG3oEO/Ixek2A4NcYSA==",
+      "integrity": "sha512-4DPChWow9yc9W3WqEbUj8Nr86xkpyE29ZzWjXucHItclLbEW6jr80Zx4nqv18QL6KK65+cifiQZXvnqgTV6oHw==",
       "dev": true,
       "requires": {
         "@actions/io": "^1.0.1"
       }
     },
     "@actions/http-client": {
-      "version": "1.0.6",
+      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.8.tgz",
-      "integrity": "sha512-LGmio4w98UyGX33b/W6V6Nx/sQHRXZ859YlMkn36wPsXPB82u8xTVlA/Dq2DXrm6lEq9RVmisRJa1c+HETAIJA==",
+      "integrity": "sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==",
       "dev": true,
       "requires": {
         "tunnel": "0.0.6"
@@ -53,14 +34,14 @@
       "dev": true
     },
     "@actions/tool-cache": {
-      "version": "1.3.3",
+      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.5.5.tgz",
-      "integrity": "sha512-AFVyTLcIxusDVI1gMhbZW8m/On7YNJG+xYaxorV+qic+f7lO7h37aT2mfzxqAq7mwHxtP1YlVFNrXe9QDf/bPg==",
+      "integrity": "sha512-y/YO37BOaXzOEHpvoGZDLCwvg6XZWQ7Ala4Np4xzrKD1r48mff+K/GAmzXMejnApU7kgqC6lL/aCKTZDCrhdmw==",
       "dev": true,
       "requires": {
-        "@actions/core": "^1.2.0",
+        "@actions/core": "^1.2.3",
         "@actions/exec": "^1.0.0",
-        "@actions/http-client": "^1.0.3",
+        "@actions/http-client": "^1.0.8",
         "@actions/io": "^1.0.1",
         "semver": "^6.1.0",
         "uuid": "^3.3.2"
@@ -4562,7 +4543,8 @@
     "tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true
     },
     "tunnel-agent": {
       "version": "0.6.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-python",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "private": true,
   "description": "Setup python action",
   "main": "dist/index.js",
@@ -23,12 +23,12 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.10.0",
+    "@actions/core": "^1.2.3",
     "semver": "^7.1.3"
   },
   "devDependencies": {
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^1.3.3",
+    "@actions/tool-cache": "^1.5.5",
     "@types/jest": "^25.1.4",
     "@types/node": "^12.12.31",
     "@types/semver": "^7.1.0",

src/find-python.ts

@@ -3,22 +3,7 @@ import * as path from 'path';
 
 import * as semver from 'semver';
 
-let cacheDirectory = process.env['RUNNER_TOOLSDIRECTORY'] || '';
+import * as installer from './install-python';
-
-if (!cacheDirectory) {
-  let baseLocation;
-  if (process.platform === 'win32') {
-    // On windows use the USERPROFILE env variable
-    baseLocation = process.env['USERPROFILE'] || 'C:\\';
-  } else {
-    if (process.platform === 'darwin') {
-      baseLocation = '/Users';
-    } else {
-      baseLocation = '/home';
-    }
-  }
-  cacheDirectory = path.join(baseLocation, 'actions', 'cache');
-}
 
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
@@ -51,11 +36,8 @@ 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(
+function usePyPy(majorVersion: 2 | 3, architecture: string): InstalledVersion {
-  majorVersion: '2' | '3.6',
+  const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion.toString());
-  architecture: string
-): InstalledVersion {
-  const findPyPy = tc.find.bind(undefined, 'PyPy', majorVersion);
   let installDir: string | null = findPyPy(architecture);
 
   if (!installDir && IS_WINDOWS) {
@@ -80,10 +62,6 @@ 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);
@@ -99,29 +77,33 @@ async function useCpythonVersion(
   const semanticVersionSpec = pythonVersionToSemantic(desugaredVersionSpec);
   core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`);
 
-  const installDir: string | null = tc.find(
+  let installDir: string | null = tc.find(
     'Python',
     semanticVersionSpec,
     architecture
   );
   if (!installDir) {
-    // Fail and list available versions
+    core.info(
-    const x86Versions = tc
+      `Version ${semanticVersionSpec} was not found in the local cache`
-      .findAllVersions('Python', 'x86')
+    );
-      .map(s => `${s} (x86)`)
+    const foundRelease = await installer.findReleaseFromManifest(
-      .join(os.EOL);
+      semanticVersionSpec,
+      architecture
+    );
 
-    const x64Versions = tc
+    if (foundRelease && foundRelease.files && foundRelease.files.length > 0) {
-      .findAllVersions('Python', 'x64')
+      core.info(`Version ${semanticVersionSpec} is available for downloading`);
-      .map(s => `${s} (x64)`)
+      await installer.installCpythonFromRelease(foundRelease);
-      .join(os.EOL);
 
+      installDir = tc.find('Python', semanticVersionSpec, architecture);
+    }
+  }
+
+  if (!installDir) {
     throw new Error(
       [
         `Version ${version} with arch ${architecture} not found`,
-        'Available versions:',
+        `The list of all available versions can be found here: ${installer.MANIFEST_URL}`
-        x86Versions,
-        x64Versions
       ].join(os.EOL)
     );
   }
@@ -193,10 +175,9 @@ export async function findPythonVersion(
 ): Promise<InstalledVersion> {
   switch (version.toUpperCase()) {
     case 'PYPY2':
-      return usePyPy('2', architecture);
+      return usePyPy(2, architecture);
     case 'PYPY3':
-      // keep pypy3 pointing to 3.6 for backward compatibility
+      return usePyPy(3, architecture);
-      return usePyPy('3.6', architecture);
     default:
       return await useCpythonVersion(version, architecture);
   }

src/install-python.ts

@@ -0,0 +1,73 @@
+import * as path from 'path';
+import * as core from '@actions/core';
+import * as tc from '@actions/tool-cache';
+import * as exec from '@actions/exec';
+import {ExecOptions} from '@actions/exec/lib/interfaces';
+
+const TOKEN = core.getInput('token');
+const AUTH = !TOKEN || isGhes() ? undefined : `token ${TOKEN}`;
+const MANIFEST_REPO_OWNER = 'actions';
+const MANIFEST_REPO_NAME = 'python-versions';
+export const MANIFEST_URL = `https://raw.githubusercontent.com/${MANIFEST_REPO_OWNER}/${MANIFEST_REPO_NAME}/master/versions-manifest.json`;
+
+const IS_WINDOWS = process.platform === 'win32';
+
+export async function findReleaseFromManifest(
+  semanticVersionSpec: string,
+  architecture: string
+): Promise<tc.IToolRelease | undefined> {
+  const manifest: tc.IToolRelease[] = await tc.getManifestFromRepo(
+    MANIFEST_REPO_OWNER,
+    MANIFEST_REPO_NAME,
+    AUTH
+  );
+  return await tc.findFromManifest(
+    semanticVersionSpec,
+    true,
+    manifest,
+    architecture
+  );
+}
+
+async function installPython(workingDirectory: string) {
+  const options: ExecOptions = {
+    cwd: workingDirectory,
+    silent: true,
+    listeners: {
+      stdout: (data: Buffer) => {
+        core.debug(data.toString().trim());
+      }
+    }
+  };
+
+  if (IS_WINDOWS) {
+    await exec.exec('powershell', ['./setup.ps1'], options);
+  } else {
+    await exec.exec('bash', ['./setup.sh'], options);
+  }
+}
+
+export async function installCpythonFromRelease(release: tc.IToolRelease) {
+  const downloadUrl = release.files[0].download_url;
+
+  core.info(`Download from "${downloadUrl}"`);
+  const pythonPath = await tc.downloadTool(downloadUrl, undefined, AUTH);
+  const fileName = path.basename(pythonPath, '.zip');
+  core.info('Extract downloaded archive');
+  let pythonExtractedFolder;
+  if (IS_WINDOWS) {
+    pythonExtractedFolder = await tc.extractZip(pythonPath, `./${fileName}`);
+  } else {
+    pythonExtractedFolder = await tc.extractTar(pythonPath, `./${fileName}`);
+  }
+
+  core.info('Execute installation script');
+  await installPython(pythonExtractedFolder);
+}
+
+function isGhes(): boolean {
+  const ghUrl = new URL(
+    process.env['GITHUB_SERVER_URL'] || 'https://github.com'
+  );
+  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+}

src/setup-python.ts

@@ -1,12 +1,13 @@
 import * as core from '@actions/core';
 import * as finder from './find-python';
 import * as path from 'path';
+import * as os from 'os';
 
 async function run() {
   try {
     let version = core.getInput('python-version');
     if (version) {
-      const arch: string = core.getInput('architecture', {required: true});
+      const arch: string = core.getInput('architecture') || os.arch();
       const installed = await finder.findPythonVersion(version, arch);
       core.info(`Successfully setup ${installed.impl} (${installed.version})`);
     }