Skip to content

Commit 6ab4077

Browse files
authored
Merge branch 'main' into internal-aroma
2 parents cd560d0 + b227029 commit 6ab4077

File tree

19 files changed

+267
-541
lines changed

19 files changed

+267
-541
lines changed

.github/workflows/pre-release.yml

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
name: Stable tests
1+
name: Tests
22

33
on:
44
push:
55
branches:
66
- main
77
- maint/*
8-
- next
98
pull_request:
109
branches:
1110
- main
1211
- maint/*
13-
- next
12+
# Allow job to be triggered manually from GitHub interface
13+
workflow_dispatch:
1414

1515
defaults:
1616
run:
1717
shell: bash
1818

19+
# Force tox and pytest to use color
20+
env:
21+
FORCE_COLOR: true
22+
1923
concurrency:
2024
group: ${{ github.workflow }}-${{ github.ref }}
2125
cancel-in-progress: true
@@ -31,42 +35,37 @@ jobs:
3135
matrix:
3236
os: ['ubuntu-latest']
3337
python-version: ['3.10', '3.11', '3.12']
34-
install: ['pip']
35-
check: ['tests']
36-
pip-flags: ['']
38+
dependencies: ['full', 'pre']
39+
include:
40+
- os: ubuntu-latest
41+
python-version: '3.10'
42+
dependencies: 'min'
43+
3744
env:
38-
INSTALL_TYPE: ${{ matrix.install }}
39-
CHECK_TYPE: ${{ matrix.check }}
40-
EXTRA_PIP_FLAGS: ${{ matrix.pip-flags }}
41-
OS_TYPE: ${{ matrix.os }}
45+
DEPENDS: ${{ matrix.dependencies }}
4246

4347
steps:
4448
- uses: actions/checkout@v4
4549
with:
4650
submodules: recursive
4751
fetch-depth: 0
48-
- name: Install dependencies
49-
run: .maint/ci/install_dependencies.sh
5052
- name: Set up Python ${{ matrix.python-version }}
5153
uses: actions/setup-python@v5
5254
with:
5355
python-version: ${{ matrix.python-version }}
56+
allow-prereleases: true
5457
- name: Display Python version
5558
run: python -c "import sys; print(sys.version)"
56-
- name: Create virtual environment
57-
run: .maint/ci/create_venv.sh
58-
- name: Build archive
59+
- name: Install tox
5960
run: |
60-
source .maint/ci/build_archive.sh
61-
echo "ARCHIVE=$ARCHIVE" >> $GITHUB_ENV
62-
- name: Install fMRIPost-AROMA
63-
run: .maint/ci/install.sh
64-
- name: Install extras
65-
run: .maint/ci/install_extras.sh
66-
- name: Run tests
67-
run: .maint/ci/check.sh
61+
python -m pip install --upgrade pip
62+
python -m pip install tox tox-gh-actions
63+
- name: Show tox config
64+
run: tox c
65+
- name: Run tox
66+
run: tox -v --exit-and-dump-after 1200
6867
- uses: codecov/codecov-action@v4
68+
if: ${{ always() }}
6969
with:
70-
file: coverage.xml
70+
files: cov.xml
7171
token: ${{ secrets.CODECOV_TOKEN }}
72-
if: ${{ always() }}

0 commit comments

Comments
 (0)