From f9d64c1daf08d62b0f07b28482017921cdc44a04 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jan 2022 12:22:28 +0300 Subject: [PATCH 1/5] fix ci for pipenv --- .github/workflows/e2e-cache.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index d15c6f2b6..707fba172 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -42,16 +42,19 @@ jobs: python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - - name: Install pipenv - run: pipx install pipenv - name: Setup Python uses: ./ with: python-version: ${{ matrix.python-version }} cache: 'pipenv' + - run: pip install --user pipenv - name: Install dependencies - run: pipenv install flake8 - + shell: pwsh + run: | + if ($IsMacOS) { + $env:PATH += ":/Users/runner/.local/bin" + } + pipenv install flake8 python-pip-dependencies-caching-path: name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} @@ -81,13 +84,17 @@ jobs: python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - - name: Install pipenv - run: pipx install pipenv - name: Setup Python uses: ./ with: python-version: ${{ matrix.python-version }} cache: 'pipenv' cache-dependency-path: '**/requirements-linux.txt' + - run: pip install --user pipenv - name: Install dependencies - run: pipenv install flake8 \ No newline at end of file + shell: pwsh + run: | + if ($IsMacOS) { + $env:PATH += ":/Users/runner/.local/bin" + } + pipenv install flake8 \ No newline at end of file From 3ec2fb61eececf77246d2ea3d17ece6221995505 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 13 Jan 2022 16:06:22 +0300 Subject: [PATCH 2/5] remove pypy for pipenv --- .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 707fba172..8d2a75c80 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.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.7', '3.8', '3.9'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -81,7 +81,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.7', '3.8', '3.9'] steps: - uses: actions/checkout@v2 - name: Setup Python From cf5bb8df2b1c1279c357141de2508f1419d11987 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 26 Jan 2022 13:37:40 +0300 Subject: [PATCH 3/5] change dependency --- .github/workflows/e2e-cache.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 8d2a75c80..46c2996e4 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.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -47,14 +47,11 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pipenv' - - run: pip install --user pipenv + - name: Install pipenv + run: pipx install pipenv - name: Install dependencies - shell: pwsh - run: | - if ($IsMacOS) { - $env:PATH += ":/Users/runner/.local/bin" - } - pipenv install flake8 + run: pipenv install numpy + python-pip-dependencies-caching-path: name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} @@ -81,7 +78,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -90,11 +87,7 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pipenv' cache-dependency-path: '**/requirements-linux.txt' - - run: pip install --user pipenv + - name: Install pipenv + run: pipx install pipenv - name: Install dependencies - shell: pwsh - run: | - if ($IsMacOS) { - $env:PATH += ":/Users/runner/.local/bin" - } - pipenv install flake8 \ No newline at end of file + run: pipenv install numpy \ No newline at end of file From ad064be53910f9c13c77635eed45cbf10ec165ec Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 26 Jan 2022 14:32:07 +0300 Subject: [PATCH 4/5] reduce matrix --- .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 46c2996e4..63bdc47e9 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.8', '3.9', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.8', '3.9', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.8', '3.9', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python @@ -78,7 +78,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x'] + python-version: ['3.8', '3.9', 'pypy-3.7-v7.x'] steps: - uses: actions/checkout@v2 - name: Setup Python From e22f107d09f004c0595be5a124ed590f27bfc5f2 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 26 Jan 2022 16:25:15 +0300 Subject: [PATCH 5/5] change windows-latest to windows-2019 for pypy3 --- .github/workflows/test-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 87fa8afd4..191db1411 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -97,7 +97,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15, windows-latest, ubuntu-18.04, ubuntu-20.04] + os: [macos-10.15, windows-2019, ubuntu-18.04, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v2