attempt to fix win runner

m4rc1e · m4rc1e · commit ccc9ef76cb7e · 2025-05-21T10:27:45.000+01:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,7 +49,15 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install Cairo (Ubuntu)
         if: matrix.platform == 'ubuntu-latest'
-        run: sudo apt-get install libcairo2-dev ffmpeg
+        run: sudo apt-get install libcairo2-dev
+      - name: Install ffmpeg (Ubuntu)
+        if: matrix.platform == 'ubuntu-latest'
+        run: sudo apt-get install ffmpeg
+      - name: Install ffmpeg (Windows)
+        if: matrix.platform == 'windows-latest'
+        run: choco install ffmpeg -y
+        shell: pwsh
+
       - name: Install packages
         run: |
           pip install '.[qa]'
diff --git a/Lib/gftools/scripts/fix_media.py b/Lib/gftools/scripts/fix_media.py
@@ -106,7 +106,8 @@ def remove_unused_media(fp: Path, article: BeautifulSoup):
 
 
 def fix_media(fp: Path, out: Path = None, inplace: bool = False, dry_run: bool = False):
-    shutil.rmtree(out, ignore_errors=True)
+    if out.exists():
+        shutil.rmtree(out)
     os.makedirs(out)
 
     # Work on a copy of every file so we can do a dry run if needed.
diff --git a/tests/test_fix_media.py b/tests/test_fix_media.py
@@ -6,7 +6,7 @@
 from pathlib import Path
 
 
-TEST_DATA = os.path.join("data", "test", "article")
+TEST_DATA = Path(os.path.join("data", "test", "article"))
 
 
 def test_fix_media():
@@ -17,15 +17,20 @@ def test_fix_media():
             out=tmp_dir,
         )
         # width should be 1024
-        img = Image.open(os.path.join(tmp_dir, "img1.jpg"))
+        img_path = tmp_dir / "img1.jpg"
+        img = Image.open(img_path)
         img_width, img_height = img.size
         assert img_width <= MAX_WIDTH
         assert img_height <= MAX_HEIGHT
 
         # Filesize should be less than 800kb
-        img_size = os.stat(tmp_dir / "img1.jpg").st_size
+        img_size = os.stat(img_path).st_size
         assert img_size <= MAXSIZE_RASTER
 
         # Check gif is converted to mp4
-        assert (tmp_dir / "vid1.mp4").exists()
-        assert not (tmp_dir / "vid1.gif").exists()
+        vid_path = tmp_dir / "vid1.mp4"
+        assert (vid_path).exists()
+        # Check olf gif is deleted
+        old_gif = tmp_dir / "vid1.gif"
+        assert not (old_gif).exists()
+        img.close()
