Merge pull request #23 from mattip/main-numpymeson

Update to meson 1.8.3

Author: rgommers

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [eli-schwartz]
+custom: ['https://mesonbuild.com/Donating.html']

.github/codecov.yml

@@ -41,6 +41,10 @@ jobs:
       MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }}
 
     steps:
+      # remove inheritable permissions since they break assumptions testsuite
+      # makes about file modes
+      - run: icacls . /inheritance:r /T /C
+
       - uses: actions/cache/restore@v4
         id: restore-cache
         with:
@@ -53,7 +57,7 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: cygwin/cygwin-install-action@master
+      - uses: cygwin/cygwin-install-action@v5
         with:
           platform: ${{ matrix.ARCH }}
           packages: |
@@ -83,7 +87,7 @@ jobs:
       - name: Run pip
         run: |
           export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
-          python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist coverage
+          python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist
         shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
 
       - uses: actions/cache/save@v4
@@ -95,7 +99,7 @@ jobs:
       - name: Run tests
         run: |
           export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
-          python3 ./tools/run_with_cov.py run_tests.py --backend=ninja
+          python3 ./run_tests.py --backend=ninja
         env:
           # Cygwin's static boost installation is broken (some static library
           # variants such as boost_thread are not present)
@@ -108,17 +112,3 @@ jobs:
           path: meson-test-run.*
         # test log should be saved on failure
         if: ${{ !cancelled() }}
-
-      - name: Aggregate coverage reports
-        run: |
-          export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
-          ./ci/combine_cov.sh
-        shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v3
-        with:
-          files: .coverage/coverage.xml
-          name: "${{ matrix.NAME }}"
-          fail_ci_if_error: false
-          verbose: true

.github/codeql/codeql-config.yml

@@ -53,7 +53,7 @@ jobs:
       with:
         python-version: '3.x'
     # Pin mypy to version 1.8, so we retain the ability to lint for Python 3.7
-    - run: python -m pip install "mypy==1.8" coverage strictyaml types-PyYAML types-tqdm types-chevron
+    - run: python -m pip install "mypy==1.8" strictyaml types-PyYAML types-tqdm types-chevron
     - run: python run_mypy.py --allver
       env:
         PYTHONUNBUFFERED: 1

.github/codeql/lgtm.qls

@@ -32,12 +32,10 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
     - run: |
-        python -m pip install --upgrade pip
-        python -m pip install pytest pytest-xdist pytest-subtests fastjsonschema coverage
+        export PATH="$HOME/Library/Python/3.9/bin:$PATH"
+        /usr/bin/python3 -m pip install --upgrade pip
+        /usr/bin/python3 -m pip install pytest pytest-xdist pytest-subtests fastjsonschema
     - run: brew install pkg-config ninja llvm qt@5
     - env:
         CPPFLAGS: "-I/opt/homebrew/include"
@@ -48,20 +46,9 @@ jobs:
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
-        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
-        ./tools/run_with_cov.py ./run_unittests.py
-
-    - name: Aggregate coverage reports
-      run: ./ci/combine_cov.sh
-
-    - name: Upload coverage report
-      uses: codecov/codecov-action@v3
-      with:
-        files: .coverage/coverage.xml
-        name: "appleclang [unit tests]"
-        fail_ci_if_error: false
-        verbose: true
+        export PATH="$HOME/Library/Python/3.9/bin:$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
+        export PKG_CONFIG_PATH="/Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/Current/lib/pkgconfig:/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
+        /usr/bin/python3 ./run_unittests.py
 
 
   project-tests-appleclang:
@@ -98,9 +85,7 @@ jobs:
     # https://github.com/actions/setup-python/issues/58
     - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
     - run: |
-        python3 -m pip install --upgrade setuptools
-        python3 -m pip install --upgrade pip
-        python3 -m pip install cython coverage
+        python3 -m pip install cython
     - env:
         CPPFLAGS: "-I/opt/homebrew/include"
         LDFLAGS: "-L/opt/homebrew/lib"
@@ -110,20 +95,11 @@ jobs:
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH"
+        # Append LLVM's bin directory to PATH to prioritise Apple Clang over Homebrew Clang.
+        # We need this to avoid objfw test failures.
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/ncurses/bin:$PATH:/opt/homebrew/opt/llvm/bin"
         export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH"
-        ./tools/run_with_cov.py ./run_project_tests.py --backend=ninja
-
-    - name: Aggregate coverage reports
-      run: ./ci/combine_cov.sh
-
-    - name: Upload coverage report
-      uses: codecov/codecov-action@v3
-      with:
-        files: .coverage/coverage.xml
-        name: "appleclang [project tests; unity=${{ matrix.unity }}]"
-        fail_ci_if_error: false
-        verbose: true
+        ./run_project_tests.py --backend=ninja
 
   Qt4macos:
     # This job only works on Intel Macs, because OpenSSL 1.0 doesn't build on

.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ permissions:
 
 jobs:
   test:
-    runs-on: windows-2019
+    runs-on: windows-2022
     name: ${{ matrix.NAME }}
     strategy:
       fail-fast: false
@@ -79,18 +79,18 @@ jobs:
             mingw-w64-${{ matrix.MSYS2_ARCH }}-libxml2
             mingw-w64-${{ matrix.MSYS2_ARCH }}-ninja
             mingw-w64-${{ matrix.MSYS2_ARCH }}-pkg-config
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-python2
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-lxml
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-setuptools
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-pip
             mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fastjsonschema
             mingw-w64-${{ matrix.MSYS2_ARCH }}-objfw
+            mingw-w64-${{ matrix.MSYS2_ARCH }}-llvm
             mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.TOOLCHAIN }}
 
       - name: Install dependencies
         run: |
-          python3 -m pip --disable-pip-version-check install gcovr pefile pytest pytest-subtests pytest-xdist coverage
+          python3 -m pip --disable-pip-version-check install gcovr pefile pytest pytest-subtests pytest-xdist
 
       - name: Install pypy3 on x86_64
         run: |
@@ -125,20 +125,9 @@ jobs:
             pacman --noconfirm --needed -S mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.MSYS2_CURSES }}
           fi
 
-          MSYSTEM= python3 ./tools/run_with_cov.py run_tests.py --backend=ninja
+          MSYSTEM= python3 ./run_tests.py --backend=ninja
 
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.NAME }}
           path: meson-test-run.*
-
-      - name: Aggregate coverage reports
-        run: ./ci/combine_cov.sh
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v3
-        with:
-          files: .coverage/coverage.xml
-          name: "${{ matrix.NAME }}"
-          fail_ci_if_error: false
-          verbose: true

.github/workflows/cygwin.yml

@@ -0,0 +1,32 @@
+name: Nightly Wheels
+
+concurrency:
+  group: wheels
+  cancel-in-progress: true
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "mesonbuild/**"
+
+permissions:
+  contents: read
+
+jobs:
+  wheel:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Build wheel
+      run: |
+        python -m pip install build setuptools_scm
+        python -m build -nwx
+    - name: Upload wheel
+      uses: scientific-python/upload-nightly-action@main
+      with:
+        artifacts_path: dist
+        anaconda_nightly_upload_token: ${{secrets.ANACONDA_ORG_UPLOAD_TOKEN}}