From 497ede19a63943496cffcbbc357d75e986a92bd0 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Tue, 9 Sep 2025 19:41:43 +0530 Subject: [PATCH 1/8] workflow update --- .github/workflows/e2e-cache.yml | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 76a8f8c51..0852e2651 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -15,45 +15,45 @@ on: permissions: contents: read jobs: - python-pip-dependencies-caching: - name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - [ - ubuntu-latest, - ubuntu-24.04-arm, - ubuntu-22.04, - ubuntu-22.04-arm, - windows-latest, - macos-latest, - macos-13 - ] - python-version: - [ - '3.9', - 'pypy-3.9-v7.x', - '3.10', - 'pypy-3.10-v7.x', - '3.11', - 'pypy-3.11-v7.x', - '3.12', - '3.13' - ] - exclude: - - os: windows-latest - python-version: pypy-3.11-v7.x - steps: - - uses: actions/checkout@v4 - - name: Setup Python - uses: ./ - with: - python-version: ${{ matrix.python-version }} - cache: 'pip' - - name: Install dependencies - run: pip install numpy pandas requests + python-pip-dependencies-caching: + name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + [ + ubuntu-latest, + ubuntu-24.04-arm, + ubuntu-22.04, + ubuntu-22.04-arm, + windows-latest, + macos-latest, + macos-13 + ] + python-version: + [ + '3.9', + 'pypy-3.9-v7.x', + '3.10', + 'pypy-3.10-v7.x', + '3.11', + 'pypy-3.11-v7.x', + '3.12', + '3.13' + ] + + steps: + - uses: actions/checkout@v4 + - name: Setup Python + uses: ./ + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + - name: Install dependencies + run: | + # Use a stable NumPy version that has prebuilt wheels for PyPy on all OSes + pip install "numpy<2.1" pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From 5308c82f245c2ff01bffb29504efa15f1a9d5126 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Tue, 9 Sep 2025 19:49:02 +0530 Subject: [PATCH 2/8] format fix --- .github/workflows/e2e-cache.yml | 76 ++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 0852e2651..8a8e7bcb6 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -15,45 +15,45 @@ on: permissions: contents: read jobs: - python-pip-dependencies-caching: - name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - [ - ubuntu-latest, - ubuntu-24.04-arm, - ubuntu-22.04, - ubuntu-22.04-arm, - windows-latest, - macos-latest, - macos-13 - ] - python-version: - [ - '3.9', - 'pypy-3.9-v7.x', - '3.10', - 'pypy-3.10-v7.x', - '3.11', - 'pypy-3.11-v7.x', - '3.12', - '3.13' - ] + python-pip-dependencies-caching: + name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + [ + ubuntu-latest, + ubuntu-24.04-arm, + ubuntu-22.04, + ubuntu-22.04-arm, + windows-latest, + macos-latest, + macos-13 + ] + python-version: + [ + '3.9', + 'pypy-3.9-v7.x', + '3.10', + 'pypy-3.10-v7.x', + '3.11', + 'pypy-3.11-v7.x', + '3.12', + '3.13' + ] - steps: - - uses: actions/checkout@v4 - - name: Setup Python - uses: ./ - with: - python-version: ${{ matrix.python-version }} - cache: 'pip' - - name: Install dependencies - run: | - # Use a stable NumPy version that has prebuilt wheels for PyPy on all OSes - pip install "numpy<2.1" pandas requests + steps: + - uses: actions/checkout@v4 + - name: Setup Python + uses: ./ + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + - name: Install dependencies + run: | + # Use a stable NumPy version that has prebuilt wheels for PyPy on all OSes + pip install "numpy<2.1" pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From 4501c42e8e898d1e1b61069283b25eac2a7fb15f Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Thu, 11 Sep 2025 11:40:40 +0530 Subject: [PATCH 3/8] fix --- .github/workflows/e2e-cache.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 8a8e7bcb6..65eecaef9 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -44,7 +44,7 @@ jobs: ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup Python uses: ./ with: @@ -52,8 +52,14 @@ jobs: cache: 'pip' - name: Install dependencies run: | - # Use a stable NumPy version that has prebuilt wheels for PyPy on all OSes - pip install "numpy<2.1" pandas requests + if [[ "${{ matrix.python-version }}" == pypy* && "${{ runner.os }}" == "macOS" ]]; then + echo "Skipping NumPy on PyPy + macOS (no prebuilt wheels available)" + pip install pandas requests + elif [[ "${{ matrix.python-version }}" == pypy* ]]; then + pip install "numpy<2.0" pandas requests + else + pip install numpy pandas requests + fi python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From c760ec056e4e4dc8483095f43b043329daf17858 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Thu, 11 Sep 2025 18:34:31 +0530 Subject: [PATCH 4/8] fix --- .github/workflows/e2e-cache.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 65eecaef9..1658a04ee 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -50,16 +50,12 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies + + - name: Upgrade pip, setuptools, and wheel run: | - if [[ "${{ matrix.python-version }}" == pypy* && "${{ runner.os }}" == "macOS" ]]; then - echo "Skipping NumPy on PyPy + macOS (no prebuilt wheels available)" - pip install pandas requests - elif [[ "${{ matrix.python-version }}" == pypy* ]]; then - pip install "numpy<2.0" pandas requests - else - pip install numpy pandas requests - fi + python -m pip install --upgrade pip setuptools wheel + - name: Install dependencies + run: pip install numpy pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From c66097a2048f085d04fb7c9ce05b1bb3d2936965 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 12 Sep 2025 11:40:05 +0530 Subject: [PATCH 5/8] fix --- .github/workflows/e2e-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 1658a04ee..9793d8650 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -55,7 +55,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel - name: Install dependencies - run: pip install numpy pandas requests + run: pip install "numpy<1.25" pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From f17b76bb55956ae3a066b84f27aec29417a6a1b0 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Mon, 15 Sep 2025 12:56:56 +0530 Subject: [PATCH 6/8] fix --- .github/workflows/e2e-cache.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 9793d8650..af1a74224 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -51,11 +51,8 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Upgrade pip, setuptools, and wheel - run: | - python -m pip install --upgrade pip setuptools wheel - name: Install dependencies - run: pip install "numpy<1.25" pandas requests + run: pip install "numpy==1.26.4" pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) From a5ae1d9a84ff39342648eeb6ab45c6697bc5caf5 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Mon, 15 Sep 2025 19:52:14 +0530 Subject: [PATCH 7/8] updated fix --- .github/workflows/e2e-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index af1a74224..99029eeae 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -304,4 +304,4 @@ jobs: cache-dependency-path: __tests__/data/requirements.txt pip-version: '25.0.1' - name: Install dependencies - run: pip install numpy pandas requests + run: pip install "numpy==1.26.4" pandas requests From 67c9f11e3a57dad699b9fb1cf58adf77680955f9 Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Tue, 16 Sep 2025 13:25:55 +0530 Subject: [PATCH 8/8] test-failure-fix --- .github/workflows/e2e-cache.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 99029eeae..13bfc2627 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -42,6 +42,9 @@ jobs: '3.12', '3.13' ] + exclude: + - os: macos-latest + python-version: pypy-3.9-v7.x steps: - uses: actions/checkout@v5 @@ -52,7 +55,7 @@ jobs: cache: 'pip' - name: Install dependencies - run: pip install "numpy==1.26.4" pandas requests + run: pip install numpy pandas requests python-pipenv-dependencies-caching: name: Test pipenv (Python ${{ matrix.python-version}}, ${{ matrix.os }}) @@ -182,6 +185,8 @@ jobs: exclude: - os: windows-latest python-version: pypy-3.11-v7.x + - os: macos-latest + python-version: pypy-3.9-v7.x steps: - uses: actions/checkout@v4 - name: Setup Python @@ -304,4 +309,4 @@ jobs: cache-dependency-path: __tests__/data/requirements.txt pip-version: '25.0.1' - name: Install dependencies - run: pip install "numpy==1.26.4" pandas requests + run: pip install numpy pandas requests