Skip to content

Commit dd2b383

Browse files
Change order of Python setup
1 parent 160fea5 commit dd2b383

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/integration_tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ jobs:
2323
with:
2424
submodules: 'recursive'
2525

26-
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v5
28-
with:
29-
python-version: ${{ matrix.python-version }}
30-
31-
- name: Install dependencies (MacOs)
26+
- name: Install dependencies (macOS)
3227
env:
3328
HOMEBREW_NO_INSTALL_CLEANUP: 1
3429
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -39,20 +34,25 @@ jobs:
3934
brew install libomp
4035
brew reinstall gcc
4136
37+
- name: Set up Python ${{ matrix.python-version }}
38+
uses: actions/setup-python@v5
39+
with:
40+
python-version: ${{ matrix.python-version }}
41+
4242
- name: Build and test
4343
run: |
4444
cd ..
4545
git clone https://github.com/pybamm-team/PyBaMM.git
4646
# Install PyBaMM
4747
cd PyBaMM
4848
pip install -e ".[all,dev,jax]"
49-
49+
5050
# Replace PyBaMM solvers
5151
cd ../pybammsolvers
5252
pip uninstall pybammsolvers --yes
5353
python install_KLU_Sundials.py
5454
pip install .
55-
55+
5656
# Run pybamm tests
5757
cd ../PyBaMM
5858
pytest tests/unit

.github/workflows/unit_tests.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,9 @@ jobs:
2323
with:
2424
submodules: 'recursive'
2525

26-
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v5
28-
with:
29-
python-version: ${{ matrix.python-version }}
30-
3126
- name: Install dependencies (Linux)
3227
if: matrix.os == 'ubuntu-latest'
33-
run: |
34-
sudo apt-get install gfortran gcc libopenblas-dev
35-
pip install nox
28+
run: sudo apt-get install gfortran gcc libopenblas-dev
3629

3730
- name: Install dependencies (MacOs)
3831
if: matrix.os == 'macos-13' || matrix.os == 'macos-latest'
@@ -45,6 +38,14 @@ jobs:
4538
brew analytics off
4639
brew install libomp
4740
brew reinstall gcc
41+
42+
- name: Set up Python ${{ matrix.python-version }}
43+
uses: actions/setup-python@v5
44+
with:
45+
python-version: ${{ matrix.python-version }}
46+
47+
- name: Install nox
48+
run: |
4849
pip install nox
4950
5051
- name: Build and test

0 commit comments

Comments
 (0)