Skip to content

Commit 1bb5984

Browse files
mattipmattip
committed
Merge tag '1.8.3' into main-numpymeson
1.8.3
2 parents 5aa5dd5 + 872ae45 commit 1bb5984

File tree

453 files changed

+12326
-4727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+12326
-4727
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: [eli-schwartz]
2+
custom: ['https://mesonbuild.com/Donating.html']

‎.github/codecov.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/codeql/codeql-config.yml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/codeql/lgtm.qls‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.github/workflows/cygwin.yml‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }}
4242

4343
steps:
44+
# remove inheritable permissions since they break assumptions testsuite
45+
# makes about file modes
46+
- run: icacls . /inheritance:r /T /C
47+
4448
- uses: actions/cache/restore@v4
4549
id: restore-cache
4650
with:
@@ -53,7 +57,7 @@ jobs:
5357

5458
- uses: actions/checkout@v4
5559

56-
- uses: cygwin/cygwin-install-action@master
60+
- uses: cygwin/cygwin-install-action@v5
5761
with:
5862
platform: ${{ matrix.ARCH }}
5963
packages: |
@@ -83,7 +87,7 @@ jobs:
8387
- name: Run pip
8488
run: |
8589
export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
86-
python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist coverage
90+
python3 -m pip --disable-pip-version-check install gcovr fastjsonschema pefile pytest pytest-subtests pytest-xdist
8791
shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
8892

8993
- uses: actions/cache/save@v4
@@ -95,7 +99,7 @@ jobs:
9599
- name: Run tests
96100
run: |
97101
export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
98-
python3 ./tools/run_with_cov.py run_tests.py --backend=ninja
102+
python3 ./run_tests.py --backend=ninja
99103
env:
100104
# Cygwin's static boost installation is broken (some static library
101105
# variants such as boost_thread are not present)
@@ -108,17 +112,3 @@ jobs:
108112
path: meson-test-run.*
109113
# test log should be saved on failure
110114
if: ${{ !cancelled() }}
111-
112-
- name: Aggregate coverage reports
113-
run: |
114-
export PATH=/usr/bin:/usr/local/bin:$(cygpath ${SYSTEMROOT})/system32
115-
./ci/combine_cov.sh
116-
shell: C:\cygwin\bin\bash.exe --noprofile --norc -o igncr -eo pipefail '{0}'
117-
118-
- name: Upload coverage report
119-
uses: codecov/codecov-action@v3
120-
with:
121-
files: .coverage/coverage.xml
122-
name: "${{ matrix.NAME }}"
123-
fail_ci_if_error: false
124-
verbose: true

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
python-version: '3.x'
5555
# Pin mypy to version 1.8, so we retain the ability to lint for Python 3.7
56-
- run: python -m pip install "mypy==1.8" coverage strictyaml types-PyYAML types-tqdm types-chevron
56+
- run: python -m pip install "mypy==1.8" strictyaml types-PyYAML types-tqdm types-chevron
5757
- run: python run_mypy.py --allver
5858
env:
5959
PYTHONUNBUFFERED: 1

‎.github/workflows/macos.yml‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ jobs:
3232
runs-on: macos-latest
3333
steps:
3434
- uses: actions/checkout@v4
35-
- uses: actions/setup-python@v5
36-
with:
37-
python-version: '3.x'
3835
- run: |
39-
python -m pip install --upgrade pip
40-
python -m pip install pytest pytest-xdist pytest-subtests fastjsonschema coverage
36+
export PATH="$HOME/Library/Python/3.9/bin:$PATH"
37+
/usr/bin/python3 -m pip install --upgrade pip
38+
/usr/bin/python3 -m pip install pytest pytest-xdist pytest-subtests fastjsonschema
4139
- run: brew install pkg-config ninja llvm qt@5
4240
- env:
4341
CPPFLAGS: "-I/opt/homebrew/include"
@@ -48,20 +46,9 @@ jobs:
4846
# These cannot evaluate anything, so we cannot set PATH or SDKROOT here
4947
run: |
5048
export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
51-
export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
52-
export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
53-
./tools/run_with_cov.py ./run_unittests.py
54-
55-
- name: Aggregate coverage reports
56-
run: ./ci/combine_cov.sh
57-
58-
- name: Upload coverage report
59-
uses: codecov/codecov-action@v3
60-
with:
61-
files: .coverage/coverage.xml
62-
name: "appleclang [unit tests]"
63-
fail_ci_if_error: false
64-
verbose: true
49+
export PATH="$HOME/Library/Python/3.9/bin:$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH"
50+
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"
51+
/usr/bin/python3 ./run_unittests.py
6552
6653
6754
project-tests-appleclang:
@@ -98,9 +85,7 @@ jobs:
9885
# https://github.com/actions/setup-python/issues/58
9986
- run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
10087
- run: |
101-
python3 -m pip install --upgrade setuptools
102-
python3 -m pip install --upgrade pip
103-
python3 -m pip install cython coverage
88+
python3 -m pip install cython
10489
- env:
10590
CPPFLAGS: "-I/opt/homebrew/include"
10691
LDFLAGS: "-L/opt/homebrew/lib"
@@ -110,20 +95,11 @@ jobs:
11095
# These cannot evaluate anything, so we cannot set PATH or SDKROOT here
11196
run: |
11297
export SDKROOT="$(xcodebuild -version -sdk macosx Path)"
113-
export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH"
98+
# Append LLVM's bin directory to PATH to prioritise Apple Clang over Homebrew Clang.
99+
# We need this to avoid objfw test failures.
100+
export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/ncurses/bin:$PATH:/opt/homebrew/opt/llvm/bin"
114101
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"
115-
./tools/run_with_cov.py ./run_project_tests.py --backend=ninja
116-
117-
- name: Aggregate coverage reports
118-
run: ./ci/combine_cov.sh
119-
120-
- name: Upload coverage report
121-
uses: codecov/codecov-action@v3
122-
with:
123-
files: .coverage/coverage.xml
124-
name: "appleclang [project tests; unity=${{ matrix.unity }}]"
125-
fail_ci_if_error: false
126-
verbose: true
102+
./run_project_tests.py --backend=ninja
127103
128104
Qt4macos:
129105
# This job only works on Intel Macs, because OpenSSL 1.0 doesn't build on

