Skip to content

Commit

Permalink
Merge branch 'main' into acc-tree
Browse files Browse the repository at this point in the history
  • Loading branch information
trallard committed Sep 11, 2024
2 parents c133db0 + 80221a4 commit 24ff988
Show file tree
Hide file tree
Showing 28 changed files with 660 additions and 550 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
name: coverage-data-${{ matrix.python-version }}
path: .coverage
if-no-files-found: ignore
include-hidden-files: true

# Only run accessibility tests on the latest Python version (3.12) and Ubuntu
a11y-tests:
Expand Down Expand Up @@ -178,9 +179,11 @@ jobs:
runs: 3 # Multiple runs to reduce variance

coverage:
name: "check coverage"
name: "Check coverage"
needs: run-pytest
runs-on: ubuntu-latest
# avoid running this on schedule, releases, or workflow_call
if: github.event.workflow_run.event != 'schedule' && github.event.workflow_run.event != 'release' && github.event.workflow_run.event != 'workflow_call'
permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -221,8 +224,6 @@ jobs:
- name: "Coverage comment 💬"
uses: py-cov-action/python-coverage-comment-action@v3
id: coverage_comment
# avoid running this on schedule or releases
if: github.event.workflow_run.event != 'schedule' && github.event.workflow_run.event != 'release'
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
# calls our general CI workflow (tests, build docs, etc.)
tests:
uses: ./.github/workflows/CI.yml
# needed for the coverage action
permissions:
contents: write
pull-requests: write

build-package:
name: "Build & verify PST package"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ envs/
.nodeenv/
.yarn-packages
node_modules/
bun.lockb

# Editors
.vscode
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repos:
- id: black

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.5.6"
rev: "v0.6.3"
hooks:
- id: ruff

Expand All @@ -38,13 +38,13 @@ repos:
args: [--py37-plus]

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.34.1
rev: v1.35.2
hooks:
- id: djlint-jinja
types_or: ["html"]

- repo: https://github.com/PyCQA/doc8
rev: v1.1.1
rev: v1.1.2
hooks:
- id: doc8

Expand All @@ -59,7 +59,7 @@ repos:
- id: remove-metadata

- repo: https://github.com/thibaudcolas/pre-commit-stylelint
rev: v16.8.1
rev: v16.9.0
hooks:
- id: stylelint
# automatically fix .scss files where possible
Expand Down
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
from pathlib import Path
from typing import Any, Dict

import pydata_sphinx_theme
from sphinx.application import Sphinx
from sphinx.locale import _

import pydata_sphinx_theme

sys.path.append(str(Path(".").resolve()))

# -- Project information -----------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/pydata.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"metadata": {},
"outputs": [],
"source": [
"import pandas as pd\n",
"import numpy as np\n",
"import ipywidgets as widgets\n",
"import numpy as np\n",
"import pandas as pd\n",
"from IPython.display import display\n",
"\n",
"tab = widgets.Tab()\n",
Expand Down Expand Up @@ -122,9 +122,8 @@
"metadata": {},
"outputs": [],
"source": [
"import plotly.io as pio\n",
"import plotly.express as px\n",
"import plotly.offline as py\n",
"import plotly.io as pio\n",
"\n",
"pio.renderers.default = \"notebook\"\n",
"\n",
Expand All @@ -149,6 +148,7 @@
"outputs": [],
"source": [
"import xarray as xr\n",
"\n",
"data = xr.DataArray(\n",
" np.random.randn(2, 3),\n",
" dims=(\"x\", \"y\"),\n",
Expand Down
Loading

0 comments on commit 24ff988

Please sign in to comment.