diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ac3196e5..c55ada57 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,14 +56,21 @@ jobs: - uses: actions/checkout@v4 - - name: Setup FFmpeg - uses: Iamshankhadeep/setup-ffmpeg@v1.1 + - if: matrix.os == 'ubuntu-latest' + name: Setup FFmpeg + uses: Iamshankhadeep/setup-ffmpeg@v1.1 # does not support arm64 with: # Not strictly necessary, but it may prevent rate limit # errors especially on GitHub-hosted macos machines. token: ${{ secrets.GITHUB_TOKEN }} version: "4.4" + - if: matrix.os == 'macos-latest' + name: Setup FFmpeg + run: | + brew install ffmpeg@4 + echo "/opt/homebrew/opt/ffmpeg@4/bin" >> $GITHUB_PATH + - name: Configure Windows compilers uses: ilammy/msvc-dev-cmd@v1 @@ -80,6 +87,11 @@ jobs: run: | make tests + - if: matrix.os == 'macos-latest' + name: Specify MacOS version for densepose install + run: | + echo "MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion)" >> $GITHUB_ENV + - name: Run densepose tests env: ZAMBA_RUN_DENSEPOSE_TESTS: 1 diff --git a/pyproject.toml b/pyproject.toml index 6ea0c538..27a14691 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,6 @@ dependencies = [ "appdirs", "av", "cloudpathlib[s3]", - "botocore>=1.34.0", "ffmpeg-python", "future", "fvcore", diff --git a/tests/test_load_video_frames.py b/tests/test_load_video_frames.py index 92fdf94a..c8acd741 100644 --- a/tests/test_load_video_frames.py +++ b/tests/test_load_video_frames.py @@ -438,7 +438,7 @@ def test_megadetector_lite_yolox_dog(tmp_path): [ "ffmpeg", "-r", - "60", + "30", "-f", "image2", "-s", @@ -458,7 +458,9 @@ def test_megadetector_lite_yolox_dog(tmp_path): "-y", ] ) - frames = load_video_frames(tmp_path / "dog.mp4", megadetector_lite_config={"confidence": 0.25}) + frames = load_video_frames( + tmp_path / "dog.mp4", megadetector_lite_config=MegadetectorLiteYoloXConfig() + ) # Check that we detected the correct number of frames assert len(frames) == len(object_frame_indices)