Only use msys2 packages, remove pip

fortran-lang · Aug 1, 2024 · e1aceca · e1aceca
1 parent fed6ea6
commit e1aceca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -34,7 +34,7 @@ jobs:
           mingw-w64-${{ matrix.arch }}-gcc
           mingw-w64-${{ matrix.arch }}-gcc-fortran
           mingw-w64-${{ matrix.arch }}-python
-          mingw-w64-${{ matrix.arch }}-python-pip
+          mingw-w64-${{ matrix.arch }}-python-fypp
           mingw-w64-${{ matrix.arch }}-python-setuptools
           mingw-w64-${{ matrix.arch }}-cmake
           mingw-w64-${{ matrix.arch }}-ninja
@@ -51,16 +51,11 @@ jobs:
           mingw-w64-x86_64-gcc
           mingw-w64-x86_64-gcc-fortran
           python
-          python-pip
           mingw-w64-x86_64-python-fypp
           cmake
           ninja
           mingw-w64-x86_64-minizip-ng
 
-    - name: Install fypp (MinGW)
-      if: contains(matrix.msystem, 'MINGW')
-      run: pip install fypp
-
     - run: >-
         PATH=$PATH:/mingw64/bin/ cmake
         -Wdev

diff --git a/fpm.toml b/fpm.toml
@@ -9,9 +9,6 @@ copyright = "2019-2021 stdlib contributors"
 test-drive.git = "https://github.com/fortran-lang/test-drive"
 test-drive.tag = "v0.4.0"
 
-[build]
-link = ["minizip-ng"]
-
 [preprocess]
 [preprocess.cpp]
 suffixes = [".F90", ".f90"]