Skip to content

Commit

Permalink
General maintenance (#7303)
Browse files Browse the repository at this point in the history
* Only install pre-commit

* Update pre-commit

* Move to bash -l instead of bash -el

* Update to holoviz_task to v0
  • Loading branch information
hoxbro authored Sep 20, 2024
1 parent a8ce24b commit 821aa4b
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

defaults:
run:
shell: bash -el {0}
shell: bash -l {0}

env:
PACKAGE: "panel"
Expand All @@ -35,14 +35,14 @@ jobs:
name: Pixi lock
runs-on: ubuntu-latest
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0

conda_build:
name: Build Conda
needs: [pixi_lock]
runs-on: "ubuntu-latest"
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: "build"
install: false
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
needs: [pixi_lock]
runs-on: "ubuntu-latest"
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: "build"
install: false
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
needs: [pixi_lock]
runs-on: "ubuntu-latest"
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: "build"
download-data: false
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
needs: [pixi_lock]
runs-on: "ubuntu-latest"
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: "build"
install: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:

defaults:
run:
shell: bash -el {0}
shell: bash -l {0}

env:
DISPLAY: ":99.0"
Expand All @@ -33,7 +33,7 @@ jobs:
name: Pixi lock
runs-on: ubuntu-latest
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0

docs_build:
name: Build Documentation
Expand All @@ -43,7 +43,7 @@ jobs:
outputs:
tag: ${{ steps.vars.outputs.tag }}
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: docs
opengl: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/jupyterlite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
name: Pixi lock
runs-on: ubuntu-latest
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0

lite_build:
name: Build Jupyterlite
needs: [pixi_lock]
runs-on: "ubuntu-latest"
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: "lite"
install: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
- name: Upload lock-file to S3
if: '!github.event.pull_request.head.repo.fork'
env:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ concurrency:

defaults:
run:
shell: bash -el {0}
shell: bash -l {0}

env:
DISPLAY: ":99.0"
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
name: Pixi lock
runs-on: ubuntu-latest
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_lock@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_lock@v0
with:
cache: ${{ github.event.inputs.cache == 'true' || github.event.inputs.cache == '' }}

Expand All @@ -139,7 +139,7 @@ jobs:
matrix: ${{ fromJson(needs.setup.outputs.matrix) }}
timeout-minutes: 90
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: ${{ matrix.environment }}
opengl: true
Expand Down Expand Up @@ -193,19 +193,19 @@ jobs:
OKTA_OAUTH_USER: ${{ secrets.OKTA_OAUTH_USER }}
OKTA_OAUTH_PASSWORD: ${{ secrets.OKTA_OAUTH_PASSWORD }}
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: ${{ matrix.environment }}
id: install
- name: Build pyodide wheels
run: pixi run -e test-ui "python ./scripts/build_pyodide_wheels.py"
- name: Launch JupyterLab
shell: pixi run -e test-ui bash -el {0}
shell: pixi run -e test-ui bash -l {0}
run: |
jupyter server extension enable panel.io.jupyter_server_extension --sys-prefix
(jupyter lab --config panel/tests/ui/jupyter_server_test_config.py --port 8887 > /tmp/jupyterlab_server.log 2>&1) &
- name: Build JupyterLite
shell: pixi run -e test-ui bash -el {0}
shell: pixi run -e test-ui bash -l {0}
run: pixi run -e lite lite-build
- name: Wait for JupyterLab
uses: ifaxity/[email protected]
Expand All @@ -227,7 +227,7 @@ jobs:
if-no-files-found: ignore
- name: Stop JupyterLab
if: always()
shell: pixi run -e test-ui bash -el {0}
shell: pixi run -e test-ui bash -l {0}
run: |
jupyter lab stop 8887 || true
- uses: codecov/codecov-action@v4
Expand All @@ -246,7 +246,7 @@ jobs:
environment: ["test-core"]
timeout-minutes: 120
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: ${{ matrix.environment }}
- name: Test Unit
Expand All @@ -265,7 +265,7 @@ jobs:
environment: ["test-type"]
timeout-minutes: 120
steps:
- uses: holoviz-dev/holoviz_tasks/pixi_install@pixi
- uses: holoviz-dev/holoviz_tasks/pixi_install@v0
with:
environments: ${{ matrix.environment }}
- name: Test Type
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
exclude: \.min\.js$
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.4
rev: v0.6.6
hooks:
- id: ruff
files: panel/
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ pre-commit = "*"

[feature.lint.tasks]
lint = 'pre-commit run --all-files'
lint-install = 'pre-commit install'
lint-install = 'pre-commit install -t=pre-commit'

# =============================================
# =================== LITE ====================
Expand Down

0 comments on commit 821aa4b

Please sign in to comment.