Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into kernel
Browse files Browse the repository at this point in the history
* upstream/main: (117 commits)
  FIX: missing channels/fiducials can be np.nan (mne-tools#11634)
  use py3.10 in precommit config (mne-tools#11648)
  MAINT: Unify GH Actions pytest (mne-tools#11644)
  MRG: Rename "Discourse" link in top navigation to "Forum" [ci skip] (mne-tools#11649)
  ENH: Add support for Harmonic Field correction (mne-tools#11536)
  Add pre-commit (mne-tools#11541)
  BUG: Fix bug with paths (mne-tools#11639)
  MAINT: Report download time and size (mne-tools#11635)
  MRG: Allow retrieval of channel names via make_1020_channel_selections() (mne-tools#11632)
  Fix index name in to_data_frame()'s docstring (mne-tools#11457)
  MAINT: Use VTK prerelease wheels in pre jobs (mne-tools#11629)
  ENH: Allow gradient compensated data in maxwell_filter (mne-tools#10554)
  make test compatible with future pandas (mne-tools#11625)
  Display SVG figures correctly in Report (mne-tools#11623)
  API: Port ieeg gui over to mne-gui-addons and add tfr gui example (mne-tools#11616)
  MAINT: Add token [ci skip] (mne-tools#11622)
  API: One cycle of backward compat (mne-tools#11621)
  MAINT: Use git rather than zipball (mne-tools#11620)
  ENH: Speed up code a bit (mne-tools#11614)
  [BUG, MRG] Don't modify info in place for transform points (mne-tools#11612)
  ...
  • Loading branch information
larsoner committed Apr 25, 2023
2 parents aac6209 + 57f5ce3 commit bbc55af
Show file tree
Hide file tree
Showing 628 changed files with 12,030 additions and 7,214 deletions.
11 changes: 11 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,15 @@ jobs:
- restore_cache:
keys:
- data-cache-visual
- restore_cache:
keys:
- data-cache-ucl-opm-auditory
- run:
name: Get data
# This limit could be increased, but this is helpful for finding slow ones
# (even ~2GB datasets should be downloadable in this time from good
# providers)
no_output_timeout: 10m
command: |
./tools/circleci_download.sh
- run:
Expand Down Expand Up @@ -382,6 +389,10 @@ jobs:
key: data-cache-visual
paths:
- ~/mne_data/MNE-visual_92_categories-data # (6 G)
- save_cache:
key: data-cache-ucl-opm-auditory
paths:
- ~/mne_data/auditory_OPM_stationary # (4 G)


linkcheck:
Expand Down
4 changes: 2 additions & 2 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Hello! 👋 Thanks for opening your first issue here! ❤️ We will try to get back to you soon. 🚴🏽‍♂️
Hello! 👋 Thanks for opening your first issue here! ❤️ We will try to get back to you soon. 🚴
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome

# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Hello! 👋 Thanks for opening your first pull request here! ❤️ We will try to get back to you soon. 🚴🏽‍♂️
Hello! 👋 Thanks for opening your first pull request here! ❤️ We will try to get back to you soon. 🚴
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/circle_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
uses: larsoner/circleci-artifacts-redirector-action@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
api-token: ${{ secrets.CIRCLECI_TOKEN }}
artifact-path: 0/dev/index.html
circleci-jobs: build_docs,build_docs_main
job-title: Check the rendered docs here!
45 changes: 0 additions & 45 deletions .github/workflows/codespell_and_flake.yml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/compat_minimal.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .github/workflows/compat_old.yml

This file was deleted.

121 changes: 0 additions & 121 deletions .github/workflows/linux_conda.yml

This file was deleted.

Loading

0 comments on commit bbc55af

Please sign in to comment.