Update utils.ts

2025-06-24 12:41:09 +02:00 · 2022-04-01 16:04:52 +05:30
28 changed files with 59504 additions and 58804 deletions
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@ -24,10 +24,9 @@ jobs:
      - uses: actions/checkout@v2

      - name: Set Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
        with:
          node-version: 16.x
-          cache: npm

      - name: Install dependencies
        run: npm ci
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.yml
@ -23,7 +23,7 @@ jobs:
        os: [ubuntu-latest, windows-latest, macos-latest]
        python-version: ['3.9', 'pypy-3.7-v7.x']
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Setup Python
        uses: ./
        with:
@ -41,7 +41,7 @@ jobs:
        os: [ubuntu-latest, windows-latest, macos-latest]
        python-version: ['3.9', 'pypy-3.7-v7.x']
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Setup Python
        uses: ./
        with:
@ -50,9 +50,7 @@ jobs:
      - name: Install pipenv
        run: pipx install pipenv
      - name: Install dependencies
-        run: |
-          cd __tests__/data
-          pipenv install --verbose
+        run: pipenv install numpy

  python-poetry-dependencies-caching:
    name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }})
@ -61,9 +59,9 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.9', 'pypy-3.8']
+        python-version: ['3.9', 'pypy-3.7-v7.x']
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Install poetry
        run: pipx install poetry
      - name: Setup Python
@ -85,7 +83,7 @@ jobs:
        os: [ubuntu-latest, windows-latest, macos-latest]
        python-version: ['3.9', 'pypy-3.7-v7.x']
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Setup Python
        uses: ./
        with:
@ -104,16 +102,14 @@ jobs:
        os: [ubuntu-latest, windows-latest, macos-latest]
        python-version: ['3.9', 'pypy-3.7-v7.x']
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Setup Python
        uses: ./
        with:
          python-version: ${{ matrix.python-version }}
          cache: 'pipenv'
-          cache-dependency-path: '**/pipenv-requirements.txt'
+          cache-dependency-path: '**/requirements-linux.txt'
      - name: Install pipenv
        run: pipx install pipenv
      - name: Install dependencies
-        run: |
-          cd __tests__/data
-          pipenv install --verbose
+        run: pipenv install numpy
--- a/.github/workflows/licensed.yml
+++ b/.github/workflows/licensed.yml
@ -15,10 +15,9 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Set Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
        with:
          node-version: 16.x
-          cache: npm
      - run: npm ci
      - name: Install licensed
        run: |
--- a/.github/workflows/test-pypy.yml
+++ b/.github/workflows/test-pypy.yml
@ -22,7 +22,6 @@ jobs:
        pypy:
        - 'pypy-2.7'
        - 'pypy-3.7'
-        - 'pypy3.9'
        - 'pypy-2.7-v7.3.4'
        - 'pypy-3.7-v7.3.5'
        - 'pypy-3.7-v7.3.4'
@ -30,38 +29,18 @@ jobs:
        - 'pypy-3.7-v7.x'
        - 'pypy-2.7-v7.3.4rc1'
        - 'pypy-3.7-nightly'
-        - 'pypy3.8-v7.3.7'

    steps:
      - name: Checkout
        uses: actions/checkout@v2
  
      - name: setup-python ${{ matrix.pypy }}
-        id: setup-python
        uses: ./
        with:
          python-version: ${{ matrix.pypy }}
  
-      - name: Check python-path
-        run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
-        shell: bash
-
      - name: PyPy and Python version
        run: python --version
  
      - name: Run simple code
        run: python -c 'import math; print(math.factorial(5))'
-
-      - name: Assert PyPy is running
-        run: |
-          import platform
-          assert platform.python_implementation().lower() == "pypy"
-        shell: python
-
-      - name: Assert expected binaries (or symlinks) are present
-        run: |
-          EXECUTABLE=${{ matrix.pypy }}
-          EXECUTABLE=${EXECUTABLE/pypy-/pypy}  # remove the first '-' in "pypy-X.Y" -> "pypyX.Y" to match executable name
-          EXECUTABLE=${EXECUTABLE%%-*}  # remove any -* suffixe
-          ${EXECUTABLE} --version
-        shell: bash
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@ -10,9 +10,28 @@ on:
      - '**.md'
  schedule:
    - cron: 30 3 * * *
-  workflow_dispatch:

 jobs:
+  default-version:
+    name: Setup default version
+    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 default python 
+      uses: ./
+
+    - name: Validate version
+      run: python --version
+
+    - name: Run simple python code
+      run: python -c 'import math; print(math.factorial(5))'
+
  setup-versions-from-manifest:
    name: Setup ${{ matrix.python }} ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
@ -23,56 +42,13 @@ jobs:
        python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
    steps:
    - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2

    - name: setup-python ${{ matrix.python }}
-      id: setup-python
      uses: ./
      with:
        python-version: ${{ matrix.python }}

-    - name: Check python-path
-      run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
-      shell: bash
-
-    - name: Validate version
-      run: |
-        $pythonVersion = (python --version)
-        if ("Python ${{ matrix.python }}" -ne "$pythonVersion"){
-          Write-Host "The current version is $pythonVersion; expected version is ${{ matrix.python }}"
-          exit 1
-        }
-        $pythonVersion
-      shell: pwsh
-
-    - name: Run simple code
-      run: python -c 'import math; print(math.factorial(5))'
-
-  setup-versions-from-file:
-    name: Setup ${{ matrix.python }} ${{ matrix.os }} version file
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
-        python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: build-version-file ${{ matrix.python }}
-      run: echo ${{ matrix.python }} > .python-version
-
-    - name: setup-python ${{ matrix.python }}
-      id: setup-python
-      uses: ./
-      with:
-        python-version-file: '.python-version'
-
-    - name: Check python-path
-      run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
-      shell: bash
-
    - name: Validate version
      run: |
        $pythonVersion = (python --version)
@ -95,18 +71,13 @@ jobs:
        os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
    steps:
    - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2

    - name: setup-python 3.9.0-beta.4
-      id: setup-python
      uses: ./
      with:
        python-version: '3.9.0-beta.4'

-    - name: Check python-path
-      run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
-      shell: bash
-
    - name: Validate version
      run: |
        $pythonVersion = (python --version)
@ -120,30 +91,3 @@ jobs:
    - name: Run simple code
      run: python -c 'import math; print(math.factorial(5))'

-  setup-dev-version:
-    name: Setup 3.9-dev ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: setup-python 3.9-dev
-      id: setup-python
-      uses: ./
-      with:
-        python-version: '3.9-dev'
-
-    - name: Check python-path
-      run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
-      shell: bash
-
-    - name: Validate version
-      run: ${{ startsWith(steps.setup-python.outputs.python-version, '3.9.') }}
-      shell: bash
-
-    - name: Run simple code
-      run: python -c 'import math; print(math.factorial(5))'
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -20,10 +20,9 @@ jobs:
      uses: actions/checkout@v2

    - name: Set Node.js 16.x
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
      with:
        node-version: 16.x
