Merge remote-tracking branch 'upstream/master' into update-may2024

At commit 7d28ff2, 15 May 2024, version 1.4.99
numpy · May 16, 2024 · 31161ee · 31161ee
2 parents 4e370ca + 7d28ff2
commit 31161ee
Show file tree

Hide file tree

Showing 1,031 changed files with 18,255 additions and 10,127 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,5 @@
 * text eol=lf
 *.png binary
 *.icns binary
+data/shell-completions/bash/meson linguist-language=Shell
+data/shell-completions/zsh/_meson linguist-language=Shell
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
@@ -6,6 +6,10 @@ concurrency:
 
 on:
   push:
+    branches:
+      - master
+      # Stable branches such as 0.56 or 1.0
+      - '[0-9]+.[0-9]+'
     paths:
       - "mesonbuild/**"
       - "test cases/**"
@@ -76,8 +80,7 @@ jobs:
       - name: Run pip
         run: |
           export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
-          # jsonschema is max capped because the new version depends on rust dependencies which are... hard to get on cygwin
-          python3 -m pip --disable-pip-version-check install gcovr 'jsonschema<4.18' pefile pytest pytest-subtests pytest-xdist coverage
+          python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist coverage
         shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
 
       - uses: actions/cache/save@v3

diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -7,7 +7,6 @@ concurrency:
 on:
   push:
     branches:
-      - master
     paths:
       - 'ci/ciimage/**'
       - '.github/workflows/images.yml'
@@ -41,6 +40,7 @@ jobs:
           - { name: Arch Linux,       id: arch     }
           - { name: CUDA (on Arch),   id: cuda     }
           - { name: Fedora,           id: fedora   }
+          - { name: Gentoo,           id: gentoo   }
           - { name: OpenSUSE,         id: opensuse }
           - { name: Ubuntu Bionic,    id: bionic   }
           - { name: Ubuntu Rolling,   id: ubuntu-rolling  }

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
       with:
         python-version: '3.x'
     - run: python -m pip install pylint
-    - run: pylint mesonbuild
+    - run: pylint --output-format colorized mesonbuild
 
   flake8:
     runs-on: ubuntu-latest
@@ -37,7 +37,7 @@ jobs:
         with:
           python-version: '3.x'
       - run: python -m pip install flake8
-      - run: flake8 mesonbuild/
+      - run: flake8 --color always mesonbuild/
 
   mypy:
     runs-on: ubuntu-latest
@@ -46,5 +46,10 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.x'
-    - run: python -m pip install mypy types-PyYAML
-    - run: python run_mypy.py
+    # 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 run_mypy.py --allver
+      env:
+        PYTHONUNBUFFERED: 1
+        TERM: xterm-color
+        MYPY_FORCE_COLOR: 1
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -6,19 +6,23 @@ concurrency:
 
 on:
   push:
+    branches:
+      - master
+      # Stable branches such as 0.56 or 1.0
+      - '[0-9]+.[0-9]+'
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/macos.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
   pull_request:
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/macos.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
 
 permissions:
   contents: read
@@ -33,18 +37,19 @@ jobs:
         python-version: '3.x'
     - run: |
         python -m pip install --upgrade pip
-        python -m pip install pytest pytest-xdist pytest-subtests jsonschema coverage
+        python -m pip install pytest pytest-xdist pytest-subtests fastjsonschema coverage
     - run: brew install pkg-config ninja llvm qt@5
     - env:
-        CPPFLAGS: "-I/usr/local/include"
-        LDFLAGS: "-L/usr/local/lib"
+        CPPFLAGS: "-I/opt/homebrew/include"
+        LDFLAGS: "-L/opt/homebrew/lib"
         MESON_CI_JOBNAME: unittests-appleclang
         MESON_UNIT_TEST_BACKEND: ninja
+        HOMEBREW_NO_AUTO_UPDATE: 1
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin"
-        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_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
@@ -73,6 +78,7 @@ jobs:
     name: ${{ matrix.NAME }}
     env:
       MESON_CI_JOBNAME: ${{ matrix.NAME }}
