diff --git a/.circleci/config.yml b/.circleci/config.yml index 07febf1abcd..697c3e8c761 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -522,7 +522,7 @@ workflows: branches: only: - main - - maint/0.24 + - maint/1.0 main: jobs: diff --git a/.mailmap b/.mailmap index eb3264b127f..dbfac6d5c5c 100644 --- a/.mailmap +++ b/.mailmap @@ -244,4 +244,11 @@ Alex Rockhill Alex Ryan Law Ryan Law David Julien David JULIEN Gansheng Tan <49130176+GanshengT@users.noreply.github.com> Gansheng TAN <49130176+GanshengT@users.noreply.github.com> -Timothy Gates Tim Gates \ No newline at end of file +Timothy Gates Tim Gates +Etienne de Montalivet +Federico Zamberlan <44038765+fzamberlan@users.noreply.github.com> +John Veillette +Michiru Kaneda rcmdnk +Matthias Eberlein <41163089+MatthiasEb@users.noreply.github.com> MatthiasEb <41163089+MatthiasEb@users.noreply.github.com> +Nikolai Chapochnikov <23103092+chapochn@users.noreply.github.com> Nikolai M Chapochnikov <23103092+chapochn@users.noreply.github.com> +Senwen Deng <36327760+snwnde@users.noreply.github.com> Senwen DENG <36327760+snwnde@users.noreply.github.com> diff --git a/SECURITY.md b/SECURITY.md index 5518d7f0b2e..c4f2140dc94 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,9 +10,9 @@ without a proper 6-month deprecation cycle. | Version | Supported | | ------- | ------------------------ | -| 0.25.x | :heavy_check_mark: (dev) | -| 0.24.x | :heavy_check_mark: | -| < 0.24 | :x: | +| 1.1.x | :heavy_check_mark: (dev) | +| 1.0.x | :heavy_check_mark: | +| < 1.0 | :x: | ## Reporting a Vulnerability diff --git a/codemeta.json b/codemeta.json index b5d58097c6b..6fed47fe619 100644 --- a/codemeta.json +++ b/codemeta.json @@ -5,11 +5,11 @@ "codeRepository": "git+https://github.com/mne-tools/mne-python.git", "dateCreated": "2010-12-26", "datePublished": "2014-08-04", - "dateModified": "2021-11-03", - "downloadUrl": "https://github.com/mne-tools/mne-python/archive/v0.24.0.zip", + "dateModified": "2022-03-21", + "downloadUrl": "https://github.com/mne-tools/mne-python/archive/v1.0.0.zip", "issueTracker": "https://github.com/mne-tools/mne-python/issues", "name": "MNE-Python", - "version": "0.24.0", + "version": "1.0.0", "description": "MNE-Python is an open-source Python package for exploring, visualizing, and analyzing human neurophysiological data. It provides methods for data input/output, preprocessing, visualization, source estimation, time-frequency analysis, connectivity analysis, machine learning, and statistics.", "applicationCategory": "Neuroscience", "developmentStatus": "active", @@ -116,15 +116,15 @@ }, { "@type":"Person", - "email":"w.m.vanvliet@gmail.com", - "givenName":"Marijn", - "familyName": "van Vliet" + "email":"richard.hoechenberger@gmail.com", + "givenName":"Richard", + "familyName": "Höchenberger" }, { "@type":"Person", - "email":"wronk.mark@gmail.com", - "givenName":"Mark", - "familyName": "Wronkiewicz" + "email":"w.m.vanvliet@gmail.com", + "givenName":"Marijn", + "familyName": "van Vliet" }, { "@type":"Person", @@ -134,9 +134,9 @@ }, { "@type":"Person", - "email":"richard.hoechenberger@gmail.com", - "givenName":"Richard", - "familyName": "Höchenberger" + "email":"wronk.mark@gmail.com", + "givenName":"Mark", + "familyName": "Wronkiewicz" }, { "@type":"Person", @@ -162,6 +162,12 @@ "givenName":"Alan", "familyName": "Leggitt" }, + { + "@type":"Person", + "email":"stefan.appelhoff@mailbox.org", + "givenName":"Stefan", + "familyName": "Appelhoff" + }, { "@type":"Person", "email":"andrew.r.dykstra@gmail.com", @@ -176,15 +182,15 @@ }, { "@type":"Person", - "email":"desantis.lnz@gmail.com", - "givenName":"Lorenzo", - "familyName": "De Santis" + "email":"", + "givenName":"Robert", + "familyName": "Luke" }, { "@type":"Person", - "email":"stefan.appelhoff@mailbox.org", - "givenName":"Stefan", - "familyName": "Appelhoff" + "email":"desantis.lnz@gmail.com", + "givenName":"Lorenzo", + "familyName": "De Santis" }, { "@type":"Person", @@ -194,9 +200,9 @@ }, { "@type":"Person", - "email":"", - "givenName":"Robert", - "familyName": "Luke" + "email":"aprockhill206@gmail.com", + "givenName":"Alex", + "familyName": "Rockhill" }, { "@type":"Person", @@ -246,12 +252,6 @@ "givenName":"Alexandre", "familyName": "Barachant" }, - { - "@type":"Person", - "email":"aprockhill206@gmail.com", - "givenName":"Alex", - "familyName": "Rockhill" - }, { "@type":"Person", "email":"emilyr@nmr.mgh.harvard.edu", @@ -276,6 +276,12 @@ "givenName":"Luke", "familyName": "Bloy" }, + { + "@type":"Person", + "email":"adam2392@gmail.com", + "givenName":"Adam", + "familyName": "Li" + }, { "@type":"Person", "email":"federaimondo@gmail.com", @@ -290,9 +296,9 @@ }, { "@type":"Person", - "email":"adam2392@gmail.com", - "givenName":"Adam", - "familyName": "Li" + "email":"", + "givenName":"Mathieu", + "familyName": "Scheltienne" }, { "@type":"Person", @@ -324,6 +330,12 @@ "givenName":"Cathy", "familyName": "Nangini" }, + { + "@type":"Person", + "email":"dev@earthman-music.de", + "givenName":"Martin", + "familyName": "Schulz" + }, { "@type":"Person", "email":"joialanisson@gmail.com", @@ -354,24 +366,18 @@ "givenName":"Guillaume", "familyName": "Dumas" }, - { - "@type":"Person", - "email":"dev@earthman-music.de", - "givenName":"Martin", - "familyName": "Schulz" - }, - { - "@type":"Person", - "email":"", - "givenName":"Mathieu", - "familyName": "Scheltienne" - }, { "@type":"Person", "email":"rkmaddox@uw.edu", "givenName":"Ross", "familyName": "Maddox" }, + { + "@type":"Person", + "email":"thomas.hartmann@th-ht.de", + "givenName":"Thomas", + "familyName": "Hartmann" + }, { "@type":"Person", "email":"paul@ppasler.de", @@ -384,12 +390,6 @@ "givenName":"Stefan", "familyName": "Repplinger" }, - { - "@type":"Person", - "email":"thomas.hartmann@th-ht.de", - "givenName":"Thomas", - "familyName": "Hartmann" - }, { "@type":"Person", "email":"alxanderr@gmail.com", @@ -480,6 +480,12 @@ "givenName":"Yu-Han", "familyName": "Luo" }, + { + "@type":"Person", + "email":"eduardxort@gmail.com", + "givenName":"Eduard", + "familyName": "Ort" + }, { "@type":"Person", "email":"jeythekey@tutanota.com", @@ -546,12 +552,6 @@ "givenName":"Cristóbal", "familyName": "Moënne-Loccoz" }, - { - "@type":"Person", - "email":"eduardxort@gmail.com", - "givenName":"Eduard", - "familyName": "Ort" - }, { "@type":"Person", "email":"neklein@andrew.cmu.edu", @@ -684,6 +684,12 @@ "givenName":"Louis", "familyName": "Thibault" }, + { + "@type":"Person", + "email":"rcmdnk@gmail.com", + "givenName":"Michiru", + "familyName": "Kaneda" + }, { "@type":"Person", "email":"nathalie.gayraud@inria.fr", @@ -762,6 +768,18 @@ "givenName":"Jack", "familyName": "Zhang" }, + { + "@type":"Person", + "email":"mail@jan-sosulski.de", + "givenName":"Jan", + "familyName": "Sosulski" + }, + { + "@type":"Person", + "email":"stoutjd@nih.gov", + "givenName":"Jeff", + "familyName": "Stout" + }, { "@type":"Person", "email":"leisenman@wustl.edu", @@ -810,6 +828,12 @@ "givenName":"Simon", "familyName": "Kern" }, + { + "@type":"Person", + "email":"stevematindi@gmail.com", + "givenName":"Steve", + "familyName": "Matindi" + }, { "@type":"Person", "email":"neurolaunch@gmail.copm", @@ -876,24 +900,12 @@ "givenName":"Ezequiel", "familyName": "Mikulan" }, - { - "@type":"Person", - "email":"mail@jan-sosulski.de", - "givenName":"Jan", - "familyName": "Sosulski" - }, { "@type":"Person", "email":"jean.baptiste.schiratti@gmail.com", "givenName":"Jean-Baptiste", "familyName": "Schiratti" }, - { - "@type":"Person", - "email":"stoutjd@nih.gov", - "givenName":"Jeff", - "familyName": "Stout" - }, { "@type":"Person", "email":"", @@ -930,12 +942,24 @@ "givenName":"Martin", "familyName": "Schulz" }, + { + "@type":"Person", + "email":"mathieu.scheltienne@gmail.com", + "givenName":"Mathieu", + "familyName": "Scheltienne" + }, { "@type":"Person", "email":"", "givenName":"Matt", "familyName": "Boggess" }, + { + "@type":"Person", + "email":"", + "givenName":"Matthias", + "familyName": "Eberlein" + }, { "@type":"Person", "email":"molpsychistb@gmail.com", @@ -996,12 +1020,6 @@ "givenName":"Sophie", "familyName": "Herbst" }, - { - "@type":"Person", - "email":"stevematindi@gmail.com", - "givenName":"Steve", - "familyName": "Matindi" - }, { "@type":"Person", "email":"", @@ -1056,6 +1074,12 @@ "givenName":"Achilleas", "familyName": "Koutsou" }, + { + "@type":"Person", + "email":"adina.wagner@t-online.de", + "givenName":"Adina", + "familyName": "Wagner" + }, { "@type":"Person", "email":"aniket17133@iiitd.ac.in", @@ -1200,12 +1224,24 @@ "givenName":"Enrico", "familyName": "Varano" }, + { + "@type":"Person", + "email":"", + "givenName":"Etienne", + "familyName": "de Montalivet" + }, { "@type":"Person", "email":"", "givenName":"Evgeny", "familyName": "Goldstein" }, + { + "@type":"Person", + "email":"", + "givenName":"Federico", + "familyName": "Zamberlan" + }, { "@type":"Person", "email":"", @@ -1236,6 +1272,12 @@ "givenName":"Jakub", "familyName": "Kaczmarzyk" }, + { + "@type":"Person", + "email":"", + "givenName":"Jan", + "familyName": "Zerfowski" + }, { "@type":"Person", "email":"japsai@gmail.com", @@ -1260,6 +1302,12 @@ "givenName":"Johannes", "familyName": "Niediek" }, + { + "@type":"Person", + "email":"johnv@uchicago.edu", + "givenName":"John", + "familyName": "Veillette" + }, { "@type":"Person", "email":"koen.joshua@gmail.com", @@ -1278,6 +1326,12 @@ "givenName":"Joshua", "familyName": "Teves" }, + { + "@type":"Person", + "email":"joshua.teves@nih.gov", + "givenName":"Joshua", + "familyName": "Teves" + }, { "@type":"Person", "email":"", @@ -1290,6 +1344,12 @@ "givenName":"Juergen", "familyName": "Dammers" }, + { + "@type":"Person", + "email":"guiomar.niso@ctb.upm.es", + "givenName":"Julia Guiomar Niso", + "familyName": "Galán" + }, { "@type":"Person", "email":"slama@berkeley.edu", @@ -1440,6 +1500,12 @@ "givenName":"Nicole", "familyName": "Proulx" }, + { + "@type":"Person", + "email":"", + "givenName":"Nikolai", + "familyName": "Chapochnikov" + }, { "@type":"Person", "email":"nikos.ch01@gmail.com", @@ -1548,6 +1614,12 @@ "givenName":"Sam", "familyName": "Perry" }, + { + "@type":"Person", + "email":"", + "givenName":"Scott", + "familyName": "Huberty" + }, { "@type":"Person", "email":"", @@ -1566,6 +1638,12 @@ "givenName":"Sebastián", "familyName": "Castaño" }, + { + "@type":"Person", + "email":"", + "givenName":"Senwen", + "familyName": "Deng" + }, { "@type":"Person", "email":"s.antopolsky@gmail.com", diff --git a/doc/_static/versions.json b/doc/_static/versions.json index b77dcdc41e4..0cab5c21d3e 100644 --- a/doc/_static/versions.json +++ b/doc/_static/versions.json @@ -1,12 +1,15 @@ [ { - "name": "1.0 (devel)", + "name": "1.1 (devel)", "version": "dev" }, { - "name": "0.24 (stable)", + "name": "1.0 (stable)", "version": "stable" }, + { + "version": "0.24" + }, { "version": "0.23" }, diff --git a/doc/changes/latest.inc b/doc/changes/1.0.inc similarity index 95% rename from doc/changes/latest.inc rename to doc/changes/1.0.inc index 1a7c7f4c70b..c2e6f1afc50 100644 --- a/doc/changes/latest.inc +++ b/doc/changes/1.0.inc @@ -16,10 +16,10 @@ Also add a corresponding entry for yourself in doc/changes/names.inc -.. _current: +.. _changes_1_0_0: -Current (1.0.dev0) -------------------- +Version 1.0.0 (2022-03-21) +-------------------------- Enhancements ~~~~~~~~~~~~ @@ -30,6 +30,10 @@ Enhancements - Fix some unused variables in time_frequency_erds.py example (:gh:`10076` by :newcontrib:`Jan Zerfowski`) +- Document ``BAD_ACQ_SKIP`` annotation behavior (:gh:`10054` by :newcontrib:`Etienne de Montalivet`) + +- Add link to related ``MNE-ARI`` package (:gh:`10174` by :newcontrib:`John Veillette`) + - :func:`mne.time_frequency.psd_array_multitaper` can now return complex results per-taper when specifying ``output='complex'`` (:gh:`10307` by `Mikołaj Magnuski`_) - :func:`mne.time_frequency.tfr_array_multitaper` can now return results for ``output='phase'`` instead of an error (:gh:`10281` by `Mikołaj Magnuski`_) @@ -126,7 +130,7 @@ Enhancements - Add support for passing time-frequency data to :func:`mne.stats.spatio_temporal_cluster_test` and :func:`mne.stats.spatio_temporal_cluster_1samp_test` and added an example to :ref:`tut-cluster-spatiotemporal-sensor` (:gh:`10384` by `Alex Rockhill`_) -- Add support for reading optical density fNIRS data to :func:`mne.io.read_raw_snirf` (:gh:`10408` by `Robert Luke`_) +- Add support for reading optical density fNIRS data to :func:`mne.io.read_raw_snirf` (:gh:`10408` by `Robert Luke`_) - Added :func:`mne.source_space.get_decimated_surfaces` to extract subsurfaces from a SourceSpaces instance or a .fif file (:gh:`10421` by `Joshua Teves`_) @@ -144,6 +148,10 @@ Bugs - Teach :func:`mne.io.read_raw_bti` to use its ``eog_ch`` parameter (:gh:`10093` by :newcontrib:`Adina Wagner`) +- Fix use of arguments in :func:`numpy.loadtxt` (:gh:`10189` by :newcontrib:`Federico Zamberlan`) + +- Fix documentation of options in :func:`mne.stc_near_sensors` (:gh:`` by :newcontrib:`Nikolai Chapochnikov`) + - :func:`mne.time_frequency.tfr_array_multitaper` now returns results per taper when ``output='complex'`` (:gh:`10281` by `Mikołaj Magnuski`_) - Fix default of :func:`mne.io.Raw.plot` to be ``use_opengl=None``, which will act like False unless ``MNE_BROWSER_USE_OPENGL=true`` is set in the user configuration (:gh:`9957` by `Eric Larson`_) @@ -278,3 +286,40 @@ new dependencies have been added: .. _Jinja2: https://jinja.palletsprojects.com/ + +Authors +~~~~~~~ + +* Adam Li +* Adina Wagner+ +* Alex Rockhill +* Alexandre Gramfort +* Britta Westner +* Clemens Brunner +* Daniel McCloy +* Eduard Ort +* Eric Larson +* Etienne de Montalivet+ +* Federico Zamberlan+ +* Guillaume Favelier +* Jan Sosulski +* Jan Zerfowski+ +* Jeff Stout +* John Veillette+ +* Joshua Teves +* Julia Guiomar Niso Galán +* Luke Bloy +* Marijn van Vliet +* Martin Schulz +* Mathieu Scheltienne +* Matthias Eberlein+ +* Michiru Kaneda+ +* Mikołaj Magnuski +* Nikolai Chapochnikov+ +* Richard Höchenberger +* Robert Luke +* Scott Huberty+ +* Senwen Deng+ +* Stefan Appelhoff +* Steve Matindi +* Thomas Hartmann diff --git a/doc/changes/names.inc b/doc/changes/names.inc index 66f908179b8..4bc09b1fd62 100644 --- a/doc/changes/names.inc +++ b/doc/changes/names.inc @@ -429,3 +429,11 @@ .. _Michiru Kaneda: https://github.com/rcmdnk .. _Scott Huberty: https://orcid.org/0000-0003-2637-031X + +.. _Etienne de Montalivet: https://github.com/etiennedemontalivet + +.. _Federico Zamberlan: https://github.com/fzamberlan + +.. _John Veillette: https://psychology.uchicago.edu/directory/john-veillette + +.. _Nikolai Chapochnikov: https://github.com/chapochn \ No newline at end of file diff --git a/doc/whats_new.rst b/doc/whats_new.rst index 8fe0111436e..a756c789925 100644 --- a/doc/whats_new.rst +++ b/doc/whats_new.rst @@ -5,7 +5,7 @@ What's new .. currentmodule:: mne -.. include:: changes/latest.inc +.. include:: changes/1.0.inc .. include:: changes/0.24.inc .. include:: changes/0.23.inc .. include:: changes/0.22.inc diff --git a/mne/_version.py b/mne/_version.py index 03b90a8cacb..a54da33643b 100644 --- a/mne/_version.py +++ b/mne/_version.py @@ -3,4 +3,4 @@ # # License: BSD-3-Clause -__version__ = '1.0.dev0' +__version__ = '1.0.0' diff --git a/tools/circleci_download.sh b/tools/circleci_download.sh index 4227a216a66..2c8b4cdfc4f 100755 --- a/tools/circleci_download.sh +++ b/tools/circleci_download.sh @@ -4,7 +4,7 @@ if [ "$CIRCLE_BRANCH" == "main" ] || [[ $(cat gitlog.txt) == *"[circle full]"* ] echo "Doing a full dev build"; echo html_dev-memory > build.txt; python -c "import mne; mne.datasets._download_all_example_data()"; -elif [ "$CIRCLE_BRANCH" == "maint/0.24" ]; then +elif [ "$CIRCLE_BRANCH" == "maint/1.0" ]; then echo "Doing a full stable build"; echo html_stable-memory > build.txt; python -c "import mne; mne.datasets._download_all_example_data()"; diff --git a/tools/generate_codemeta.py b/tools/generate_codemeta.py index 13ede3117eb..924f16833da 100644 --- a/tools/generate_codemeta.py +++ b/tools/generate_codemeta.py @@ -13,12 +13,13 @@ 'De Santis', 'Dupré la Tour', 'de la Torre', + 'de Montalivet', 'van den Bosch', 'Van den Bossche', 'Van Der Donckt', 'van der Meer', 'van Harmelen', - 'Visconti di Oleggio Castello' + 'Visconti di Oleggio Castello', )