Skip to content

Commit 03508bb

Browse files
authored
Update yarn packages and fix CI (#21)
* Update yarn packages * Update actions * More actions update * Update environment * Update * Up * Up bot
1 parent 477da9d commit 03508bb

File tree

9 files changed

+5885
-4070
lines changed

9 files changed

+5885
-4070
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ jobs:
1919
steps:
2020

2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323

24-
- name: Install Conda environment with Micromamba
25-
uses: mamba-org/provision-with-micromamba@main
24+
- name: Setup conda
25+
uses: mamba-org/setup-micromamba@main
2626
with:
27-
environment-name: bqplot-gl-test
2827
environment-file: test-environment.yml
29-
channels: conda-forge
3028

3129
- name: Install bqplot
3230
run: pip install --pre bqplot
@@ -43,9 +41,6 @@ jobs:
4341
test -f $CONDA_PREFIX/share/jupyter/labextensions/bqplot-gl/package.json
4442
test -d $CONDA_PREFIX/share/jupyter/labextensions/bqplot-gl/static
4543
46-
- name: Validate the nbextension
47-
run: jupyter nbextension list 2>&1 | grep "bqplot-gl/extension"
48-
4944
- name: Validate the labextension
5045
run: jupyter labextension list 2>&1 | grep bqplot-gl
5146

@@ -59,7 +54,7 @@ jobs:
5954
run: python -m build
6055

6156
- name: Upload builds
62-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v5
6358
with:
6459
name: dist ${{ github.run_number }}
6560
path: ./dist
@@ -74,16 +69,14 @@ jobs:
7469
steps:
7570

7671
- name: Checkout
77-
uses: actions/checkout@v2
72+
uses: actions/checkout@v4
7873

79-
- name: Install Conda environment with Micromamba
80-
uses: mamba-org/provision-with-micromamba@main
74+
- name: Setup conda
75+
uses: mamba-org/setup-micromamba@main
8176
with:
82-
environment-name: bqplot-gl-test
8377
environment-file: test-environment.yml
84-
channels: conda-forge
8578

86-
- uses: actions/download-artifact@v2
79+
- uses: actions/download-artifact@v4
8780
with:
8881
name: dist ${{ github.run_number }}
8982
path: ./dist
@@ -119,7 +112,7 @@ jobs:
119112

120113
- name: Upload Playwright Test report
121114
if: always()
122-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v5
123116
with:
124117
name: bqplot-playwright-tests
125118
path: |

.github/workflows/update_galata_references.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,34 @@ defaults:
1515
jobs:
1616
update-reference-screenshots:
1717
name: Update Galata References
18-
if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'update galata references') }}
18+
if: >
19+
(
20+
github.event.issue.author_association == 'OWNER' ||
21+
github.event.issue.author_association == 'COLLABORATOR' ||
22+
github.event.issue.author_association == 'MEMBER'
23+
) && github.event.issue.pull_request && contains(github.event.comment.body, 'please update snapshots')
1924
runs-on: ubuntu-latest
2025

2126
steps:
2227
- name: Checkout
23-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2429
with:
2530
token: ${{ secrets.GITHUB_TOKEN }}
2631

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

35+
- name: Install hub
36+
run: sudo apt-get update && sudo apt-get install -y hub
37+
3038
- name: Checkout the branch from the PR that triggered the job
3139
run: hub pr checkout ${{ github.event.issue.number }}
3240
env:
3341
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3442

3543
- name: Install Conda environment with Micromamba
36-
uses: mamba-org/provision-with-micromamba@main
44+
uses: mamba-org/setup-micromamba@main
3745
with:
38-
environment-name: bqplot-test
3946
environment-file: test-environment.yml
4047
channels: conda-forge
4148

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,5 @@ bqplot_gl/labextension
158158
ui-tests/test-output/*
159159
ui-tests/test-results/*
160160
ui-tests/playwright-report/*
161+
162+
.yarn

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"source-map-loader": "^1.1.3",
8686
"style-loader": "^1.0.0",
8787
"ts-loader": "^8.0.0",
88-
"typescript": "~4.1.3",
88+
"typescript": "~5",
8989
"webpack": "^5.61.0",
9090
"webpack-cli": "^4.0.0"
9191
},

src/ScatterGLView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16-
import { ColorScale } from 'bqscales';
16+
import type { ColorScale } from 'bqscales';
1717
import { Mark, symbol as bqSymbol, deepCopy, Scale } from 'bqplot';
1818
import * as d3 from 'd3';
1919
import * as _ from 'underscore';

test-environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ channels:
33
- conda-forge
44
dependencies:
55
- pip
6-
- python=3.11
7-
- build
6+
- python
7+
- python-build
88
- yarn
99
- ipywidgets
1010
- traitlets
@@ -14,7 +14,7 @@ dependencies:
1414
- bqscales>=0.3.2
1515
- scipy
1616
- notebook
17-
- jupyterlab=4 # to build the lab federated bundle
17+
- jupyterlab
1818
- jupyter-packaging # to build the wheel
1919
- pytest
2020
- nbval

ui-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "bqplot",
1313
"license": "Apache-2.0",
1414
"devDependencies": {
15-
"@jupyterlab/galata": "^5.0.1",
15+
"@jupyterlab/galata": "^5",
1616
"@playwright/test": "^1.32.0"
1717
},
1818
"dependencies": {

0 commit comments

Comments
 (0)