Skip to content

Commit 156996d

Browse files
committed
CI: Update environment, install consistently
Needs matplotlib in environment Quiet complaints from conda about pip Add debug information to workflows
1 parent a41afe2 commit 156996d

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

.github/workflows/gh-pages.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
push: {branches: [main, master]}
55
pull_request: {branches: [main, master]}
66

7+
defaults:
8+
run:
9+
shell: bash -l {0}
10+
711
jobs:
812
build:
913
runs-on: ubuntu-latest
10-
strategy:
11-
matrix:
12-
python: [3.9]
1314
steps:
1415
- uses: actions/checkout@v3
1516
- name: Disable etelemetry
@@ -18,12 +19,12 @@ jobs:
1819
uses: conda-incubator/setup-miniconda@v2
1920
with:
2021
activate-environment: pydra-tutorial
21-
environment-file: etc/environment.yml
22-
python-version: ${{ matrix.python-version }}
23-
auto-activate-base: false
24-
run: conda activate pydra-tutorial
22+
environment-file: environment.yml
23+
- run: conda info
24+
- run: conda list
25+
- run: conda config --show
2526
- name: Install dependencies
26-
run: conda install -c conda-forge jupyter-book
27+
run: pip install jupyter-book
2728
- name: Build JupyterBook
2829
run: jb build -W jupyterbook
2930
- uses: peaceiris/actions-gh-pages@v3

.github/workflows/notebooks.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
defaults:
66
run:
7-
shell: bash
7+
shell: bash -l {0}
88

99
jobs:
1010
build:
@@ -16,17 +16,18 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Disable etelemetry
21-
run: echo "NO_ET=TRUE" >> $GITHUB_ENV
22-
- name: Set up Python ${{ matrix.python-version }}
23-
- uses: conda-incubator/setup-miniconda@v2
21+
run: echo "NO_ET=TRUE" >> $GITHUB_ENV
22+
- name: Active conda env pydra-tutorial
23+
uses: conda-incubator/setup-miniconda@v2
2424
with:
2525
activate-environment: pydra-tutorial
26-
environment-file: etc/environment.yml
26+
environment-file: environment.yml
2727
python-version: ${{ matrix.python-version }}
28-
auto-activate-base: false
29-
run: conda activate pydra-tutorial
28+
- run: conda info
29+
- run: conda list
30+
- run: conda config --show
3031
- name: Convert all md files to ipynb
3132
run: jupytext notebooks/*.md --to ipynb
3233
- name: Test notebooks with pytest

etc/environment.yml renamed to environment.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- datalad
76
- git-annex
7+
- pip
88
- pip:
9+
- datalad
910
- pydra
1011
- jupyter
1112
- jupyter_contrib_nbextensions
1213
- jupytext
1314
- jupyterlab
15+
- matplotlib
1416
- nbformat
1517
- nbval
1618
- nest_asyncio

0 commit comments

Comments
 (0)