From f737ec0f52d22327288d93938b16c2ee5435e181 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 27 Jan 2023 16:22:21 +0100 Subject: [PATCH 1/3] Update CI --- .github/workflows/build.yml | 45 +++++++++++-------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8ccbd94f..b121fdea6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,14 +21,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: bqplot-test + environment-name: bqplot-test environment-file: test-environment.yml - python-version: ${{ matrix.python-version }} - mamba-version: "*" - auto-activate-base: false channels: conda-forge - name: Install the package @@ -95,14 +92,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: bqplot-test + environment-name: bqplot-test environment-file: test-environment.yml - python-version: 3.9 - mamba-version: "*" - auto-activate-base: false channels: conda-forge - uses: actions/download-artifact@v2 @@ -151,26 +145,18 @@ jobs: fail-fast: false matrix: os: [ubuntu, macos, windows] - python: ['3.6', '3.9'] - include: - - python: '3.6' - dist: 'bqplot*.tar.gz' - - python: '3.9' - dist: 'bqplot*.whl' + dist: ['bqplot*.tar.gz', 'bqplot*.whl'] steps: - 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: bqplot-test + environment-name: bqplot-test environment-file: test-environment.yml - python-version: ${{ matrix.python-version }} - mamba-version: "*" - auto-activate-base: false channels: conda-forge - uses: actions/download-artifact@v2 @@ -199,25 +185,20 @@ jobs: run: jupyter labextension list 2>&1 | grep bqplot JupyterLab2-build: - runs-on: ${{ matrix.os }}-latest + runs-on: ubuntu-latest needs: [build] strategy: fail-fast: false - matrix: - os: [ubuntu] - python: ['3.9'] steps: - 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: "*" channels: conda-forge - uses: actions/download-artifact@v2 From 6513803ead9c5d8db219d289c4aeb3c3da399352 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 27 Jan 2023 16:23:23 +0100 Subject: [PATCH 2/3] Update galata bot --- .github/workflows/update_galata_references.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update_galata_references.yaml b/.github/workflows/update_galata_references.yaml index c8101d44a..ef50f12c9 100644 --- a/.github/workflows/update_galata_references.yaml +++ b/.github/workflows/update_galata_references.yaml @@ -32,14 +32,11 @@ 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: bqplot-test + environment-name: bqplot-test environment-file: test-environment.yml - python-version: 3.9 - mamba-version: "*" - auto-activate-base: false channels: conda-forge - name: Install bqplot From 7cde1c42ec8ae5244a63617ba47862ad268867e7 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 27 Jan 2023 16:52:13 +0100 Subject: [PATCH 3/3] Fix JLab 2 build environment --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b121fdea6..013242723 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -199,16 +199,17 @@ jobs: - name: Install Conda environment with Micromamba uses: mamba-org/provision-with-micromamba@main with: + environment-name: bqplot-test + environment-file: test-environment.yml channels: conda-forge + extra-specs: | + jupyterlab=2 - uses: actions/download-artifact@v2 with: name: dist ${{ github.run_number }} path: ./dist - - name: Install JupyterLab 2 - run: mamba install yarn jupyterlab=2 - - name: Install the labextension env: NODE_OPTIONS: --openssl-legacy-provider