-        cache: npm

    - name: npm ci
      run: npm ci
@ -89,13 +88,3 @@ jobs:
        python-version: 3.8.1
    - name: Verify 3.8.1
      run: python __tests__/verify-python.py 3.8.1
-
-    - name: Run with setup-python 3.10
-      id: cp310
-      uses: ./
-      with:
-        python-version: "3.10"
-    - name: Verify 3.10
-      run: python __tests__/verify-python.py 3.10
-    - name: Run python-path sample 3.10
-      run: pipx run --python '${{ steps.cp310.outputs.python-path }}' nox --version
--- a/.licenses/npm/@actions/cache.dep.yml
+++ b/.licenses/npm/@actions/cache.dep.yml
@ -1,6 +1,6 @@
 ---
 name: "@actions/cache"
-version: 2.0.2
+version: 2.0.0
 type: npm
 summary: Actions cache lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/cache
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at opensource+actions/setup-python@github.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
--- a/README.md
+++ b/README.md
@ -43,7 +43,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [ '2.x', '3.x', 'pypy2.7', 'pypy3.7', 'pypy3.8' ]
+        python-version: [ '2.x', '3.x', 'pypy-2.7', 'pypy-3.7', 'pypy-3.8' ]
    name: Python ${{ matrix.python-version }} sample
    steps:
      - uses: actions/checkout@v3
@ -63,7 +63,7 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['2.7', '3.7', '3.8', '3.9', '3.10', 'pypy2.7', 'pypy3.8']
+        python-version: ['2.7', '3.7', '3.8', '3.9', '3.10', 'pypy-2.7', 'pypy-3.8']
        exclude:
          - os: macos-latest
            python-version: '3.8'
@ -125,9 +125,9 @@ jobs:
    strategy:
      matrix:
        python-version:
