Skip to content

Commit

Permalink
Merge branch 'main' into dict_cmap_imagestack
Browse files Browse the repository at this point in the history
  • Loading branch information
ahuang11 committed Mar 15, 2024
2 parents 9d604c3 + 3b4a214 commit e2ff78d
Show file tree
Hide file tree
Showing 85 changed files with 2,665 additions and 1,720 deletions.
2 changes: 1 addition & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ changelog:
- "type: compatibility"
- title: Documentation
labels:
- "type: doc"
- "type: docs"
- title: Maintenance
labels:
- "type: maintenance"
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: packages
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+a[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+b[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+a[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+b[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
# Dry-run only
workflow_dispatch:
schedule:
- cron: '0 14 * * SUN'
- cron: "0 14 * * SUN"

jobs:
conda_build:
name: Build Conda Packages
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz --label=dev --label=main $FILE
pip_build:
name: Build PyPI Packages
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
defaults:
run:
shell: bash -l {0}
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ name: docs
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+a[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+b[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+a[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+b[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
workflow_dispatch:
inputs:
target:
description: 'Site to build and deploy, or dry-run'
description: "Site to build and deploy, or dry-run"
type: choice
options:
- dev
- main
- dryrun
- dev
- main
- dryrun
required: true
default: dryrun
schedule:
- cron: '0 14 * * SUN'
- cron: "0 14 * * SUN"

jobs:
build_docs:
name: Documentation
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
timeout-minutes: 120
defaults:
run:
Expand All @@ -44,18 +44,18 @@ jobs:
with:
name: Documentation
python-version: "3.10"
channel-priority: strict
channel-priority: flexible
channels: pyviz/label/dev,conda-forge,nodefaults
envs: "-o doc"
cache: true
conda-update: true
- name: Set output
id: vars
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- name: bokeh sampledata
- name: Download data
run: |
conda activate test-environment
bokeh sampledata
bash scripts/download_data.sh
- name: generate rst
run: |
conda activate test-environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/downstream_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
downstream_tests:
uses: holoviz-dev/holoviz_tasks/.github/workflows/run_downstream_tests.yaml@main
with:
downstream_repos_as_json: "{\"downstream_repo\":[\"hvplot\", \"geoviews\"]}"
downstream_repos_as_json: '{"downstream_repo":["hvplot", "geoviews"]}'
secrets:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
Loading

0 comments on commit e2ff78d

Please sign in to comment.