‎.github/workflows/msys2.yml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929

3030
jobs:
3131
test:
32-
runs-on: windows-2019
32+
runs-on: windows-2022
3333
name: ${{ matrix.NAME }}
3434
strategy:
3535
fail-fast: false
@@ -79,18 +79,18 @@ jobs:
7979
mingw-w64-${{ matrix.MSYS2_ARCH }}-libxml2
8080
mingw-w64-${{ matrix.MSYS2_ARCH }}-ninja
8181
mingw-w64-${{ matrix.MSYS2_ARCH }}-pkg-config
82-
mingw-w64-${{ matrix.MSYS2_ARCH }}-python2
8382
mingw-w64-${{ matrix.MSYS2_ARCH }}-python
8483
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-lxml
8584
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-setuptools
8685
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-pip
8786
mingw-w64-${{ matrix.MSYS2_ARCH }}-python-fastjsonschema
8887
mingw-w64-${{ matrix.MSYS2_ARCH }}-objfw
88+
mingw-w64-${{ matrix.MSYS2_ARCH }}-llvm
8989
mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.TOOLCHAIN }}
9090
9191
- name: Install dependencies
9292
run: |
93-
python3 -m pip --disable-pip-version-check install gcovr pefile pytest pytest-subtests pytest-xdist coverage
93+
python3 -m pip --disable-pip-version-check install gcovr pefile pytest pytest-subtests pytest-xdist
9494
9595
- name: Install pypy3 on x86_64
9696
run: |
@@ -125,20 +125,9 @@ jobs:
125125
pacman --noconfirm --needed -S mingw-w64-${{ matrix.MSYS2_ARCH }}-${{ matrix.MSYS2_CURSES }}
126126
fi
127127
128-
MSYSTEM= python3 ./tools/run_with_cov.py run_tests.py --backend=ninja
128+
MSYSTEM= python3 ./run_tests.py --backend=ninja
129129
130130
- uses: actions/upload-artifact@v4
131131
with:
132132
name: ${{ matrix.NAME }}
133133
path: meson-test-run.*
134-
135-
- name: Aggregate coverage reports
136-
run: ./ci/combine_cov.sh
137-
138-
- name: Upload coverage report
139-
uses: codecov/codecov-action@v3
140-
with:
141-
files: .coverage/coverage.xml
142-
name: "${{ matrix.NAME }}"
143-
fail_ci_if_error: false
144-
verbose: true

‎.github/workflows/nightly.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Nightly Wheels
2+
3+
concurrency:
4+
group: wheels
5+
cancel-in-progress: true
6+
7+
on:
8+
push:
9+
branches:
10+
- master
11+
paths:
12+
- "mesonbuild/**"
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
wheel:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 0
24+
- name: Build wheel
25+
run: |
26+
python -m pip install build setuptools_scm
27+
python -m build -nwx
28+
- name: Upload wheel
29+
uses: scientific-python/upload-nightly-action@main
30+
with:
31+
artifacts_path: dist
32+
anaconda_nightly_upload_token: ${{secrets.ANACONDA_ORG_UPLOAD_TOKEN}}

0 commit comments

Comments
 (0)