-        - 'pypy3.7' # the latest available version of PyPy that supports Python 3.7
-        - 'pypy3.7-v7.3.3' # Python 3.7 and PyPy 7.3.3
-        - 'pypy3.8' # the latest available version of PyPy that supports Python 3.8
+        - 'pypy-3.7' # the latest available version of PyPy that supports Python 3.7
+        - 'pypy-3.7-v7.3.3' # Python 3.7 and PyPy 7.3.3
+        - 'pypy-3.8' # the latest available version of PyPy that supports Python 3.8
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-python@v3
@ -137,22 +137,6 @@ jobs:
 ```
 More details on PyPy syntax and examples of using preview / nightly versions of PyPy can be found in the [Available versions of PyPy](#available-versions-of-pypy) section.

-An output is available with the absolute path of the python interpreter executable if you need it:
-```yaml
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-      id: cp310
-      with:
-        python-version: "3.10"
-    - run: pipx run --python '${{ steps.cp310.outputs.python-path }}' nox --version
-```
-
->The environment variable `pythonLocation` also becomes available after Python or PyPy installation. It contains the absolute path to the folder where the desired version of Python or PyPy is installed.
-
 # 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).
@ -166,13 +150,10 @@ Check out our detailed guide on using [Python with GitHub Actions](https://help.
    - 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.
-    - Use `-dev` instead of a patch number (e.g., `3.11-dev`) to install the latest patch version release for a given minor version, *alpha and beta releases included*.
 - 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/main/versions-manifest.json) file.
    - If there is a specific version of Python that is not available, you can open an issue here

-**Note:** Python versions used in this action are generated in the [python-versions](https://github.com/actions/python-versions) repository. For macOS and Ubuntu images python versions are built from the source code. For Windows the python-versions repository uses installation executable. For more information please refer to the [python-versions](https://github.com/actions/python-versions) repository.
-
 # Available versions of PyPy

 `setup-python` is able to configure PyPy from two sources:
@ -180,7 +161,7 @@ Check out our detailed guide on using [Python with GitHub Actions](https://help.
 - Preinstalled versions of PyPy in the tools cache on GitHub-hosted runners
  - For detailed information regarding the available versions of PyPy that are installed, see [Supported software](https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners#supported-software).
  - For the latest PyPy release, all versions of Python are cached.
-  - Cache is updated with a 1-2 week delay. If you specify the PyPy version as `pypy3.7` or `pypy-3.7`, the cached version will be used although a newer version is available. If you need to start using the recently released version right after release, you should specify the exact PyPy version using `pypy3.7-v7.3.3` or `pypy-3.7-v7.3.3`.
+  - Cache is updated with a 1-2 week delay. If you specify the PyPy version as `pypy-3.7`, the cached version will be used although a newer version is available. If you need to start using the recently released version right after release, you should specify the exact PyPy version using `pypy-3.7-v7.3.3`.

 - Downloadable PyPy versions from the [official PyPy site](https://downloads.python.org/pypy/).
  - All available versions that we can download are listed in [versions.json](https://downloads.python.org/pypy/versions.json) file.
@ -198,8 +179,8 @@ GitHub hosted runners have a tools cache that comes with a few versions of Pytho
 |**PyPy Tool Cache**|`RUNNER_TOOL_CACHE/PyPy/*`|

 GitHub virtual environments are setup in [actions/virtual-environments](https://github.com/actions/virtual-environments). During the setup, the available versions of Python and PyPy are automatically downloaded, setup and documented.
- Tools cache setup for Ubuntu: [Install-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/linux/scripts/installers/Install-Toolset.ps1) [Configure-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/linux/scripts/installers/Configure-Toolset.ps1)
- Tools cache setup for Windows: [Install-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/win/scripts/Installers/Install-Toolset.ps1) [Configure-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/win/scripts/Installers/Configure-Toolset.ps1)
+- [Tools cache setup for Ubuntu](https://github.com/actions/virtual-environments/blob/main/images/linux/scripts/installers/hosted-tool-cache.sh)
+- [Tools cache setup for Windows](https://github.com/actions/virtual-environments/blob/main/images/win/scripts/Installers/Download-ToolCache.ps1)

 # Specifying a Python version

@ -213,17 +194,17 @@ You should specify only a major and minor version if you are okay with the most
  - 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.

 # Specifying a PyPy version
-The version of PyPy should be specified in the format `pypy<python_version>[-v<pypy_version>]` or `pypy-<python_version>[-v<pypy_version>]`.
+The version of PyPy should be specified in the format `pypy-<python_version>[-v<pypy_version>]`.
 The `<pypy_version>` parameter is optional and can be skipped. The latest version will be used in this case.

 ```
-pypy3.7 or pypy-3.7 # the latest available version of PyPy that supports Python 3.7
-pypy3.8 or pypy-3.8 # the latest available version of PyPy that supports Python 3.8
-pypy2.7 or pypy-2.7 # the latest available version of PyPy that supports Python 2.7
-pypy3.7-v7.3.3 or pypy-3.7-v7.3.3 # Python 3.7 and PyPy 7.3.3
-pypy3.7-v7.x or pypy-3.7-v7.x # Python 3.7 and the latest available PyPy 7.x
-pypy3.7-v7.3.3rc1 or pypy-3.7-v7.3.3rc1 # Python 3.7 and preview version of PyPy
-pypy3.7-nightly or pypy-3.7-nightly # Python 3.7 and nightly PyPy
+pypy-3.7 # the latest available version of PyPy that supports Python 3.7
+pypy-3.8 # the latest available version of PyPy that supports Python 3.8
+pypy-2.7 # the latest available version of PyPy that supports Python 2.7
+pypy-3.7-v7.3.3 # Python 3.7 and PyPy 7.3.3
+pypy-3.7-v7.x # Python 3.7 and the latest available PyPy 7.x
+pypy-3.7-v7.3.3rc1 # Python 3.7 and preview version of PyPy
+pypy-3.7-nightly # Python 3.7 and nightly PyPy
 ```

 # Caching packages dependencies
@ -268,10 +249,10 @@ steps:
 **Caching poetry dependencies:**
 ```yaml
 steps:
- uses: actions/checkout@v3
+- uses: actions/checkout@v2
 - name: Install poetry
  run: pipx install poetry
- uses: actions/setup-python@v3
+- uses: actions/setup-python@v2
  with:
    python-version: '3.9'
    cache: 'poetry'
--- a/tests/cache-restore.test.ts
+++ b/tests/cache-restore.test.ts
@ -5,7 +5,7 @@ import {getCacheDistributor} from '../src/cache-distributions/cache-factory';

 describe('restore-cache', () => {
  const pipFileLockHash =
-    'd1dd6218299d8a6db5fc2001d988b34a8b31f1e9d0bb4534d377dde7c19f64b3';
+    '67d817abcde9c72da0ed5b8f235647cb14638b9ff9d742b42e4406d2eb16fe3c';
  const requirementsHash =
    'd8110e0006d7fb5ee76365d565eef9d37df1d11598b912d3eb66d398d57a1121';
  const requirementsLinuxHash =
@ -27,7 +27,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
  let debugSpy: jest.SpyInstance;
  let saveSatetSpy: jest.SpyInstance;
  let getStateSpy: jest.SpyInstance;
-  let setOutputSpy: jest.SpyInstance;

  // cache spy
  let restoreCacheSpy: jest.SpyInstance;
@ -65,9 +64,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
      return {stdout: '', stderr: 'Error occured', exitCode: 2};
    });

-    setOutputSpy = jest.spyOn(core, 'setOutput');
-    setOutputSpy.mockImplementation(input => undefined);
-
    restoreCacheSpy = jest.spyOn(cache, 'restoreCache');
    restoreCacheSpy.mockImplementation(
      (cachePaths: string[], primaryKey: string, restoreKey?: string) => {
@ -104,7 +100,7 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
    ])(
      'restored dependencies for %s by primaryKey',
      async (packageManager, pythonVersion, dependencyFile, fileHash) => {
-        const cacheDistributor = getCacheDistributor(
+        const cacheDistributor = await getCacheDistributor(
          packageManager,
          pythonVersion,
          dependencyFile
@ -130,7 +126,7 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
        dependencyFile,
        cacheDependencyPath
      ) => {
-        const cacheDistributor = getCacheDistributor(
+        const cacheDistributor = await getCacheDistributor(
          packageManager,
          pythonVersion,
          dependencyFile
@ -166,7 +162,7 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
            return primaryKey !== fileHash && restoreKey ? pipFileLockHash : '';
          }
        );
-        const cacheDistributor = getCacheDistributor(
+        const cacheDistributor = await getCacheDistributor(
          packageManager,
          pythonVersion,
          dependencyFile
@ -191,38 +187,6 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
    );
  });

-  describe('Check if handleMatchResult', () => {
-    it.each([
-      ['pip', '3.8.12', 'requirements.txt', 'someKey', 'someKey', true],
-      ['pipenv', '3.9.1', 'requirements.txt', 'someKey', 'someKey', true],
-      ['poetry', '3.8.12', 'requirements.txt', 'someKey', 'someKey', true],
-      ['pip', '3.9.2', 'requirements.txt', undefined, 'someKey', false],
-      ['pipenv', '3.8.12', 'requirements.txt', undefined, 'someKey', false],
-      ['poetry', '3.9.12', 'requirements.txt', undefined, 'someKey', false]
-    ])(
-      'sets correct outputs',
-      async (
-        packageManager,
-        pythonVersion,
-        dependencyFile,
-        matchedKey,
-        restoredKey,
-        expectedOutputValue
-      ) => {
-        const cacheDistributor = getCacheDistributor(
-          packageManager,
-          pythonVersion,
-          dependencyFile
-        );
-        cacheDistributor.handleMatchResult(matchedKey, restoredKey);
-        expect(setOutputSpy).toHaveBeenCalledWith(
-          'cache-hit',
-          expectedOutputValue
-        );
-      }
-    );
-  });
-
  afterEach(() => {
    jest.resetAllMocks();
    jest.clearAllMocks();
--- a/tests/cache-save.test.ts
+++ b/tests/cache-save.test.ts
@ -6,7 +6,7 @@ import {State} from '../src/cache-distributions/cache-distributor';

 describe('run', () => {
  const pipFileLockHash =
-    'd1dd6218299d8a6db5fc2001d988b34a8b31f1e9d0bb4534d377dde7c19f64b3';
+    '67d817abcde9c72da0ed5b8f235647cb14638b9ff9d742b42e4406d2eb16fe3c';
  const requirementsHash =
    'd8110e0006d7fb5ee76365d565eef9d37df1d11598b912d3eb66d398d57a1121';
  const requirementsLinuxHash =
--- a/tests/check-python-path.sh
+++ b/tests/check-python-path.sh
@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-PYTHON_PATH="$1"
-PATH_EXECUTABLE=$(python -c 'import sys; print(sys.executable)')
-PYTHON_PATH_EXECUTABLE=$("${PYTHON_PATH}" -c 'import sys; print(sys.executable)')
-if [ "${PATH_EXECUTABLE}" != "${PYTHON_PATH_EXECUTABLE}" ]; then
-    echo "Executable mismatch."
-    echo "python in PATH is: ${PATH_EXECUTABLE}"
-    echo "python-path (${PYTHON_PATH}) is: ${PYTHON_PATH_EXECUTABLE}"
-    exit 1
-fi
-echo "python-path: ${PYTHON_PATH}"
--- a/tests/data/Pipfile
+++ b/tests/data/Pipfile
@ -1,13 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-numpy = "1.22.3"
-pandas = "1.4.2"
-
-[dev-packages]
-
-[requires]
-python_version = "*"
--- a/tests/data/Pipfile.lock
+++ b/tests/data/Pipfile.lock
@ -1,11 +1,11 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "33e3640eff8b2b6c7149b85568151f39a66c544033b4b3f3f2ec9ad5ce6dfe7e"
+            "sha256": "408f110354c997d8df1e17841d5335ae690f5b25f8c78040d62257f9535c6005"
        },
        "pipfile-spec": 6,
        "requires": {
-            "python_version": "*"
+            "python_version": "3.7"
        },
        "sources": [
            {
@ -16,81 +16,260 @@
        ]
    },
    "default": {
-        "numpy": {
+        "altgraph": {
            "hashes": [
-                "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676",
-                "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4",
-                "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce",
-                "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123",
-                "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1",
-                "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e",
-                "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5",
-                "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d",
-                "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a",
-                "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab",
-                "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75",
-                "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168",
-                "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4",
-                "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f",
-                "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18",
-                "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62",
-                "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe",
-                "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430",
-                "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802",
-                "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"
+                "sha256:743628f2ac6a7c26f5d9223c91ed8ecbba535f506f4b6f558885a8a56a105857",
+                "sha256:ebf2269361b47d97b3b88e696439f6e4cbc607c17c51feb1754f90fb79839158"
+            ],
+            "version": "==0.17.2"
+        },
+        "certifi": {
+            "hashes": [
+                "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3",
+                "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"
            ],
            "index": "pypi",
-            "version": "==1.22.3"
+            "version": "==2020.6.20"
        },
-        "pandas": {
+        "chardet": {
            "hashes": [
-                "sha256:0010771bd9223f7afe5f051eb47c4a49534345dfa144f2f5470b27189a4dd3b5",
-                "sha256:061609334a8182ab500a90fe66d46f6f387de62d3a9cb9aa7e62e3146c712167",
-                "sha256:09d8be7dd9e1c4c98224c4dfe8abd60d145d934e9fc1f5f411266308ae683e6a",
-                "sha256:295872bf1a09758aba199992c3ecde455f01caf32266d50abc1a073e828a7b9d",
-                "sha256:3228198333dd13c90b6434ddf61aa6d57deaca98cf7b654f4ad68a2db84f8cfe",
-                "sha256:385c52e85aaa8ea6a4c600a9b2821181a51f8be0aee3af6f2dcb41dafc4fc1d0",
-                "sha256:51649ef604a945f781105a6d2ecf88db7da0f4868ac5d45c51cb66081c4d9c73",
-                "sha256:5586cc95692564b441f4747c47c8a9746792e87b40a4680a2feb7794defb1ce3",
-                "sha256:5a206afa84ed20e07603f50d22b5f0db3fb556486d8c2462d8bc364831a4b417",
-                "sha256:5b79af3a69e5175c6fa7b4e046b21a646c8b74e92c6581a9d825687d92071b51",
-                "sha256:5c54ea4ef3823108cd4ec7fb27ccba4c3a775e0f83e39c5e17f5094cb17748bc",
-                "sha256:8c5bf555b6b0075294b73965adaafb39cf71c312e38c5935c93d78f41c19828a",
-                "sha256:92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12",
-                "sha256:95c1e422ced0199cf4a34385ff124b69412c4bc912011ce895582bee620dfcaa",
-                "sha256:b8134651258bce418cb79c71adeff0a44090c98d955f6953168ba16cc285d9f7",
-                "sha256:be67c782c4f1b1f24c2f16a157e12c2693fd510f8df18e3287c77f33d124ed07",
-                "sha256:c072c7f06b9242c855ed8021ff970c0e8f8b10b35e2640c657d2a541c5950f59",
-                "sha256:d0d4f13e4be7ce89d7057a786023c461dd9370040bdb5efa0a7fe76b556867a0",
-                "sha256:df82739e00bb6daf4bba4479a40f38c718b598a84654cbd8bb498fd6b0aa8c16",
-                "sha256:f549097993744ff8c41b5e8f2f0d3cbfaabe89b4ae32c8c08ead6cc535b80139",
-                "sha256:ff08a14ef21d94cdf18eef7c569d66f2e24e0bc89350bcd7d243dd804e3b5eb2"
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
            ],
            "index": "pypi",
-            "version": "==1.4.2"
+            "version": "==3.0.4"
        },
-        "python-dateutil": {
+        "docutils": {
            "hashes": [
-                "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
-                "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
+                "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af",
+                "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"
            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==2.8.2"
+            "index": "pypi",
+            "version": "==0.16"
        },
-        "pytz": {
+        "future": {
            "hashes": [
-                "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7",
-                "sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c"
+                "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"
            ],
-            "version": "==2022.1"
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
+            "version": "==0.18.2"
        },
-        "six": {
+        "idna": {
            "hashes": [
-                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
-                "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
+                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
+                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==1.16.0"
+            "index": "pypi",
+            "version": "==2.9"
+        },
+        "itsdangerous": {
+            "hashes": [
+                "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
+                "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749"
+            ],
+            "index": "pypi",
+            "version": "==1.1.0"
+        },
+        "kivy": {
+            "hashes": [
+                "sha256:090d3ded9835a17477cd93fbdaf0a7c42ff2218981cf198ded5ad8795bc74391",
+                "sha256:11e85eaf6efbfa2362a3334ffdad179a1b0ca8d255cca79eaa6a2765560d4982",
+                "sha256:1a1ff32f8a95f1e175198cbab81fcd2596783b180d4eafe63e87d171aa7fdb5e",
+                "sha256:1d28b198a64c30db8d94a0488e85f3037af60d514ab0d7ad5ab45add3ab77090",
+                "sha256:4a5480cbf837d3780c77a4f61b32b56d22ae9f03845e7a89dd3eaef1ae5fd037",
+                "sha256:4d0e596f74271e901b551f77661dde238df4765484fce9f5d1c72e8022984e84",
+                "sha256:5c3d0f2749522d62e9cce09cd54b2d823bf1b6b644ff1f627be49de6f3e3cba0",
+                "sha256:815a5c0b3b72fcd81ca7b2aa0744087163ed03e4cf9ab4e7c9733cea99fc1571",
+                "sha256:8819a27a09871af451760cb69486ced52e830c8a0a37480f22ef5e692f12c05b",
+                "sha256:a687602d90c4629dd036f577ca39acb76ba581370f9d915f3cab99be818ba8ad",
+                "sha256:b7ef6aad43a86d8df3fb865db864e354f2155a748019f8517f69f65c1a29cb64",
+                "sha256:b85ccf165050cbf2ee8447671eebbc222b369b40f0e0038dd9547d49a5e37373",
+                "sha256:c36652caa7f6c327dee834cfc699d5962d346b7a53e54bd81abc17c314226d89",
+                "sha256:ece170514db3f49844a41e4c910ad9ce9bc46da6f47a49158e11266bdcc6e479",
+                "sha256:f3bea6e4a21991827885d04127fc6d09a0e974ecfa12da7bf5faae93562ea102",
+                "sha256:f835462dd9aa491272552ef079b948a088598e2e95d68bb1d885d2c3f3d4e2c3"
+            ],
+            "index": "pypi",
+            "version": "==1.11.1"
+        },
+        "kivy-deps-angle": {
+            "hashes": [
+                "sha256:50605fdd4c9fdbe9f717069734a598a9aba0afe5d3f0412afbe2ecff0326e92d",
+                "sha256:64ac7f33c000585dc30194e604aed925972c6b7c3848b5c3b073ae916fb0b55c",
+                "sha256:99c40d53582a958748e251dfbd61aa67fb85963e27529ca08a21f2f5eeed04e1",
+                "sha256:a2cea09e8a5e899629466403fbd540459f1cdef8d08c6c479b6607b95309be02",
+                "sha256:b167e19b3eea55a9a8c606a607bb909ec1bedda88deee40347c780b310155a79",
+                "sha256:b9d07976b0bf6bac724a42aa8ed5a8c7caa95609046db30c8f15bb731f8e4d36",
+                "sha256:bb4d53f15a093214adbbe205c108ede5cc0f6af6eff104c1b8c468ddaaf6400a",
+                "sha256:d0e7b7b9eb9669837a5d70808a7ea45f2b61961b56f9f69a233bad6bd36ce260"
+            ],
+            "index": "pypi",
+            "version": "==0.3.0"
+        },
+        "kivy-deps.glew": {
+            "hashes": [
+                "sha256:09f72ee5ef33ff273332e2a229dc97d650d29818a0189339421949e4e0f63d93",
+                "sha256:1e28e40017af9d081fc0fc95b4fadaf31d15e9f63478dcee1c4257d67079894e",
+                "sha256:45aa7f0e8d9bcf5fc1810c9c38bc20edf7dee61df81ecf62102e0f84153f924a",
+                "sha256:6bb435620c3187d2c61054adb9ec277ed487256b457a0a7b1491bc0cb7247e18",
+                "sha256:92e72fa2c425887987d1aa861c99537033dc20d68ae1c54864871f0401682586",
+                "sha256:ab81783a82bef88a8d2bcf8a93bc21df6b8b0db6ee551eb802727d18f9074b17",
+                "sha256:c843104690c0c8f3a58105c53c57f31506f6f90562c18de00bd19317cc1045a7",
+                "sha256:cf351aad171796f8051af8e49ec430a9aa128d8557d8643e73f2bb1e5f9c2dab",
+                "sha256:ee8ab67abb2c98d84feede657cae472e7723e529af07394244bdd33caafb1a38",
+                "sha256:ef1116d99bd9cc737cb8c0e13e676955c17d6e4d6d1af5cfccef089a430071bb"
+            ],
+            "index": "pypi",
+            "version": "==0.1.12"
+        },
+        "kivy-deps.gstreamer": {
+            "hashes": [
+                "sha256:0d9598d2d31c0e780adf4b767fa3a691123621fd0ffef94b83cf82c2da84341b",
+                "sha256:309eca64dee5939f16f8465e5cbb08bdde7c90ded1af6a00690c7e928326af79",
+                "sha256:3d53d2c84c0a997c4cac6c239b1e0a6486e533836321003dc365ec42b97a664b",
+                "sha256:4d996377111e854b3dea90846f9b2f98766a44529fd8b72125e18c552381d928",
+                "sha256:4f2ddd61d185310258d338ae80a646df7822efdd7d67e57f49dc7b87555c5d7e",
+                "sha256:6fa9f76afe600baa221abee31ce7dc63e653d0affe0f6c558bfc4f35af96396f",
+                "sha256:739cd331b9f33a822d700273674a79a3157054e9358a01a0d553f094a5f4a8c9",
+                "sha256:c29cfc63fe70a58dad889e631f1ba4711c9ea80103f2b2b8d670a97f093076c8",
+                "sha256:c4709765e2b17c6c96b46a92207b0457def147544d825654077603eaf0d424de"
+            ],
+            "index": "pypi",
+            "version": "==0.1.17"
+        },
+        "kivy-deps.sdl2": {
+            "hashes": [
+                "sha256:053f26e8c05d5545bdbc7eeb8c450b8e4410ee355792e9345af536110fe247e2",
+                "sha256:1b987bdd4fbbcb31baf0d7fc9584ad99912179b8968311bb7e30fbeb14e98e0d",
+                "sha256:228128cdd8112dc7505ac43027a770476e9ef282e0b84ca68037133cd025960b",
+                "sha256:2c2fd5a12a7a9afe3bb962b273561099a180edae91bb9c8f8386b72253fcae4a",
+                "sha256:5ce23f1a3286d6288751a12b0eaefd02f947ea101bb807e9781b964e496fc3f3",
+                "sha256:7928746eaed51944c10d1bb36fcefebe3d1aff1b97ba32359c2c97ba74707e1b",
+                "sha256:9270fa8ed5130074b167a7a3a9c85efc3cfe3c04584ab084cb6ae9e4edfa8168",
+                "sha256:92ed97d3247bc8ce98f336cbc940bb889310199326e9ccf251c49ae7e4b80de8",
+                "sha256:96e1fa89fd8b5351f2d3c26bbffd50df8d554b03fba4025ecc941d773d241698",
+                "sha256:c3ace0ddde0e59cdcaf260eda1daa0c05ca9bf8cd0c4ea404539de25a5dcaec7"
+            ],
+            "index": "pypi",
+            "version": "==0.1.22"
+        },
+        "kivy-garden": {
+            "hashes": [
+                "sha256:9b7d9de5efacbcd0c4b3dd873b30622a86093c9965aa47b523c7a32f3eb34610",
+                "sha256:c256f42788421273a08fbb0a228f0fb0e80dd86b629fb8c0920507f645be6c72"
+            ],
+            "index": "pypi",
+            "version": "==0.1.4"
+        },
+        "packaging": {
+            "hashes": [
+                "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7",
+                "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"
+            ],
+            "index": "pypi",
+            "version": "==21.0"
+        },
+        "pdf2image": {
+            "hashes": [
+                "sha256:a0d9906f5507192210a8d5d7ead63145e9dec4bccc4564b1fb644e923913c31c"
+            ],
+            "index": "pypi",
+            "version": "==1.12.1"
+        },
+        "pefile": {
+            "hashes": [
+                "sha256:344a49e40a94e10849f0fe34dddc80f773a12b40675bf2f7be4b8be578bdd94a"
+            ],
+            "markers": "python_full_version >= '3.6.0'",
+            "version": "==2021.9.3"
+        },
+        "pillow": {
+            "hashes": [
+                "sha256:0295442429645fa16d05bd567ef5cff178482439c9aad0411d3f0ce9b88b3a6f",
+                "sha256:06aba4169e78c439d528fdeb34762c3b61a70813527a2c57f0540541e9f433a8",
+                "sha256:09d7f9e64289cb40c2c8d7ad674b2ed6105f55dc3b09aa8e4918e20a0311e7ad",
+                "sha256:0a80dd307a5d8440b0a08bd7b81617e04d870e40a3e46a32d9c246e54705e86f",
+                "sha256:1ca594126d3c4def54babee699c055a913efb01e106c309fa6b04405d474d5ae",
+                "sha256:25930fadde8019f374400f7986e8404c8b781ce519da27792cbe46eabec00c4d",
+                "sha256:431b15cffbf949e89df2f7b48528be18b78bfa5177cb3036284a5508159492b5",
+                "sha256:52125833b070791fcb5710fabc640fc1df07d087fc0c0f02d3661f76c23c5b8b",
+                "sha256:5e51ee2b8114def244384eda1c82b10e307ad9778dac5c83fb0943775a653cd8",
+                "sha256:612cfda94e9c8346f239bf1a4b082fdd5c8143cf82d685ba2dba76e7adeeb233",
+                "sha256:6d7741e65835716ceea0fd13a7d0192961212fd59e741a46bbed7a473c634ed6",
+                "sha256:6edb5446f44d901e8683ffb25ebdfc26988ee813da3bf91e12252b57ac163727",
+                "sha256:725aa6cfc66ce2857d585f06e9519a1cc0ef6d13f186ff3447ab6dff0a09bc7f",
+                "sha256:8dad18b69f710bf3a001d2bf3afab7c432785d94fcf819c16b5207b1cfd17d38",
+                "sha256:94cf49723928eb6070a892cb39d6c156f7b5a2db4e8971cb958f7b6b104fb4c4",
+                "sha256:97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626",
+                "sha256:9ad7f865eebde135d526bb3163d0b23ffff365cf87e767c649550964ad72785d",
+                "sha256:9c87ef410a58dd54b92424ffd7e28fd2ec65d2f7fc02b76f5e9b2067e355ebf6",
+                "sha256:a060cf8aa332052df2158e5a119303965be92c3da6f2d93b6878f0ebca80b2f6",
+                "sha256:c79f9c5fb846285f943aafeafda3358992d64f0ef58566e23484132ecd8d7d63",
+                "sha256:c92302a33138409e8f1ad16731568c55c9053eee71bb05b6b744067e1b62380f",
+                "sha256:d08b23fdb388c0715990cbc06866db554e1822c4bdcf6d4166cf30ac82df8c41",
+                "sha256:d350f0f2c2421e65fbc62690f26b59b0bcda1b614beb318c81e38647e0f673a1",
+                "sha256:e901964262a56d9ea3c2693df68bc9860b8bdda2b04768821e4c44ae797de117",
+                "sha256:ec29604081f10f16a7aea809ad42e27764188fc258b02259a03a8ff7ded3808d",
+                "sha256:edf31f1150778abd4322444c393ab9c7bd2af271dd4dafb4208fb613b1f3cdc9",
+                "sha256:f7e30c27477dffc3e85c2463b3e649f751789e0f6c8456099eea7ddd53be4a8a",
+                "sha256:ffe538682dc19cc542ae7c3e504fdf54ca7f86fb8a135e59dd6bc8627eae6cce"
+            ],
+            "index": "pypi",
+            "version": "==7.2"
+        },
+        "pygments": {
+            "hashes": [
+                "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44",
+                "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"
+            ],
+            "index": "pypi",
+            "version": "==2.6.1"
+        },
+        "pyinstaller": {
+            "hashes": [
+                "sha256:3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7"
+            ],
+            "index": "pypi",
+            "version": "==3.6"
+        },
+        "pyparsing": {
+            "hashes": [
+                "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
+                "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
+            ],
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
+            "version": "==2.4.7"
+        },
+        "pywin32-ctypes": {
+            "hashes": [
+                "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942",
+                "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"
+            ],
+            "version": "==0.2.0"
+        },
+        "requests": {
+            "hashes": [
+                "sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b",
+                "sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898"
+            ],
+            "index": "pypi",
+            "version": "==2.24.0"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527",
+                "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"
+            ],
+            "index": "pypi",
+            "version": "==1.25.9"
+        },
+        "xlrd": {
+            "hashes": [
+                "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2",
+                "sha256:e551fb498759fa3a5384a94ccd4c3c02eb7c00ea424426e212ac0c57be9dfbde"
+            ],
+            "index": "pypi",
+            "version": "==1.2.0"
        }
    },
    "develop": {}
--- a/tests/data/pipenv-requirements.txt
+++ b/tests/data/pipenv-requirements.txt
@ -1,2 +0,0 @@
-numpy==1.22.3
-pandas==1.4.2
--- a/tests/find-pypy.test.ts
+++ b/tests/find-pypy.test.ts
@ -37,34 +37,16 @@ describe('parsePyPyVersion', () => {
    ['pypy-3.6-v7.x', {pythonVersion: '3.6', pypyVersion: 'v7.x'}],
    ['pypy-3.6', {pythonVersion: '3.6', pypyVersion: 'x'}],
    ['pypy-3.6-nightly', {pythonVersion: '3.6', pypyVersion: 'nightly'}],
-    ['pypy-3.6-v7.3.3rc1', {pythonVersion: '3.6', pypyVersion: 'v7.3.3-rc.1'}],
-    ['pypy3.8-v7.3.7', {pythonVersion: '3.8', pypyVersion: 'v7.3.7'}],
-    ['pypy3.8-v7.3.x', {pythonVersion: '3.8', pypyVersion: 'v7.3.x'}],
-    ['pypy3.8-v7.x', {pythonVersion: '3.8', pypyVersion: 'v7.x'}],
-    ['pypy3.8', {pythonVersion: '3.8', pypyVersion: 'x'}],
-    ['pypy3.9-nightly', {pythonVersion: '3.9', pypyVersion: 'nightly'}],
-    ['pypy3.9-v7.3.8rc1', {pythonVersion: '3.9', pypyVersion: 'v7.3.8-rc.1'}]
+    ['pypy-3.6-v7.3.3rc1', {pythonVersion: '3.6', pypyVersion: 'v7.3.3-rc.1'}]
  ])('%s -> %s', (input, expected) => {
    expect(finder.parsePyPyVersion(input)).toEqual(expected);
  });

-  it.each(['', 'pypy-', 'pypy', 'p', 'notpypy-'])(
-    'throw on invalid input "%s"',
-    input => {
-      expect(() => finder.parsePyPyVersion(input)).toThrowError(
-        "Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy<python-version>' or 'pypy-<python-version>'. See README for examples and documentation."
-      );
-    }
-  );
-
-  it.each(['pypy-2', 'pypy-3', 'pypy2', 'pypy3', 'pypy3.x', 'pypy3.8.10'])(
-    'throw on invalid input "%s"',
-    input => {
-      expect(() => finder.parsePyPyVersion(input)).toThrowError(
-        "Invalid format of Python version for PyPy. Python version should be specified in format 'x.y'. See README for examples and documentation."
-      );
-    }
+  it('throw on invalid input', () => {
+    expect(() => finder.parsePyPyVersion('pypy-')).toThrowError(
+      "Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy-<python-version>'. See README for examples and documentation."
    );
+  });
 });

 describe('getPyPyVersionFromPath', () => {
--- a/action.yml
+++ b/action.yml
@ -4,9 +4,8 @@ description: 'Set up a specific version of Python and add the command-line tools
 author: 'GitHub'
 inputs:
  python-version:
-    description: "Version range or exact version of Python to use, using SemVer's version range syntax. Reads from .python-version if unset."
-  python-version-file:
-    description: "File containing the Python version to use. Example: .python-version"
+    description: "Version range or exact version of a Python version to use, using SemVer's version range syntax."
+    default: '3.x'
  cache:
    description: 'Used to specify a package manager for caching in the default directory. Supported values: pip, pipenv, poetry.'
    required: false
@ -20,10 +19,6 @@ inputs:
 outputs:
  python-version:
    description: "The installed python version. Useful when given a version range as input."
-  cache-hit:
-    description: 'A boolean value to indicate a cache entry was found'
-  python-path:
-    description: "The absolute path to the Python executable."
 runs:
  using: 'node16'
  main: 'dist/setup/index.js'
--- a/dist/cache-save/index.js
+++ b/dist/cache-save/index.js
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
--- a/package-lock.json
+++ b/package-lock.json
@ -1,15 +1,15 @@
 {
  "name": "setup-python",
-  "version": "3.1.1",
+  "version": "3.1.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "setup-python",
-      "version": "3.1.1",
+      "version": "3.1.0",
      "license": "MIT",
      "dependencies": {
-        "@actions/cache": "^2.0.2",
+        "@actions/cache": "^2.0.0",
        "@actions/core": "^1.2.3",
        "@actions/exec": "^1.1.0",
        "@actions/glob": "^0.2.0",
@ -21,7 +21,7 @@
        "@types/jest": "^27.0.2",
        "@types/node": "^16.11.25",
        "@types/semver": "^7.1.0",
-        "@vercel/ncc": "^0.33.4",
+        "@zeit/ncc": "^0.22.0",
        "husky": "^7.0.2",
        "jest": "^27.2.5",
        "jest-circus": "^27.2.5",
@ -31,9 +31,9 @@
      }
    },
    "node_modules/@actions/cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.2.tgz",
-      "integrity": "sha512-K1DCaW/OtHj5mV7hI7HEXiceX3rM4Nc0iG2hfYsrkEy6GiOeqlCC/LyICrBZIRDM6+vSrS12tg1ORl4hghomBA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.0.tgz",
+      "integrity": "sha512-d7n8ul6HjWX6oDrNEPoqn8ZvqyyDhp9Uek6WOxALyxGVsXU+8+ND+viD3UfrXVWfs/GQiqI5Eq4cOozZj0yRFQ==",
      "dependencies": {
        "@actions/core": "^1.2.6",
        "@actions/exec": "^1.0.1",
@ -3923,10 +3923,11 @@
      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
      "dev": true
    },
-    "node_modules/@vercel/ncc": {
-      "version": "0.33.4",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
-      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
+    "node_modules/@zeit/ncc": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.0.tgz",
+      "integrity": "sha512-zaS6chwztGSLSEzsTJw9sLTYxQt57bPFBtsYlVtbqGvmDUsfW7xgXPYofzFa1kB9ur2dRop6IxCwPnWLBVCrbQ==",
+      "deprecated": "@zeit/ncc is no longer maintained. Please use @vercel/ncc instead.",
      "dev": true,
      "bin": {
        "ncc": "dist/ncc/cli.js"
@ -11337,9 +11338,9 @@
  },
  "dependencies": {
    "@actions/cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.2.tgz",
-      "integrity": "sha512-K1DCaW/OtHj5mV7hI7HEXiceX3rM4Nc0iG2hfYsrkEy6GiOeqlCC/LyICrBZIRDM6+vSrS12tg1ORl4hghomBA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.0.tgz",
+      "integrity": "sha512-d7n8ul6HjWX6oDrNEPoqn8ZvqyyDhp9Uek6WOxALyxGVsXU+8+ND+viD3UfrXVWfs/GQiqI5Eq4cOozZj0yRFQ==",
      "requires": {
        "@actions/core": "^1.2.6",
        "@actions/exec": "^1.0.1",
@ -14511,10 +14512,10 @@
      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
      "dev": true
    },
-    "@vercel/ncc": {
-      "version": "0.33.4",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
-      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
+    "@zeit/ncc": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.0.tgz",
+      "integrity": "sha512-zaS6chwztGSLSEzsTJw9sLTYxQt57bPFBtsYlVtbqGvmDUsfW7xgXPYofzFa1kB9ur2dRop6IxCwPnWLBVCrbQ==",
      "dev": true
    },
    "abab": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "setup-python",
-  "version": "4.0.0",
+  "version": "3.1.0",
  "private": true,
  "description": "Setup python action",
  "main": "dist/index.js",
@ -23,7 +23,7 @@
  "author": "GitHub",
  "license": "MIT",
  "dependencies": {
-    "@actions/cache": "^2.0.2",
+    "@actions/cache": "^2.0.0",
    "@actions/core": "^1.2.3",
    "@actions/exec": "^1.1.0",
    "@actions/glob": "^0.2.0",
@ -35,7 +35,7 @@
    "@types/jest": "^27.0.2",
    "@types/node": "^16.11.25",
    "@types/semver": "^7.1.0",
-    "@vercel/ncc": "^0.33.4",
+    "@zeit/ncc": "^0.22.0",
    "husky": "^7.0.2",
    "jest": "^27.2.5",
    "jest-circus": "^27.2.5",
--- a/src/cache-distributions/cache-distributor.ts
+++ b/src/cache-distributions/cache-distributor.ts
@ -41,17 +41,12 @@ abstract class CacheDistributor {
      restoreKey
    );

-    this.handleMatchResult(matchedKey, primaryKey);
-  }
-
-  public handleMatchResult(matchedKey: string | undefined, primaryKey: string) {
    if (matchedKey) {
      core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
      core.info(`Cache restored from key: ${matchedKey}`);
    } else {
      core.info(`${this.packageManager} cache is not found`);
    }
-    core.setOutput('cache-hit', matchedKey === primaryKey);
  }
 }

--- a/src/cache-distributions/poetry-cache.ts
+++ b/src/cache-distributions/poetry-cache.ts
@ -58,7 +58,7 @@ class PoetryCache extends CacheDistributor {
    const config: any = {};

    for (let line of lines) {
-      line = line.replace(/#.*$/gm, '');
+      line = line.replace(/#.*$/, '');

      const [key, value] = line.split('=').map(part => part.trim());

--- a/src/find-pypy.ts
+++ b/src/find-pypy.ts
@ -48,18 +48,10 @@ export async function findPyPyVersion(

  const pipDir = IS_WINDOWS ? 'Scripts' : 'bin';
  const _binDir = path.join(installDir, pipDir);
-  const binaryExtension = IS_WINDOWS ? '.exe' : '';
-  const pythonPath = path.join(
-    IS_WINDOWS ? installDir : _binDir,
-    `python${binaryExtension}`
-  );
  const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir);
-  core.exportVariable('pythonLocation', installDir);
-  core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig');
+  core.exportVariable('pythonLocation', pythonLocation);
  core.addPath(pythonLocation);
  core.addPath(_binDir);
-  core.setOutput('python-version', 'pypy' + resolvedPyPyVersion.trim());
-  core.setOutput('python-path', pythonPath);

  return {resolvedPyPyVersion, resolvedPythonVersion};
 }
@ -104,14 +96,9 @@ export function findPyPyToolCache(
 export function parsePyPyVersion(versionSpec: string): IPyPyVersionSpec {
  const versions = versionSpec.split('-').filter(item => !!item);

-  if (/^(pypy)(.+)/.test(versions[0])) {
-    let pythonVersion = versions[0].replace('pypy', '');
-    versions.splice(0, 1, 'pypy', pythonVersion);
-  }
-
  if (versions.length < 2 || versions[0] != 'pypy') {
    throw new Error(
-      "Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy<python-version>' or 'pypy-<python-version>'. See README for examples and documentation."
+      "Invalid 'version' property for PyPy. PyPy version should be specified as 'pypy-<python-version>'. See README for examples and documentation."
    );
  }

--- a/src/find-python.ts
+++ b/src/find-python.ts
@ -70,7 +70,6 @@ export async function useCpythonVersion(
  }

  core.exportVariable('pythonLocation', installDir);
-  core.exportVariable('PKG_CONFIG_PATH', installDir + '/lib/pkgconfig');

  if (IS_LINUX) {
    const libPath = process.env.LD_LIBRARY_PATH
@ -83,14 +82,8 @@ export async function useCpythonVersion(
    }
  }

-  const _binDir = binDir(installDir);
-  const binaryExtension = IS_WINDOWS ? '.exe' : '';
-  const pythonPath = path.join(
-    IS_WINDOWS ? installDir : _binDir,
-    `python${binaryExtension}`
-  );
  core.addPath(installDir);
-  core.addPath(_binDir);
+  core.addPath(binDir(installDir));

  if (IS_WINDOWS) {
    // Add --user directory
@ -112,15 +105,18 @@ export async function useCpythonVersion(

  const installed = versionFromPath(installDir);
  core.setOutput('python-version', installed);
-  core.setOutput('python-path', pythonPath);

  return {impl: 'CPython', version: installed};
 }

-/** Convert versions like `3.8-dev` to a version like `~3.8.0-0`. */
+/** Convert versions like `3.8-dev` to a version like `>= 3.8.0-a0`. */
 function desugarDevVersion(versionSpec: string) {
-  const devVersion = /^(\d+)\.(\d+)-dev$/;
-  return versionSpec.replace(devVersion, '~$1.$2.0-0');
+  if (versionSpec.endsWith('-dev')) {
+    const versionRoot = versionSpec.slice(0, -'-dev'.length);
+    return `>= ${versionRoot}.0-a0`;
+  } else {
+    return versionSpec;
+  }
 }

 /** Extracts python version from install path from hosted tool cache as described in README.md */
