Skip to content

Commit 5467f8c

Browse files
authored
CI jobs cleanups (#1187)
1 parent dea4e93 commit 5467f8c

5 files changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/lint.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- name: Check out repo
2525
uses: actions/checkout@v3
2626
- name: Setup conda env
27-
uses: conda-incubator/setup-miniconda@v2
27+
uses: conda-incubator/setup-miniconda@v3
2828
with:
2929
auto-update-conda: true
30-
miniconda-version: "latest"
30+
miniforge-version: latest
3131
activate-environment: test
3232
python-version: ${{ matrix.python-version }}
3333
- name: Update pip
@@ -52,10 +52,10 @@ jobs:
5252
- name: Check out repo
5353
uses: actions/checkout@v3
5454
- name: Setup conda env
55-
uses: conda-incubator/setup-miniconda@v2
55+
uses: conda-incubator/setup-miniconda@v3
5656
with:
5757
auto-update-conda: true
58-
miniconda-version: "latest"
58+
miniforge-version: latest
5959
activate-environment: test
6060
python-version: ${{ matrix.python-version }}
6161
- name: Update pip

.github/workflows/macos_wheel.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ jobs:
7878
uses: conda-incubator/setup-miniconda@v3
7979
with:
8080
auto-update-conda: true
81-
miniconda-version: "latest"
81+
# Using miniforge instead of miniconda ensures that the default
82+
# conda channel is conda-forge instead of main/default. This ensures
83+
# ABI consistency between dependencies:
84+
# https://conda-forge.org/docs/user/transitioning_from_defaults/
85+
miniforge-version: latest
8286
activate-environment: test
8387
python-version: ${{ matrix.python-version }}
8488
- name: Update pip

.github/workflows/reference_resources.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ jobs:
5959
uses: actions/checkout@v3
6060

6161
- name: Setup conda env
62-
uses: conda-incubator/setup-miniconda@v2
62+
uses: conda-incubator/setup-miniconda@v3
6363
with:
6464
auto-update-conda: true
65-
miniconda-version: "latest"
65+
miniforge-version: latest
6666
activate-environment: test
6767
python-version: ${{ matrix.python-version }}
6868

.github/workflows/windows_wheel.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,4 @@ jobs:
113113
run: bash packaging/install_test_dependencies.sh
114114

115115
- name: Run Python tests
116-
run: |
117-
pytest test -vvv
116+
run: pytest --override-ini="addopts=-v" test

test/test_encoders.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ def encode_to_tensor(frames):
936936
pytest.mark.slow,
937937
pytest.mark.skipif(
938938
get_ffmpeg_major_version() == 4
939-
or (IS_WINDOWS and get_ffmpeg_major_version() in (6, 7)),
939+
or (IS_WINDOWS and get_ffmpeg_major_version() >= 6),
940940
reason="Codec for webm is not available in this FFmpeg installation.",
941941
),
942942
],
@@ -991,7 +991,7 @@ def test_round_trip(self, tmp_path, format, method):
991991
pytest.mark.slow,
992992
pytest.mark.skipif(
993993
get_ffmpeg_major_version() == 4
994-
or (IS_WINDOWS and get_ffmpeg_major_version() in (6, 7)),
994+
or (IS_WINDOWS and get_ffmpeg_major_version() >= 6),
995995
reason="Codec for webm is not available in this FFmpeg installation.",
996996
),
997997
],
@@ -1036,7 +1036,7 @@ def test_against_to_file(self, tmp_path, format, method):
10361036
pytest.mark.slow,
10371037
pytest.mark.skipif(
10381038
get_ffmpeg_major_version() == 4
1039-
or (IS_WINDOWS and get_ffmpeg_major_version() in (6, 7)),
1039+
or (IS_WINDOWS and get_ffmpeg_major_version() >= 6),
10401040
reason="Codec for webm is not available in this FFmpeg installation.",
10411041
),
10421042
],

0 commit comments

Comments
 (0)