Skip to content

Commit 501e49c

Browse files
committed
Merge origin/main
2 parents 3b5f675 + 174aac0 commit 501e49c

File tree

696 files changed

+32035
-9744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

696 files changed

+32035
-9744
lines changed

.github/workflows/build.yaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
defaults:
1515
run:
16-
shell: bash -el {0}
16+
shell: bash -e {0}
1717

1818
env:
1919
PACKAGE: "panel"
@@ -35,14 +35,14 @@ jobs:
3535
name: Pixi lock
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
38+
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
3939

4040
conda_build:
4141
name: Build Conda
4242
needs: [pixi_lock]
4343
runs-on: "ubuntu-latest"
4444
steps:
45-
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
45+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
4646
with:
4747
environments: "build"
4848
install: false
@@ -55,12 +55,17 @@ jobs:
5555
name: conda
5656
path: dist/*tar.bz2
5757
if-no-files-found: error
58+
- name: Verify size
59+
run: python scripts/verify_build_size.py conda
5860

5961
conda_publish:
6062
name: Publish Conda
6163
runs-on: ubuntu-latest
6264
needs: [conda_build, waiting_room]
6365
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
66+
defaults:
67+
run:
68+
shell: bash -el {0}
6469
steps:
6570
- uses: actions/download-artifact@v4
6671
with:
@@ -73,6 +78,7 @@ jobs:
7378
- uses: conda-incubator/setup-miniconda@v3
7479
with:
7580
miniconda-version: "latest"
81+
channels: "conda-forge"
7682
- name: conda setup
7783
run: |
7884
conda install -y anaconda-client
@@ -90,7 +96,7 @@ jobs:
9096
needs: [pixi_lock]
9197
runs-on: "ubuntu-latest"
9298
steps:
93-
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
99+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
94100
with:
95101
environments: "build"
96102
install: false
@@ -103,6 +109,10 @@ jobs:
103109
name: pip
104110
path: dist/
105111
if-no-files-found: error
112+
- name: Verify sizes
113+
run: |
114+
python scripts/verify_build_size.py sdist
115+
python scripts/verify_build_size.py whl
106116
107117
pip_install:
108118
name: Install PyPI
@@ -119,7 +129,7 @@ jobs:
119129
- name: Install package
120130
run: python -m pip install dist/*.whl
121131
- name: Test package
122-
run: python -c "import $PACKAGE; print($PACKAGE.__version__)"
132+
run: python -c "import $PACKAGE; print($PACKAGE._version.__version__)"
123133

124134
pip_publish:
125135
name: Publish PyPI
@@ -143,7 +153,7 @@ jobs:
143153
needs: [pixi_lock]
144154
runs-on: "ubuntu-latest"
145155
steps:
146-
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
156+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
147157
with:
148158
environments: "build"
149159
download-data: false
@@ -162,6 +172,8 @@ jobs:
162172
name: npm
163173
if-no-files-found: error
164174
path: ./${{ env.PACKAGE }}/${{ env.TARBALL }}
175+
- name: Verify size
176+
run: python scripts/verify_build_size.py npm
165177

166178
npm_publish:
167179
name: Publish NPM
@@ -198,7 +210,7 @@ jobs:
198210
needs: [pixi_lock]
199211
runs-on: "ubuntu-latest"
200212
steps:
201-
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
213+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
202214
with:
203215
environments: "build"
204216
install: false

.github/workflows/docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323

2424
defaults:
2525
run:
26-
shell: bash -el {0}
26+
shell: bash -e {0}
2727

2828
env:
2929
DISPLAY: ":99.0"
@@ -33,7 +33,7 @@ jobs:
3333
name: Pixi lock
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
36+
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
3737

3838
docs_build:
3939
name: Build Documentation
@@ -43,7 +43,7 @@ jobs:
4343
outputs:
4444
tag: ${{ steps.vars.outputs.tag }}
4545
steps:
46-
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
46+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
4747
with:
4848
environments: docs
4949
opengl: true

.github/workflows/gallery.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
defaults:
2525
run:
26-
shell: bash -l {0}
26+
shell: bash -el {0}
2727
steps:
2828
- name: Checkout
2929
uses: actions/checkout@v3
@@ -35,9 +35,11 @@ jobs:
3535
python-version: '3.10'
3636
- name: Set and echo git ref
3737
id: vars
38+
env:
39+
HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }}
3840
run: |
39-
echo 'Deploying from ref ${{ github.event.workflow_run.head_branch }}'
40-
echo 'tag=${{ github.event.workflow_run.head_branch }}' >> $GITHUB_OUTPUT
41+
echo "Deploying from ref $HEAD_BRANCH"
42+
echo "tag=$HEAD_BRANCH" >> $GITHUB_OUTPUT
4143
- uses: conda-incubator/setup-miniconda@v2
4244
with:
4345
miniconda-version: "latest"

.github/workflows/jupyterlite.yaml

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,67 @@ name: jupyterlite
33
on:
44
push:
55
tags:
6-
- 'v[0-9]+.[0-9]+.[0-9]+'
7-
- 'v[0-9]+.[0-9]+.[0-9]+a[0-9]+'
8-
- 'v[0-9]+.[0-9]+.[0-9]+b[0-9]+'
9-
- 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
6+
- "v[0-9]+.[0-9]+.[0-9]+"
7+
- "v[0-9]+.[0-9]+.[0-9]+a[0-9]+"
8+
- "v[0-9]+.[0-9]+.[0-9]+b[0-9]+"
9+
- "v[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
1010
workflow_dispatch:
1111
inputs:
1212
target:
13-
description: 'Site to build and deploy'
13+
description: "Site to build and deploy"
1414
type: choice
1515
options:
16-
- dev
17-
- main
18-
- dryrun
16+
- dev
17+
- main
18+
- dryrun
1919
required: true
2020
default: dryrun
2121
schedule:
22-
- cron: '0 19 * * SUN'
22+
- cron: "0 19 * * SUN"
2323

2424
jobs:
25-
deploy_jupyterlite:
26-
name: JupyterLite
25+
pixi_lock:
26+
name: Pixi lock
2727
runs-on: ubuntu-latest
2828
steps:
29-
- name: Checkout
30-
uses: actions/checkout@v3
29+
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
30+
31+
lite_build:
32+
name: Build Jupyterlite
33+
needs: [pixi_lock]
34+
runs-on: "ubuntu-latest"
35+
steps:
36+
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
37+
with:
38+
environments: "lite"
39+
install: false
40+
download-data: false
41+
- name: lite build
42+
run: pixi run lite-build
43+
- uses: actions/upload-artifact@v4
44+
if: always()
3145
with:
32-
fetch-depth: 0
33-
- name: Setup Python
34-
uses: actions/setup-python@v4
46+
name: jupyterlite
47+
path: lite/dist/
48+
if-no-files-found: error
49+
50+
lite_publish:
51+
name: Publish Jupyterlite
52+
runs-on: ubuntu-latest
53+
needs: [lite_build]
54+
steps:
55+
- uses: actions/download-artifact@v4
3556
with:
36-
python-version: '3.10'
37-
- name: Set and echo git ref
57+
name: jupyterlite
58+
path: lite/dist/
59+
- name: Set output
3860
id: vars
39-
run: |
40-
echo 'Deploying from ref ${GITHUB_REF#refs/*/}'
41-
echo 'tag=${GITHUB_REF#refs/*/}' >> $GITHUB_OUTPUT
42-
- name: Install the dependencies
43-
run: |
44-
python -m pip install -r ./lite/requirements.txt
45-
- name: Build pyodide wheels for JupyterLite
46-
run: |
47-
python ./scripts/build_pyodide_wheels.py lite/pypi
48-
- name: Convert content
49-
run: |
50-
python ./scripts/panelite/generate_panelite_content.py
51-
- name: Build the JupyterLite site
52-
run: |
53-
jupyter lite build --lite-dir lite --output-dir lite/dist
61+
run: echo "tag=${{ needs.docs_build.outputs.tag }}" >> $GITHUB_OUTPUT
5462
- name: Upload dev
5563
if: |
5664
(github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'dev') ||
5765
(github.event_name == 'workflow_run' && (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
58-
uses: peaceiris/actions-gh-pages@v3
66+
uses: peaceiris/actions-gh-pages@v4
5967
with:
6068
personal_token: ${{ secrets.ACCESS_TOKEN }}
6169
external_repository: holoviz-dev/panelite-dev
@@ -65,7 +73,7 @@ jobs:
6573
if: |
6674
(github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'main') ||
6775
(github.event_name == 'push' && !(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
68-
uses: peaceiris/actions-gh-pages@v3
76+
uses: peaceiris/actions-gh-pages@v4
6977
with:
7078
personal_token: ${{ secrets.ACCESS_TOKEN }}
7179
external_repository: holoviz-dev/panelite

.github/workflows/nightly_lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ env:
99

1010
jobs:
1111
pixi_lock:
12+
if: ${{ !github.event.repository.fork }}
1213
name: Pixi lock
1314
runs-on: ubuntu-latest
1415
timeout-minutes: 5
1516
steps:
16-
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
17+
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
1718
- name: Upload lock-file to S3
18-
if: '!github.event.pull_request.head.repo.fork'
1919
env:
2020
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2121
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

0 commit comments

Comments
 (0)