Merge pull request #514 from martinRenou/fixup_ci

Fixup CI
matplotlib · Feb 15, 2023 · 31ae91d · 31ae91d
2 parents dcae90f + bd42ad6
commit 31ae91d
Show file tree

Hide file tree

Showing 7 changed files with 386 additions and 325 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -11,14 +11,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install Conda environment with Micromamba
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          activate-environment: ipympl-dev
+          environment-name: ipympl-dev
           environment-file: dev-environment.yml
-          python-version: ${{ matrix.python-version }}
-          mamba-version: "*"
-          auto-activate-base: false
           channels: conda-forge
       - name: Install
         run: python -m pip install -v .[docs]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,14 +22,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Setup conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Install Conda environment with Micromamba
+      uses: mamba-org/provision-with-micromamba@main
       with:
-        activate-environment: ipympl-dev
+        environment-name: ipympl-dev
         environment-file: dev-environment.yml
-        python-version: ${{ matrix.python-version }}
-        mamba-version: "*"
-        auto-activate-base: false
         channels: conda-forge
 
     - name: Build packages
@@ -64,24 +61,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install Conda environment with Micromamba
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          python-version: ${{ matrix.python-version }}
-          mamba-version: "*"
-          auto-activate-base: false
+          environment-name: ipympl-dev
+          environment-file: dev-environment.yml
           channels: conda-forge
-
-      - name: Install dependencies
-        run: mamba install python=${{ matrix.python-version }} pip yarn nodejs=16 jupyterlab jupyter-packaging nbval pytest ipywidgets
+          extra-specs: |
+            python=${{ matrix.python }}
 
       - if: matrix.mpl-version == 'latest'
         name: Install latest Matplotlib
         run: pip install --upgrade --pre --index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple --extra-index-url https://pypi.org/simple matplotlib
 
       - if: matrix.mpl-version != 'latest'
         name: Install matplotlib pinned
-        run: mamba install matplotlib=${{ matrix.mpl-version}}.*
+        run: micromamba install matplotlib=${{ matrix.mpl-version}}.*
 
       - uses: actions/download-artifact@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,10 +10,9 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - name: Setup conda
-      uses: conda-incubator/setup-miniconda@v2
+    - name: Install Conda environment with Micromamba
+      uses: mamba-org/provision-with-micromamba@main
       with:
-        mamba-version: "*"
         channels: conda-forge
 
     - name: Install dependencies

diff --git a/.github/workflows/update_galata_references.yaml b/.github/workflows/update_galata_references.yaml
@@ -32,13 +32,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup conda
-        uses: conda-incubator/setup-miniconda@v2
+      - name: Install Conda environment with Micromamba
+        uses: mamba-org/provision-with-micromamba@main
         with:
-          activate-environment: ipympl-dev
+          environment-name: ipympl-dev
           environment-file: dev-environment.yml
           python-version: 3.9
-          mamba-version: "*"
           auto-activate-base: false
           channels: conda-forge
 

diff --git a/ui-tests/package.json b/ui-tests/package.json
@@ -14,7 +14,7 @@
   "author": "ipympl",
   "license": "Apache-2.0",
   "dependencies": {
-    "@jupyterlab/galata": "^4.3.5",
+    "@jupyterlab/galata": "~4.5.0",
     "klaw-sync": "^6.0.0",
     "rimraf": "^3.0.2"
   }

diff --git a/ui-tests/tests/ipympl.test.ts b/ui-tests/tests/ipympl.test.ts
@@ -52,7 +52,8 @@ const testCellOutputs = async (
 
         for (let c = 0; c < numCellImages; ++c) {
             expect(results[c]).toMatchSnapshot(
-                getCaptureImageName(notebook, c)
+                getCaptureImageName(notebook, c),
+                { threshold: 0.4 }
             );
         }
 
@@ -94,7 +95,8 @@ const testUpdates = async (page: IJupyterLabPageFixture, tmpPath: string) => {
 
         for (let i = 0; i < cellCount; i++) {
             expect(results[i]).toMatchSnapshot(
-                getCaptureImageName(notebook, i)
+                getCaptureImageName(notebook, i),
+                { threshold: 0.4 }
             );
         }