Skip to content

Commit

Permalink
Merge branch 'main' into dx-min-docs
Browse files Browse the repository at this point in the history
# Conflicts:
#	plugins/plotly-express/docs/scatter.md
#	plugins/plotly-express/docs/sub-plots.md
  • Loading branch information
alexpeters1208 committed Jul 25, 2024
2 parents 4e4cc91 + 2dfbe0f commit 6ef84bc
Show file tree
Hide file tree
Showing 111 changed files with 4,259 additions and 1,574 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build-main-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:
check-make-docs:
runs-on: ubuntu-22.04
outputs:
files_exists: ${{ steps.check_files.outputs.files_exists }}
files_exists: ${{ steps.check_files.outputs.files_exists }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check file existence
id: check_files
uses: andstor/file-existence-action@v3
with:
files: "plugins/${{ inputs.package }}/make_docs.py"
files: 'plugins/${{ inputs.package }}/make_docs.py'

build-plugin:
if: needs.check-make-docs.outputs.files_exists == 'true'
Expand All @@ -37,5 +37,3 @@ jobs:
with:
package: ${{ inputs.package }}
version: 'main'


88 changes: 44 additions & 44 deletions .github/workflows/build-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,47 @@ on:
type: string

jobs:
build-python-package:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Check file existence
id: check_files
uses: andstor/file-existence-action@v3
with:
files: "plugins/${{ inputs.package }}/src/js/package.json"

- name: Setup Node
if: steps.check_files.outputs.files_exists == 'true'
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install npm dependencies
if: steps.check_files.outputs.files_exists == 'true'
run: npm ci

- name: Build npm packages
if: steps.check_files.outputs.files_exists == 'true'
run: npm run build -- --scope "@deephaven/js-plugin-${{ inputs.package }}"

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install build dependencies
run: python -m pip install --upgrade setuptools wheel build

- name: Build wheel
run: python -m build --wheel --sdist plugins/${{ inputs.package }}

- name: Upload dist
uses: actions/upload-artifact@v3
with:
name: dist-${{ inputs.package }}
path: plugins/${{ inputs.package }}/dist/
if-no-files-found: error
build-python-package:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Check file existence
id: check_files
uses: andstor/file-existence-action@v3
with:
files: 'plugins/${{ inputs.package }}/src/js/package.json'

- name: Setup Node
if: steps.check_files.outputs.files_exists == 'true'
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install npm dependencies
if: steps.check_files.outputs.files_exists == 'true'
run: npm ci

- name: Build npm packages
if: steps.check_files.outputs.files_exists == 'true'
run: npm run build -- --scope "@deephaven/js-plugin-${{ inputs.package }}"

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install build dependencies
run: python -m pip install --upgrade setuptools wheel build

- name: Build wheel
run: python -m build --wheel --sdist plugins/${{ inputs.package }}

- name: Upload dist
uses: actions/upload-artifact@v3
with:
name: dist-${{ inputs.package }}
path: plugins/${{ inputs.package }}/dist/
if-no-files-found: error
11 changes: 5 additions & 6 deletions .github/workflows/make-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# assume that the dist artifact is already available from calling build-python-package.yml before this workflow
- name: Download dist
Expand All @@ -25,7 +25,7 @@ jobs:
path: plugins/${{ inputs.package }}/dist/

- name: Install requirements
run: pip install -r plugins/${{ inputs.package }}/sphinx-requirements.txt
run: pip install -r sphinx_ext/sphinx-requirements.txt

- name: Install wheel
run: pip install plugins/${{ inputs.package }}/dist/*.whl
Expand All @@ -37,10 +37,10 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y rclone
mkdir -p $HOME/.config
mkdir -p $HOME/.config/rclone
cat << EOF > $HOME/.config/rclone/rclone.conf
[plugindocs]
type = s3
Expand All @@ -51,7 +51,6 @@ jobs:
no_check_bucket = true
acl = private
EOF
- name: Sync docs
run: rclone sync plugins/${{ inputs.package }}/docs/build/markdown/ plugindocs:website/deephaven/deephaven-plugins/${{ inputs.package }}/${{ inputs.version }}/
run: rclone sync plugins/${{ inputs.package }}/docs/build/markdown/ plugindocs:website/deephaven/deephaven-plugins/${{ inputs.package }}/${{ inputs.version }}/
9 changes: 3 additions & 6 deletions .github/workflows/modified-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
- 'release/**'
tags:
- 'plotly-express-v*'
- 'plotly-v*'
- 'matplotlib-v*'
- 'json-v*'
- 'ui-v*'
Expand All @@ -27,7 +26,7 @@ jobs:
packages: ${{ steps.filter.outputs.changes }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Filter paths
uses: dorny/paths-filter@v2
id: filter
Expand All @@ -37,9 +36,6 @@ jobs:
- plugins/plotly-express/**
- .github/workflows/test-*.yml
- sphinx_ext/*
plotly:
- plugins/plotly/**
- .github/workflows/test-*.yml
matplotlib:
- plugins/matplotlib/**
- .github/workflows/test-*.yml
Expand All @@ -49,6 +45,7 @@ jobs:
ui:
- plugins/ui/**
- .github/workflows/test-*.yml
- sphinx_ext/*
utilities:
- plugins/utilities/**
- .github/workflows/test-*.yml
Expand Down Expand Up @@ -114,4 +111,4 @@ jobs:
uses: ./.github/workflows/build-main-docs.yml
secrets: inherit
with:
package: ${{ matrix.package }}
package: ${{ matrix.package }}
14 changes: 12 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
name: Pre-commit for Black and Blacken-docs

on: [push, pull_request]
on:
push:
branches:
- main
- 'release/**'
- 'feature/**'
pull_request:
branches:
- main
- 'release/**'
- 'feature/**'

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
4 changes: 3 additions & 1 deletion .github/workflows/publish-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ jobs:
permissions:
contents: read
packages: write
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0' # Need the history to properly select the canary version number
ref: ${{ github.event.inputs.ref }}
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'
cache: 'npm'
- name: Install dependencies
run: npm ci
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ jobs:
permissions:
contents: read
packages: write
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'
cache: 'npm'
- name: Install dependencies
run: npm ci
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
version: ${{ steps.extract_version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download dist
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -60,20 +60,20 @@ jobs:
check-make-docs:
runs-on: ubuntu-22.04
outputs:
files_exists: ${{ steps.check_files.outputs.files_exists }}
files_exists: ${{ steps.check_files.outputs.files_exists }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check file existence
id: check_files
uses: andstor/file-existence-action@v3
with:
files: "plugins/${{ inputs.package }}/make_docs.py"
files: 'plugins/${{ inputs.package }}/make_docs.py'

release-docs:
if: needs.check-make-docs.outputs.files_exists == 'true'
needs:
needs:
- release
- check-make-docs
uses: ./.github/workflows/make-docs.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
provenance=true
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
rev: v1.1.334
hooks:
- id: pyright
files: (plugins\/.*\/src|sphinx_ext)\/.*\.py
files: ((plugins\/.*\/src|sphinx_ext)\/.*\.py)|plugin_builder.py
additional_dependencies:
[
pandas,
Expand All @@ -25,6 +25,7 @@ repos:
matplotlib,
deephaven-plugin-utilities,
sphinx,
click
]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.2
Expand Down
Loading

0 comments on commit 6ef84bc

Please sign in to comment.