From 2a20d9b5e033c63a77fbb5fa1074a8a9192bbd68 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 29 Jun 2022 19:36:35 +0200 Subject: [PATCH 1/5] add --python 3 --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index d28fa2c0..ba0f4e40 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -53,7 +53,7 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - pipenv install --keep-outdated + pipenv install --keep-outdated --python 3 python-poetry-dependencies-caching: name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -118,4 +118,4 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - pipenv install --keep-outdated \ No newline at end of file + pipenv install --keep-outdated --python 3 \ No newline at end of file From 1e52de40a4a5827eaf838418993a2c92338dd220 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 29 Jun 2022 20:16:07 +0200 Subject: [PATCH 2/5] fixing pipenv --- .github/workflows/e2e-cache.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index ba0f4e40..05400978 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -50,10 +50,15 @@ jobs: - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies + shell: pwsh run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - pipenv install --keep-outdated --python 3 + if (${{ matrix.python-version }} -Match "pypy") { + pipenv install --keep-outdated --python ${{ matrix.python-version }} + } else { + pipenv install --keep-outdated --python pypy + } python-poetry-dependencies-caching: name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -115,7 +120,12 @@ jobs: - name: Install pipenv run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python - name: Install dependencies + shell: pwsh run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - pipenv install --keep-outdated --python 3 \ No newline at end of file + if (${{ matrix.python-version }} -Match "pypy") { + pipenv install --keep-outdated --python ${{ matrix.python-version }} + } else { + pipenv install --keep-outdated --python pypy + } \ No newline at end of file From d358f9e3d736263647a0848999f287bf1f66d499 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 29 Jun 2022 20:28:20 +0200 Subject: [PATCH 3/5] fix check --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 05400978..c580dca8 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -54,7 +54,7 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - if (${{ matrix.python-version }} -Match "pypy") { + if ("${{ matrix.python-version }}" -Match "pypy") { pipenv install --keep-outdated --python ${{ matrix.python-version }} } else { pipenv install --keep-outdated --python pypy @@ -124,7 +124,7 @@ jobs: run: | mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . - if (${{ matrix.python-version }} -Match "pypy") { + if ("${{ matrix.python-version }}" -Match "pypy") { pipenv install --keep-outdated --python ${{ matrix.python-version }} } else { pipenv install --keep-outdated --python pypy From 27091d50ca103a5c3ae2c53c07881b7b7e5b95b9 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 29 Jun 2022 20:38:02 +0200 Subject: [PATCH 4/5] minor fix --- .github/workflows/e2e-cache.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index c580dca8..a0977007 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -55,9 +55,9 @@ jobs: mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . if ("${{ matrix.python-version }}" -Match "pypy") { - pipenv install --keep-outdated --python ${{ matrix.python-version }} - } else { pipenv install --keep-outdated --python pypy + } else { + pipenv install --keep-outdated --python ${{ matrix.python-version }} } python-poetry-dependencies-caching: @@ -125,7 +125,7 @@ jobs: mv ./__tests__/data/Pipfile.lock . mv ./__tests__/data/Pipfile . if ("${{ matrix.python-version }}" -Match "pypy") { - pipenv install --keep-outdated --python ${{ matrix.python-version }} - } else { pipenv install --keep-outdated --python pypy + } else { + pipenv install --keep-outdated --python ${{ matrix.python-version }} } \ No newline at end of file From d7db8259d9728b6b49900079b1472482cd2ad053 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 29 Jun 2022 23:41:39 +0200 Subject: [PATCH 5/5] update pypy versions --- .github/workflows/e2e-cache.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index a0977007..0aea4b77 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.9', 'pypy-3.7-v7.x'] + python-version: ['3.9', 'pypy-3.9-v7.x'] steps: - uses: actions/checkout@v3 - name: Setup Python @@ -108,7 +108,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.9', 'pypy-3.7-v7.x'] + python-version: ['3.9', 'pypy-3.9-v7.x'] steps: - uses: actions/checkout@v3 - name: Setup Python