Skip to content

Commit

Permalink
Merge branch 'main' into remove_depr_subplot_param
Browse files Browse the repository at this point in the history
  • Loading branch information
tsbinns authored Dec 9, 2024
2 parents 3b9edd2 + dec5ed5 commit 08b8393
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 6 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Bot auto-merge
on: pull_request # yamllint disable-line rule:truthy

permissions:
contents: write
pull-requests: write

jobs:
autobot:
runs-on: ubuntu-latest
if: (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'pre-commit-ci[bot]') && github.repository == 'mne-tools/mne-connectivity'
steps:
- name: Enable auto-merge for bot PRs
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/linux_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
name: 'Show infos'
- name: Run pytest
run: python -m pytest . --cov=mne_connectivity --cov-report=xml --cov-config=pyproject.toml --verbose --ignore mne-python
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ jobs:
- run: pip install -e .
- run: mne sys_info
- run: python -m pytest . --cov=mne_connectivity --cov-report=xml --cov-config=pyproject.toml --verbose --ignore mne-python
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
# Ruff mne_connectivity
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.3
rev: v0.8.1
hooks:
- id: ruff
name: ruff lint mne_connectivity
Expand All @@ -10,7 +10,7 @@ repos:

# Ruff tutorials and examples
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.3
rev: v0.8.1
hooks:
- id: ruff
name: ruff lint tutorials and examples
Expand Down Expand Up @@ -47,7 +47,7 @@ repos:

# toml-sort
- repo: https://github.com/pappasam/toml-sort.git
rev: v0.23.1
rev: v0.24.2
hooks:
- id: toml-sort-fix

Expand Down
12 changes: 12 additions & 0 deletions doc/_static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,15 @@ div.sphx-glr-download a {
div.sphx-glr-download a code {
color: var(--sg-download-a-color);
}
/* ************************************************* truncate version string */
div.navbar-item:first-child {
overflow-x: hidden;
}
a.navbar-brand.logo {
flex-shrink: 1;
overflow-x: hidden;
}
p.logo__title {
overflow-x: hidden;
text-overflow: ellipsis;
}
2 changes: 1 addition & 1 deletion mne_connectivity/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
try:
from importlib.metadata import version

__version__ = version("mne")
__version__ = version("mne_connectivity")
except Exception:
__version__ = "0.0.0"

Expand Down

0 comments on commit 08b8393

Please sign in to comment.