Skip to content

Commit 31ae91d

Browse files
authored
Merge pull request #514 from martinRenou/fixup_ci
Fixup CI
2 parents dcae90f + bd42ad6 commit 31ae91d

File tree

7 files changed

+386
-325
lines changed

7 files changed

+386
-325
lines changed

.github/workflows/docs.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ jobs:
1111
runs-on: ubuntu-20.04
1212
steps:
1313
- uses: actions/checkout@v2
14-
- name: Setup conda
15-
uses: conda-incubator/setup-miniconda@v2
14+
- name: Install Conda environment with Micromamba
15+
uses: mamba-org/provision-with-micromamba@main
1616
with:
17-
activate-environment: ipympl-dev
17+
environment-name: ipympl-dev
1818
environment-file: dev-environment.yml
19-
python-version: ${{ matrix.python-version }}
20-
mamba-version: "*"
21-
auto-activate-base: false
2219
channels: conda-forge
2320
- name: Install
2421
run: python -m pip install -v .[docs]

.github/workflows/main.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@ jobs:
2222
- name: Checkout
2323
uses: actions/checkout@v2
2424

25-
- name: Setup conda
26-
uses: conda-incubator/setup-miniconda@v2
25+
- name: Install Conda environment with Micromamba
26+
uses: mamba-org/provision-with-micromamba@main
2727
with:
28-
activate-environment: ipympl-dev
28+
environment-name: ipympl-dev
2929
environment-file: dev-environment.yml
30-
python-version: ${{ matrix.python-version }}
31-
mamba-version: "*"
32-
auto-activate-base: false
3330
channels: conda-forge
3431

3532
- name: Build packages
@@ -64,24 +61,22 @@ jobs:
6461
- name: Checkout
6562
uses: actions/checkout@v2
6663

67-
- name: Setup conda
68-
uses: conda-incubator/setup-miniconda@v2
64+
- name: Install Conda environment with Micromamba
65+
uses: mamba-org/provision-with-micromamba@main
6966
with:
70-
python-version: ${{ matrix.python-version }}
71-
mamba-version: "*"
72-
auto-activate-base: false
67+
environment-name: ipympl-dev
68+
environment-file: dev-environment.yml
7369
channels: conda-forge
74-
75-
- name: Install dependencies
76-
run: mamba install python=${{ matrix.python-version }} pip yarn nodejs=16 jupyterlab jupyter-packaging nbval pytest ipywidgets
70+
extra-specs: |
71+
python=${{ matrix.python }}
7772
7873
- if: matrix.mpl-version == 'latest'
7974
name: Install latest Matplotlib
8075
run: pip install --upgrade --pre --index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple --extra-index-url https://pypi.org/simple matplotlib
8176

8277
- if: matrix.mpl-version != 'latest'
8378
name: Install matplotlib pinned
84-
run: mamba install matplotlib=${{ matrix.mpl-version}}.*
79+
run: micromamba install matplotlib=${{ matrix.mpl-version}}.*
8580

8681
- uses: actions/download-artifact@v2
8782
with:

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ jobs:
1010

1111
- uses: actions/checkout@v2
1212

13-
- name: Setup conda
14-
uses: conda-incubator/setup-miniconda@v2
13+
- name: Install Conda environment with Micromamba
14+
uses: mamba-org/provision-with-micromamba@main
1515
with:
16-
mamba-version: "*"
1716
channels: conda-forge
1817

1918
- name: Install dependencies

.github/workflows/update_galata_references.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434

35-
- name: Setup conda
36-
uses: conda-incubator/setup-miniconda@v2
35+
- name: Install Conda environment with Micromamba
36+
uses: mamba-org/provision-with-micromamba@main
3737
with:
38-
activate-environment: ipympl-dev
38+
environment-name: ipympl-dev
3939
environment-file: dev-environment.yml
4040
python-version: 3.9
41-
mamba-version: "*"
4241
auto-activate-base: false
4342
channels: conda-forge
4443

ui-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"author": "ipympl",
1515
"license": "Apache-2.0",
1616
"dependencies": {
17-
"@jupyterlab/galata": "^4.3.5",
17+
"@jupyterlab/galata": "~4.5.0",
1818
"klaw-sync": "^6.0.0",
1919
"rimraf": "^3.0.2"
2020
}

ui-tests/tests/ipympl.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ const testCellOutputs = async (
5252

5353
for (let c = 0; c < numCellImages; ++c) {
5454
expect(results[c]).toMatchSnapshot(
55-
getCaptureImageName(notebook, c)
55+
getCaptureImageName(notebook, c),
56+
{ threshold: 0.4 }
5657
);
5758
}
5859

@@ -94,7 +95,8 @@ const testUpdates = async (page: IJupyterLabPageFixture, tmpPath: string) => {
9495

9596
for (let i = 0; i < cellCount; i++) {
9697
expect(results[i]).toMatchSnapshot(
97-
getCaptureImageName(notebook, i)
98+
getCaptureImageName(notebook, i),
99+
{ threshold: 0.4 }
98100
);
99101
}
100102

0 commit comments

Comments
 (0)