Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ workflows:
branches:
only:
- main
- maint/1.2
- maint/1.3

main:
jobs:
Expand Down
6 changes: 6 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Ellen Lau <ellenlau@umd.edu> ellenlau <ellenlau@umd.edu>
Emily Stephen <emilyps14@gmail.com> Emily P. Stephen <emilyps14@gmail.com>
Emily Stephen <emilyps14@gmail.com> emilyps14 <emilyps14@gmail.com>
Enrico Varano <69973551+enricovara@users.noreply.github.com> enricovara <69973551+enricovara@users.noreply.github.com>
Enzo Altamiranda <enzo.alt@gmail.com> enzo <enzo.alt@gmail.com>
Eric Larson <larson.eric.d@gmail.com> Eric Larson <larson.eric.d@gmail.com>
Eric Larson <larson.eric.d@gmail.com> Eric Larson <larsoner@monolith.local>
Eric Larson <larson.eric.d@gmail.com> Eric Larson <larsoner@uw.edu>
Expand All @@ -83,6 +84,7 @@ Erica Peterson <nordme@uw.edu> nordme <38704848+nordme@users.noreply.github.com>
Erica Peterson <nordme@uw.edu> nordme <nordme@uw.edu>
Erik Hornberger <erik.hornberger@shi-g.com> er06645810 <erik.hornberger@shi-g.com>
Erik Hornberger <erik.hornberger@shi-g.com> Erik Hornberger <hornbergererik@gmail.com>
Erkka Heinila <erkkahe@gmail.com> Teekuningas <erkka.heinila@jyu.fi>
Erkka Heinila <erkkahe@gmail.com> Teekuningas <erkkahe@gmail.com>
Etienne de Montalivet <etiennedemontalivet@users.noreply.github.com>
Evgenii Kalenkovich <e.kalenkovich@gmail.com> kalenkovich <e.kalenkovich@gmail.com>
Expand Down Expand Up @@ -176,6 +178,8 @@ Manu Sutela <manu.sutela@gmail.com> MJAS1 <manu.sutela@gmail.com>
Marian Dovgialo <mdovgialo@fabrizzio.zfb.fuw.edu.pl> Marian Dovgialo <mdovgialo@users.noreply.github.com>
Marian Dovgialo <mdovgialo@fabrizzio.zfb.fuw.edu.pl> mdovgialo <mdovgialo@users.noreply.github.com>
Marijn van Vliet <w.m.vanvliet@gmail.com> Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Mark Alexander Henney <mah@optoceutics.com> Mark <mah@optoceutics.com>
Mark Alexander Henney <mah@optoceutics.com> Mark Henney <120719655+henneysq@users.noreply.github.com>
Mark Wronkiewicz <wronk.mark@gmail.com> wronk <wronk.mark@gmail.com>
Marmaduke Woodman <mmwoodman@gmail.com> maedoc <maedoc@mm.st>
Martin Billinger <martin.billinger@tugraz.at> kazemakase <kazemakase@users.noreply.github.com>
Expand Down Expand Up @@ -224,6 +228,7 @@ Nikolai Chapochnikov <23103092+chapochn@users.noreply.github.com> Nikolai M Chap
Nikolas Chalas <nikos.ch01@gmail.com> Nichalas <nikos.ch01@gmail.com>
Olaf Hauk <olaf.hauk@mrc-cbu.cam.ac.uk> Olaf Hauk <olaf@mac0086.local>
Olaf Hauk <olaf.hauk@mrc-cbu.cam.ac.uk> olafhauk <olaf.hauk@mrc-cbu.cam.ac.uk>
Omer Shubi <omer.shubi@gmail.com> Omer S <omer.shubi@gmail.com>
Paul Pasler <paul@ppasler.de> ppasler <paul@ppasler.de>
Paul Roujansky <paul@roujansky.eu>
Pedro Silva <pedrobnsilva@gmail.com> pbnsilva <pedrobnsilva@gmail.com>
Expand Down Expand Up @@ -278,6 +283,7 @@ Thomas Radman <radman.thomas@gmail.com>
Timon Merk <38216460+timonmerk@users.noreply.github.com> timonmerk <38216460+timonmerk@users.noreply.github.com>
Timothy Gates <tim.gates@iress.com> Tim Gates <tim.gates@iress.com>
Tod Flak <45362686+todflak@users.noreply.github.com> todflak <45362686+todflak@users.noreply.github.com>
Tom Ma <myd7349@gmail.com> myd7349 <myd7349@gmail.com>
Tristan Stenner <ttstenner@gmail.com> Tristan Stenner <derstenner@gmail.com>
Tziona NessAiver <tzionan@mail.tau.ac.il> TzionaN <tzionan@mail.tau.ac.il>
Valerii Chirkov <vagechirkov@gmail.com> Valerii <42982039+vagechirkov@users.noreply.github.com>
Expand Down
60 changes: 43 additions & 17 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cff-version: 1.2.0
title: "MNE-Python"
message: "If you use this software, please cite both the software itself, and the paper listed in the preferred-citation field."
version: 1.2.0
date-released: "2022-10-11"
commit: e985dd29308c57793c83d7120090256c24bc91e6
version: 1.3.0
date-released: "2022-12-22"
commit: ea0f80614ca01f71333cbdfa4d06ee8932058cfe
doi: 10.5281/zenodo.592483
keywords:
- MEG
Expand Down Expand Up @@ -77,12 +77,12 @@ authors:
given-names: Asish
- family-names: Magnuski
given-names: Mikołaj
- family-names: Billinger
given-names: Martin
- family-names: Westner
given-names: Britta
- family-names: Scheltienne
given-names: Mathieu
- family-names: Westner
given-names: Britta
- family-names: Billinger
given-names: Martin
- family-names: Wakeman
given-names: Dan G
- family-names: Strohmeier
Expand Down Expand Up @@ -192,6 +192,10 @@ authors:
given-names: Catalina María
- family-names: Moënne-Loccoz
given-names: Cristóbal
- family-names: Heinila
given-names: Erkka
- family-names: Hanna
given-names: Jevri
- family-names: Houck
given-names: Jon
- family-names: Klein
Expand All @@ -204,14 +208,10 @@ authors:
given-names: Christian
- family-names: Peterson
given-names: Erica
- family-names: Heinila
given-names: Erkka
- family-names: Kolkhorst
given-names: Henrich
- family-names: Banville
given-names: Hubert
- family-names: Hanna
given-names: Jeff
- family-names: Maksymenko
given-names: Kostiantyn
- family-names: Clarke
Expand Down Expand Up @@ -311,6 +311,8 @@ authors:
given-names: Annalisa
- family-names: Karekal
given-names: Apoorva
- family-names: de la Torre
given-names: Carlos
- family-names: Gohil
given-names: Chetan
- family-names: Zhao
Expand Down Expand Up @@ -339,6 +341,8 @@ authors:
given-names: Lenny
- family-names: Gemein
given-names: Lukas
- family-names: Hecker
given-names: Lukas
- name: Lx37
- family-names: van Es
given-names: Mats
Expand All @@ -348,6 +352,8 @@ authors:
given-names: Matthias
- family-names: Sherif
given-names: Mohamed
- family-names: Gerster
given-names: Moritz
- family-names: Kozhemiako
given-names: Nataliia
- family-names: Srinivasan
Expand Down Expand Up @@ -378,6 +384,8 @@ authors:
given-names: Sumalyo
- family-names: Jochmann
given-names: Thomas
- family-names: Merk
given-names: Timon
- family-names: Flak
given-names: Tod
- family-names: Dupré la Tour
Expand All @@ -398,6 +406,8 @@ authors:
given-names: Adina
- family-names: Ciok
given-names: Alex
- family-names: Gramfort
given-names: Alexandre
- family-names: Pradhan
given-names: Aniket
- family-names: Padee
Expand Down Expand Up @@ -428,6 +438,8 @@ authors:
given-names: Claire
- family-names: Schad
given-names: Daniel Carlström
- family-names: Hasegan
given-names: Daniel
- family-names: Sleiter
given-names: Darin Erat
- family-names: Haslacher
Expand All @@ -438,6 +450,8 @@ authors:
given-names: Demetres
- family-names: Petkova
given-names: Desislava
- family-names: Issagaliyeva
given-names: Dinara
- family-names: Altukhov
given-names: Dmitrii
- family-names: Wetzel
Expand All @@ -452,6 +466,10 @@ authors:
given-names: Emanuele
- family-names: Varano
given-names: Enrico
- family-names: Altamiranda
given-names: Enzo
- family-names: Brayet
given-names: Eric
- family-names: de Montalivet
given-names: Etienne
- family-names: Goldstein
Expand Down Expand Up @@ -480,6 +498,8 @@ authors:
given-names: Jan
- family-names: van den Bosch
given-names: Jasper J F
- family-names: Behnke
given-names: Jennifer
- family-names: Van Der Donckt
given-names: Jeroen
- family-names: van der Meer
Expand Down Expand Up @@ -514,8 +534,6 @@ authors:
given-names: Liberty
- family-names: Alfine
given-names: Lorenzo
- family-names: Hecker
given-names: Lukas
- family-names: Hejtmánek
given-names: Lukáš
- family-names: Kitzbichler
Expand All @@ -528,6 +546,8 @@ authors:
given-names: Manu
- family-names: Koculak
given-names: Marcin
- family-names: Henney
given-names: Mark Alexander
- family-names: van Harmelen
given-names: Martin
- name: MartinBaBer
Expand All @@ -543,6 +563,8 @@ authors:
given-names: Matti
- family-names: Shader
given-names: Maureen
- family-names: Cespedes
given-names: Mauricio
- family-names: Krause
given-names: Michael
- family-names: Rybář
Expand All @@ -551,14 +573,14 @@ authors:
given-names: Mingjian
- family-names: Daneshzand
given-names: Mohammad
- family-names: Gerster
given-names: Moritz
- family-names: Gensollen
given-names: Nicolas
- family-names: Proulx
given-names: Nicole
- family-names: Chalas
given-names: Nikolas
- family-names: Shubi
given-names: Omer
- family-names: Sundaram
given-names: Padma
- family-names: Roujansky
Expand Down Expand Up @@ -593,6 +615,8 @@ authors:
given-names: Sagun
- family-names: Perry
given-names: Sam
- family-names: Ruuskanen
given-names: Santeri
- family-names: Mathot
given-names: Sebastiaan
- family-names: Major
Expand Down Expand Up @@ -631,12 +655,14 @@ authors:
given-names: Thomas
- family-names: Radman
given-names: Thomas
- family-names: Merk
given-names: Timon
- family-names: Gates
given-names: Timothy
- family-names: Ma
given-names: Tom
- family-names: Clausner
given-names: Tommy
- family-names: Anijärv
given-names: Toomas Erik
- family-names: Xia
given-names: Xiaokai
- family-names: Zhang
Expand Down
6 changes: 3 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ without a proper 6-month deprecation cycle.

| Version | Supported |
| ------- | ------------------------ |
| 1.3.x | :heavy_check_mark: (dev) |
| 1.2.x | :heavy_check_mark: |
| < 1.2 | :x: |
| 1.4.x | :heavy_check_mark: (dev) |
| 1.3.x | :heavy_check_mark: |
| < 1.3 | :x: |

## Reporting a Vulnerability

Expand Down
Loading