--- a/src/install-pypy.ts
+++ b/src/install-pypy.ts
@ -98,9 +98,7 @@ async function createPyPySymlink(
 ) {
  const version = semver.coerce(pythonVersion)!;
  const pythonBinaryPostfix = semver.major(version);
-  const pythonMinor = semver.minor(version);
  const pypyBinaryPostfix = pythonBinaryPostfix === 2 ? '' : '3';
-  const pypyMajorMinorBinaryPostfix = `${pythonBinaryPostfix}.${pythonMinor}`;
  let binaryExtension = IS_WINDOWS ? '.exe' : '';

  core.info('Creating symlinks...');
@ -117,13 +115,6 @@ async function createPyPySymlink(
    `python${binaryExtension}`,
    true
  );
-
-  createSymlinkInFolder(
-    pypyBinaryPath,
-    `pypy${pypyBinaryPostfix}${binaryExtension}`,
-    `pypy${pypyMajorMinorBinaryPostfix}${binaryExtension}`,
-    true
-  );
 }

 async function installPip(pythonLocation: string) {
--- a/src/setup-python.ts
+++ b/src/setup-python.ts
@ -3,12 +3,11 @@ import * as finder from './find-python';
 import * as finderPyPy from './find-pypy';
 import * as path from 'path';
 import * as os from 'os';
-import fs from 'fs';
 import {getCacheDistributor} from './cache-distributions/cache-factory';
 import {isCacheFeatureAvailable} from './utils';

 function isPyPyVersion(versionSpec: string) {
-  return versionSpec.startsWith('pypy');
+  return versionSpec.startsWith('pypy-');
 }

 async function cacheDependencies(cache: string, pythonVersion: string) {
@ -22,48 +21,9 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
  await cacheDistributor.restoreCache();
 }

-function resolveVersionInput(): string {
-  let version = core.getInput('python-version');
-  const versionFile = core.getInput('python-version-file');
-
-  if (version && versionFile) {
-    core.warning(
-      'Both python-version and python-version-file inputs are specified, only python-version will be used'
-    );
-  }
-
-  if (version) {
-    return version;
-  }
-
-  const versionFilePath = path.join(
-    process.env.GITHUB_WORKSPACE!,
-    versionFile || '.python-version'
-  );
-  if (!fs.existsSync(versionFilePath)) {
-    throw new Error(
-      `The specified python version file at: ${versionFilePath} does not exist`
-    );
-  }
-  version = fs.readFileSync(versionFilePath, 'utf8');
-  core.info(`Resolved ${versionFile} as ${version}`);
-
-  return version;
-}
-
 async function run() {
-  if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
-    core.debug(
-      `Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`
-    );
-    process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
-  } else {
-    core.debug(
-      `Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`
-    );
-  }
  try {
-    const version = resolveVersionInput();
+    const version = core.getInput('python-version');
    if (version) {
      let pythonVersion: string;
      const arch: string = core.getInput('architecture') || os.arch();
@ -71,22 +31,18 @@ async function run() {
        const installed = await finderPyPy.findPyPyVersion(version, arch);
        pythonVersion = `${installed.resolvedPyPyVersion}-${installed.resolvedPythonVersion}`;
        core.info(
-          `Successfully set up PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`
+          `Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`
        );
      } else {
        const installed = await finder.useCpythonVersion(version, arch);
        pythonVersion = installed.version;
-        core.info(`Successfully set up ${installed.impl} (${pythonVersion})`);
+        core.info(`Successfully setup ${installed.impl} (${pythonVersion})`);
      }

      const cache = core.getInput('cache');
      if (cache && isCacheFeatureAvailable()) {
        await cacheDependencies(cache, pythonVersion);
      }
-    } else {
-      core.warning(
-        'The `python-version` input is not set.  The version of Python currently in `PATH` will be used.'
-      );
    }
    const matchersPath = path.join(__dirname, '../..', '.github');
    core.info(`##[add-matcher]${path.join(matchersPath, 'python.json')}`);
--- a/src/utils.ts
+++ b/src/utils.ts
@ -25,7 +25,7 @@ export interface IPyPyManifestRelease {
  files: IPyPyManifestAsset[];
 }

-/** create Symlinks for downloaded PyPy
+/** create Symlinks for downflfoaded PyPy
 *  It should be executed only for downloaded versions in runtime, because
 *  toolcache versions have this setup.
 */