From 17db7822a9c82a167e18a2224b2f2775c4be8503 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Thu, 13 Jun 2024 11:58:34 +0200 Subject: [PATCH 1/9] CI: enhance name of test jobs --- .github/workflows/test.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e91f0c48..02ed6fd2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,24 +14,17 @@ jobs: matrix: os: [ ubuntu-latest, macOS-latest, windows-latest ] python-version: [ '3.10' ] - pandas: ['pandas'] include: - os: ubuntu-latest python-version: '3.8' - pandas: 'pandas' - tasks: tests - os: ubuntu-latest python-version: '3.9' - pandas: 'pandas' - tasks: tests - os: ubuntu-latest python-version: '3.10' pandas: 'pandas==2.0.3' - tasks: tests - os: ubuntu-latest python-version: '3.10' pandas: 'pandas==2.1.4' - tasks: tests steps: - uses: actions/checkout@v4 @@ -57,7 +50,10 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - pip install "${{ matrix.pandas }}" + + - name: Install requested pandas version + run: pip install "${{ matrix.pandas }}" + if: ${{ matrix.pandas }} # TESTS - name: Ubuntu - install ffmpeg/mediainfo From 3fa17632c45524e0729b9c32ab6eb9451833db8b Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Thu, 13 Jun 2024 12:04:55 +0200 Subject: [PATCH 2/9] Try to get pandas jobs to run --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02ed6fd2..db10c910 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,8 +52,9 @@ jobs: pip install -r requirements.txt - name: Install requested pandas version - run: pip install "${{ matrix.pandas }}" - if: ${{ matrix.pandas }} + run: | + pip install "${{ matrix.pandas }}" + if: matrix.pandas # TESTS - name: Ubuntu - install ffmpeg/mediainfo From 0ed1ae5570c1f92e971c742c6b463981fb233076 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:24:06 +0200 Subject: [PATCH 3/9] DEBUG --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db10c910..a4d072a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: - name: Install requested pandas version run: | pip install "${{ matrix.pandas }}" - if: matrix.pandas + if: ${{ matrix.pandas }} # TESTS - name: Ubuntu - install ffmpeg/mediainfo From dfb993b12d49ca1468c2a3e4bd459ce5e2d29af8 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:30:51 +0200 Subject: [PATCH 4/9] DEBUG --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4d072a3..85df0d77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: - name: Install requested pandas version run: | pip install "${{ matrix.pandas }}" - if: ${{ matrix.pandas }} + if: matrix.pandas == 'pandas==2.1.4' # TESTS - name: Ubuntu - install ffmpeg/mediainfo From 22118a106bcb04d2a55b4b311056b7f4cc87e3aa Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:34:44 +0200 Subject: [PATCH 5/9] DEBUG --- .github/workflows/test.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85df0d77..039323cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,11 +20,14 @@ jobs: - os: ubuntu-latest python-version: '3.9' - os: ubuntu-latest - python-version: '3.10' + python-version: '3.9' pandas: 'pandas==2.0.3' - - os: ubuntu-latest - python-version: '3.10' - pandas: 'pandas==2.1.4' + # - os: ubuntu-latest + # python-version: '3.10' + # pandas: 'pandas==2.0.3' + # - os: ubuntu-latest + # python-version: '3.10' + # pandas: 'pandas==2.1.4' steps: - uses: actions/checkout@v4 @@ -54,7 +57,7 @@ jobs: - name: Install requested pandas version run: | pip install "${{ matrix.pandas }}" - if: matrix.pandas == 'pandas==2.1.4' + if: matrix.pandas == 'pandas==2.0.3' # TESTS - name: Ubuntu - install ffmpeg/mediainfo From 18c2e25f6b8af7ecda1ce0e5145e498509eb1ab4 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:39:41 +0200 Subject: [PATCH 6/9] DEBUG --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 039323cc..5ba2748d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,7 +57,7 @@ jobs: - name: Install requested pandas version run: | pip install "${{ matrix.pandas }}" - if: matrix.pandas == 'pandas==2.0.3' + if: matrix.pandas # TESTS - name: Ubuntu - install ffmpeg/mediainfo From c29cc0bc1922c8f42adca2d21ba04c9a8ec5df65 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:43:08 +0200 Subject: [PATCH 7/9] Finish CI definition --- .github/workflows/test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ba2748d..fe17ce6f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,12 +22,9 @@ jobs: - os: ubuntu-latest python-version: '3.9' pandas: 'pandas==2.0.3' - # - os: ubuntu-latest - # python-version: '3.10' - # pandas: 'pandas==2.0.3' - # - os: ubuntu-latest - # python-version: '3.10' - # pandas: 'pandas==2.1.4' + - os: ubuntu-latest + python-version: '3.9' + pandas: 'pandas==2.1.4' steps: - uses: actions/checkout@v4 From 957fb839e729b733a20c1c7a2bf5023d001a6153 Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:47:30 +0200 Subject: [PATCH 8/9] Stay with using 3.10 for pandas tests --- .github/workflows/test.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe17ce6f..7d147988 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,19 +12,28 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macOS-latest, windows-latest ] - python-version: [ '3.10' ] include: + # Ubuntu - os: ubuntu-latest python-version: '3.8' - os: ubuntu-latest python-version: '3.9' - os: ubuntu-latest - python-version: '3.9' + python-version: '3.10' + - os: ubuntu-latest + python-version: '3.10' pandas: 'pandas==2.0.3' - os: ubuntu-latest - python-version: '3.9' + python-version: '3.10' pandas: 'pandas==2.1.4' + - os: ubuntu-latest + python-version: '3.11' + # MacOS + - os: macOS-latest + python-version: '3.10' + # Windows + - os: windows-latest + python-version: '3.10' steps: - uses: actions/checkout@v4 From 33ad4e3cee90651e1608c1793e1c4a5400e46f0d Mon Sep 17 00:00:00 2001 From: Hagen Wierstorf Date: Fri, 14 Jun 2024 15:51:40 +0200 Subject: [PATCH 9/9] Reorder tests --- .github/workflows/test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d147988..ac252858 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,27 +13,27 @@ jobs: strategy: matrix: include: - # Ubuntu + # Different platforms + - os: ubuntu-latest + python-version: '3.10' + - os: macOS-latest + python-version: '3.10' + - os: windows-latest + python-version: '3.10' + # Other Python versions - os: ubuntu-latest python-version: '3.8' - os: ubuntu-latest python-version: '3.9' - os: ubuntu-latest - python-version: '3.10' + python-version: '3.11' + # Other pandas versions - os: ubuntu-latest python-version: '3.10' pandas: 'pandas==2.0.3' - os: ubuntu-latest python-version: '3.10' pandas: 'pandas==2.1.4' - - os: ubuntu-latest - python-version: '3.11' - # MacOS - - os: macOS-latest - python-version: '3.10' - # Windows - - os: windows-latest - python-version: '3.10' steps: - uses: actions/checkout@v4