Skip to content

Commit 7387600

Browse files
authored
Merge pull request numpy#25071 from charris/backport-24291-24493
MAINT: Split up .github/workflows to match main
2 parents 1989099 + 39d854f commit 7387600

File tree

11 files changed

+634
-819
lines changed

11 files changed

+634
-819
lines changed

.github/actions/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ runs:
1111
echo DOWNLOAD_OPENBLAS $DOWNLOAD_OPENBLAS
1212
echo USE_DEBUG $USE_DEBUG
1313
echo NPY_USE_BLAS_ILP64 $NPY_USE_BLAS_ILP64
14-
echo NUMPY_EXPERIMENTAL_ARRAY_FUNCTION $NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
1514
echo USE_ASV $USE_ASV
1615
echo PATH $PATH
1716
echo python `which python`

.github/meson_actions/action.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,35 @@ description: "checkout repo, build, and test numpy"
33
runs:
44
using: composite
55
steps:
6-
- name: Install dependencies
7-
shell: bash
8-
run: pip install -r build_requirements.txt
96
- name: Build
107
shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
118
env:
129
TERM: xterm-256color
13-
run:
14-
spin build -- ${MESON_ARGS[@]}
15-
- name: Check build-internal dependencies
16-
shell: bash
17-
run:
18-
ninja -C build -t missingdeps
19-
- name: Check installed test and stub files
10+
PKG_CONFIG_PATH: ./.openblas
11+
run: |
12+
echo "::group::Installing Build Dependencies"
13+
pip install -r build_requirements.txt
14+
echo "::endgroup::"
15+
echo "::group::Building NumPy"
16+
spin build --clean -- ${MESON_ARGS[@]}
17+
echo "::endgroup::"
18+
19+
- name: Meson Log
2020
shell: bash
21-
run:
22-
python tools/check_installed_files.py $(find ./build-install -path '*/site-packages/numpy')
21+
if: always()
22+
run: |
23+
echo "::group::Meson Log"
24+
cat build/meson-logs/meson-log.txt
25+
echo "::endgroup::"
26+
2327
- name: Test
2428
shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
2529
env:
2630
TERM: xterm-256color
2731
run: |
28-
pip install pytest pytest-xdist hypothesis typing_extensions
29-
spin test -j auto
32+
echo "::group::Installing Test Dependencies"
33+
pip install pytest pytest-xdist hypothesis typing_extensions setuptools
34+
echo "::endgroup::"
35+
echo "::group::Test NumPy"
36+
spin test
37+
echo "::endgroup::"

0 commit comments

Comments
 (0)