+      HOMEBREW_NO_AUTO_UPDATE: 1
 
     steps:
     - uses: actions/checkout@v3
@@ -84,24 +90,28 @@ jobs:
         find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
         sudo rm -rf /Library/Frameworks/Python.framework/
         brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
+        # Delete nonsensical PEP 668 breakage. It is the wrong solution to the problem and isn't designed to be
+        # productive -- only victim blaming -- however it bites particularly badly because this is a container/VM
+        # See commit 5c479d7a13a518c18ccb4dc3b6bdd7bfc2a9bdb5 for a more thorough analysis.
+        find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
     # 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
+    - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw
     - run: |
         python3 -m pip install --upgrade setuptools
         python3 -m pip install --upgrade pip
         python3 -m pip install cython coverage
     - env:
-        CPPFLAGS: "-I/usr/local/include"
-        LDFLAGS: "-L/usr/local/lib"
+        CPPFLAGS: "-I/opt/homebrew/include"
+        LDFLAGS: "-L/opt/homebrew/lib"
         MESON_ARGS: --unity=${{ matrix.unity }}
+        XML_CATALOG_FILES: "/opt/homebrew/etc/xml/catalog"
         CI: 1
         # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
       run: |
         export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
-        export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin"
-        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
-        export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"
+        export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH"
+        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
@@ -116,7 +126,11 @@ jobs:
         verbose: true
 
   Qt4macos:
-    runs-on: macos-latest
+    # This job only works on Intel Macs, because OpenSSL 1.0 doesn't build on
+    # Apple ARM
+    runs-on: macos-13
+    env:
+      HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -6,19 +6,23 @@ concurrency:
 
 on:
   push:
+    branches:
+      - master
+      # Stable branches such as 0.56 or 1.0
+      - '[0-9]+.[0-9]+'
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/msys2.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
   pull_request:
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/msys2.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
 
 permissions:
   contents: read
@@ -80,7 +84,8 @@ jobs:
             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-jsonschema
+            mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fastjsonschema
+            mingw-w64-${{ matrix.MSYS2_ARCH }}-objfw
             mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.TOOLCHAIN }}
 
       - name: Install dependencies
@@ -100,7 +105,7 @@ jobs:
       - name: Run Tests
         run: |
           if [[ "${{ matrix.MSYS2_ARCH }}" == "x86_64" ]]; then
-            # There apparently is no clean way to add to the PATH in the 
+            # There apparently is no clean way to add to the PATH in the
             # previous step?
             # See for instance https://github.com/msys2/setup-msys2/issues/171
             export PATH=$PATH:$PWD/pypy3local

diff --git a/.github/workflows/nonnative.yml b/.github/workflows/nonnative.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - master
-      # Stable branches such as 0.56 or the eventual 1.0
+      # Stable branches such as 0.56 or 1.0
       - '[0-9]+.[0-9]+'
     paths:
       - "mesonbuild/**"

diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
@@ -8,23 +8,23 @@ on:
   push:
     branches:
       - master
-      # Stable branches such as 0.56 or the eventual 1.0
+      # Stable branches such as 0.56 or 1.0
       - '[0-9]+.[0-9]+'
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/images.yml"
       - ".github/workflows/os_comp.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
   pull_request:
     paths:
       - "mesonbuild/**"
       - "test cases/**"
       - "unittests/**"
       - ".github/workflows/images.yml"
       - ".github/workflows/os_comp.yml"
-      - "run_unittests.py"
+      - "run*tests.py"
 
 permissions:
   contents: read
@@ -40,6 +40,7 @@ jobs:
           - { name: Arch Linux,       id: arch     }
           - { name: CUDA (on Arch),   id: cuda     }
           - { name: Fedora,           id: fedora   }
+          - { name: Gentoo,           id: gentoo   }
           - { name: OpenSUSE,         id: opensuse }
           - { name: Ubuntu Bionic,    id: bionic   }
     container: mesonbuild/${{ matrix.cfg.id }}:latest

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -10,9 +10,11 @@ on:
     branches:
       - master
     paths:
