Skip to content
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
25 changes: 9 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
- name: Setup conda
uses: mamba-org/setup-micromamba@main
with:
environment-name: bqplot-gl-test
environment-file: test-environment.yml
channels: conda-forge

- name: Install bqplot
run: pip install --pre bqplot
Expand All @@ -43,9 +41,6 @@ jobs:
test -f $CONDA_PREFIX/share/jupyter/labextensions/bqplot-gl/package.json
test -d $CONDA_PREFIX/share/jupyter/labextensions/bqplot-gl/static

- name: Validate the nbextension
run: jupyter nbextension list 2>&1 | grep "bqplot-gl/extension"

- name: Validate the labextension
run: jupyter labextension list 2>&1 | grep bqplot-gl

Expand All @@ -59,7 +54,7 @@ jobs:
run: python -m build

- name: Upload builds
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v5
with:
name: dist ${{ github.run_number }}
path: ./dist
Expand All @@ -74,16 +69,14 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
- name: Setup conda
uses: mamba-org/setup-micromamba@main
with:
environment-name: bqplot-gl-test
environment-file: test-environment.yml
channels: conda-forge

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: dist ${{ github.run_number }}
path: ./dist
Expand Down Expand Up @@ -119,7 +112,7 @@ jobs:

- name: Upload Playwright Test report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v5
with:
name: bqplot-playwright-tests
path: |
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/update_galata_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,34 @@ defaults:
jobs:
update-reference-screenshots:
name: Update Galata References
if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'update galata references') }}
if: >
(
github.event.issue.author_association == 'OWNER' ||
github.event.issue.author_association == 'COLLABORATOR' ||
github.event.issue.author_association == 'MEMBER'
) && github.event.issue.pull_request && contains(github.event.comment.body, 'please update snapshots')
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Configure git to use https
run: git config --global hub.protocol https

- name: Install hub
run: sudo apt-get update && sudo apt-get install -y hub

- name: Checkout the branch from the PR that triggered the job
run: hub pr checkout ${{ github.event.issue.number }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Conda environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
uses: mamba-org/setup-micromamba@main
with:
environment-name: bqplot-test
environment-file: test-environment.yml
channels: conda-forge

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,5 @@ bqplot_gl/labextension
ui-tests/test-output/*
ui-tests/test-results/*
ui-tests/playwright-report/*

.yarn
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"source-map-loader": "^1.1.3",
"style-loader": "^1.0.0",
"ts-loader": "^8.0.0",
"typescript": "~4.1.3",
"typescript": "~5",
"webpack": "^5.61.0",
"webpack-cli": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/ScatterGLView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the License.
*/

import { ColorScale } from 'bqscales';
import type { ColorScale } from 'bqscales';
import { Mark, symbol as bqSymbol, deepCopy, Scale } from 'bqplot';
import * as d3 from 'd3';
import * as _ from 'underscore';
Expand Down
6 changes: 3 additions & 3 deletions test-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ channels:
- conda-forge
dependencies:
- pip
- python=3.11
- build
- python
- python-build
- yarn
- ipywidgets
- traitlets
Expand All @@ -14,7 +14,7 @@ dependencies:
- bqscales>=0.3.2
- scipy
- notebook
- jupyterlab=4 # to build the lab federated bundle
- jupyterlab
- jupyter-packaging # to build the wheel
- pytest
- nbval
Expand Down
2 changes: 1 addition & 1 deletion ui-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "bqplot",
"license": "Apache-2.0",
"devDependencies": {
"@jupyterlab/galata": "^5.0.1",
"@jupyterlab/galata": "^5",
"@playwright/test": "^1.32.0"
},
"dependencies": {
Expand Down
Loading
Loading