Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup CI #514

Merged
merged 8 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
25 changes: 10 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/update_galata_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ui-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 4 additions & 2 deletions ui-tests/tests/ipympl.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
);
}

Expand Down Expand Up @@ -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 }
);
}

Expand Down
Loading