+      - .github/workflows/website.yml
       - docs/**
   pull_request:
     paths:
+      - .github/workflows/website.yml
       - docs/**
   workflow_dispatch:
   release:
@@ -31,10 +33,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
+      - uses: actions/cache/restore@v3
+        id: restore-cache
+        with:
+          # should use 'pip3 cache dir' to discover this path
+          path: ~/.cache/pip
+          key: website-pip-${{ github.run_number }}
+          restore-keys: website-pip-
+
       - name: Install package
         run: |
           sudo apt-get -y install python3-pip ninja-build libjson-glib-dev
           pip install hotdoc chevron strictyaml
+
+      - uses: actions/cache/save@v3
+        with:
+          # should use 'pip3 cache dir' to discover this path
+          path: ~/.cache/pip
+          key: website-pip-${{ github.run_number }}
+
       - name: Setup SSH Keys and known_hosts
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock

diff --git a/.mypy.ini b/.mypy.ini
@@ -2,7 +2,8 @@
 strict_optional               = False
 show_error_context            = False
 show_column_numbers           = True
-ignore_missing_imports        = True
+ignore_missing_imports        = False
+implicit_reexport             = False
 
 follow_imports                = silent
 warn_redundant_casts          = True

diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py
@@ -74,6 +74,17 @@ def gen_bashrc(self) -> None:
         # Also add /ci to PATH
         out_data += 'export PATH="/ci:$PATH"\n'
 
+        out_data += '''
+            if [ -f "$HOME/.cargo/env" ]; then
+                source "$HOME/.cargo/env"
+            fi
+        '''
+
+        if self.data_dir.name == 'gentoo':
+            out_data += '''
+                source /etc/profile
+            '''
+
         out_file.write_text(out_data, encoding='utf-8')
 
         # make it executable

diff --git a/ci/ciimage/common.sh b/ci/ciimage/common.sh
@@ -15,7 +15,7 @@ base_python_pkgs=(
   pytest-xdist
   pytest-subtests
   coverage
-  jsonschema
+  fastjsonschema
 )
 
 python_pkgs=(

diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
@@ -6,13 +6,13 @@ source /ci/common.sh
 
 pkgs=(
   python python-pip python3-devel
-  ninja-build make git autoconf automake patch
+  ninja-build make git autoconf automake patch file
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-objc++ vala rust bison flex ldc libasan libasan-static
-  mono-core boost-devel gtkmm30 gtest-devel gmock-devel protobuf-devel wxGTK3-devel gobject-introspection
+  mono-core boost-devel gtkmm30 gtest-devel gmock-devel protobuf-devel wxGTK-devel gobject-introspection
   boost-python3-devel
   itstool gtk3-devel java-latest-openjdk-devel gtk-doc llvm-devel clang-devel SDL2-devel graphviz-devel zlib zlib-devel zlib-static
   #hdf5-openmpi-devel hdf5-devel netcdf-openmpi-devel netcdf-devel netcdf-fortran-openmpi-devel netcdf-fortran-devel scalapack-openmpi-devel
-  doxygen vulkan-devel vulkan-validation-layers-devel openssh mercurial gtk-sharp2-devel libpcap-devel gpgme-devel
+  doxygen vulkan-devel vulkan-validation-layers-devel openssh objfw mercurial gtk-sharp2-devel libpcap-devel gpgme-devel
   qt5-qtbase-devel qt5-qttools-devel qt5-linguist qt5-qtbase-private-devel
   libwmf-devel valgrind cmake openmpi-devel nasm gnustep-base-devel gettext-devel ncurses-devel
   libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel libgcrypt-devel wayland-devel wayland-protocols-devel

diff --git a/ci/ciimage/gentoo/image.json b/ci/ciimage/gentoo/image.json
@@ -0,0 +1,8 @@
+{
+  "base_image": "gentoo/stage3:desktop",
+  "env": {
+    "CI": "1",
+    "MESON_CI_JOBNAME": "linux-gentoo-gcc",
+    "SKIP_STATIC_BOOST": "1"
+  }
+}