The package rpms/python-mne.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-mne.git/commit/?id=93343a3....
Change:
+%ifarch s390x || ppc64le
Thanks.
Full change:
============
commit 93343a342b8b185d0a65f29928efc389138f8c71
Author: Sandro <devel(a)penguinpee.nl>
Date: Thu Jan 18 20:53:41 2024 +0100
Skip failing test on s390x and ppc64le
diff --git a/python-mne.spec b/python-mne.spec
index 0f97e44..6ed5cf9 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -184,6 +184,10 @@ mkdir subjects
k="${k-}${k+ and }not test_thresholds[NumPy]"
# FileNotFoundError (file 'test_eyelink.asc' not in repo):
k="${k-}${k+ and }not test_annotations_without_offset"
+%ifarch s390x || ppc64le
+# Test fails on s390x and ppc64le.
+k="${k-}${k+ and }not test_spectrum_complex[welch-False]"
+%endif
#
https://github.com/mne-tools/mne-python/blob/v1.0.3/tools/github_actions_...
# skip tests that require network
commit 7146ff9a60af3986d9ab38e181a9c394443f9815
Author: Sandro <devel(a)penguinpee.nl>
Date: Thu Jan 18 19:12:21 2024 +0100
Migrate to SPDX license
diff --git a/python-mne.spec b/python-mne.spec
index e4296b6..0f97e44 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -26,7 +26,8 @@ Summary: Magnetoencephalography (MEG) and Electroencephalography
(EEG) da
#
https://github.com/fieldtrip/fieldtrip/blob/master/realtime/src/buffer/py...
# Not possible to package because it is matlab package with some plugins
-License: BSD
+# SPDX
+License: BSD-3-Clause
URL:
http://martinos.org/mne/
commit b520803fa6652ea64ac7def1683b0a2999a878c5
Author: Sandro <devel(a)penguinpee.nl>
Date: Thu Jan 18 19:11:29 2024 +0100
Skip failing test
Required file is missing.
diff --git a/python-mne.spec b/python-mne.spec
index c936c99..e4296b6 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -181,6 +181,8 @@ mkdir subjects
# Hangs:
k="${k-}${k+ and }not test_thresholds[NumPy]"
+# FileNotFoundError (file 'test_eyelink.asc' not in repo):
+k="${k-}${k+ and }not test_annotations_without_offset"
#
https://github.com/mne-tools/mne-python/blob/v1.0.3/tools/github_actions_...
# skip tests that require network
commit 37a8badc513accbc0622ca9c5bbd0a55a5fb22b6
Author: Sandro <devel(a)penguinpee.nl>
Date: Thu Jan 18 18:24:55 2024 +0100
Drop patches (merged upstream)
diff --git a/0001-BUG-Fix-bug-with-clip-box-setting-11999.patch
b/0001-BUG-Fix-bug-with-clip-box-setting-11999.patch
deleted file mode 100644
index 48deef9..0000000
--- a/0001-BUG-Fix-bug-with-clip-box-setting-11999.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 49a901dd13d44f7eb9b50985a83600a540ebb347 Mon Sep 17 00:00:00 2001
-From: Eric Larson <larson.eric.d(a)gmail.com>
-Date: Fri, 15 Sep 2023 15:50:30 -0400
-Subject: [PATCH] BUG: Fix bug with clip box setting (#11999)
-
----
- doc/conf.py | 2 +-
- examples/io/elekta_epochs.py | 5 ++---
- mne/utils/docs.py | 2 +-
- mne/viz/evoked.py | 4 ++--
- mne/viz/misc.py | 2 +-
- mne/viz/topo.py | 18 +++++++++++++-----
- mne/viz/topomap.py | 4 ++--
- tutorials/preprocessing/70_fnirs_processing.py | 1 -
- .../time-freq/20_sensors_time_frequency.py | 2 +-
- 9 files changed, 23 insertions(+), 17 deletions(-)
-
-diff --git a/doc/conf.py b/doc/conf.py
-index 55da25811..020eefd90 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -198,7 +198,7 @@ numpydoc_xref_aliases = {
- "Path": ":class:`python:pathlib.Path`",
- "bool": ":class:`python:bool`",
- # Matplotlib
-- "colormap": ":doc:`colormap
<matplotlib:tutorials/colors/colormaps>`",
-+ "colormap": ":ref:`colormap <matplotlib:colormaps>`",
- "color": ":doc:`color <matplotlib:api/colors_api>`",
- "Axes": "matplotlib.axes.Axes",
- "Figure": "matplotlib.figure.Figure",
-diff --git a/examples/io/elekta_epochs.py b/examples/io/elekta_epochs.py
-index 125a1e2c0..f632b0fba 100644
---- a/examples/io/elekta_epochs.py
-+++ b/examples/io/elekta_epochs.py
-@@ -5,9 +5,8 @@
- Getting averaging info from .fif files
- ======================================
-
--Parse averaging information defined in Elekta Vectorview/TRIUX DACQ (data
--acquisition). Extract and average epochs accordingly. Modify some
--averaging parameters and get epochs.
-+Parse averaging information defined in Elekta Vectorview/TRIUX DACQ (data acquisition).
-+Extract and average epochs accordingly. Modify some averaging parameters and get
epochs.
- """
- # Author: Jussi Nurminen (jnu(a)iki.fi)
- #
-diff --git a/mne/utils/docs.py b/mne/utils/docs.py
-index 6423f467d..76dfff244 100644
---- a/mne/utils/docs.py
-+++ b/mne/utils/docs.py
-@@ -760,7 +760,7 @@ docdict[
- cnorm : matplotlib.colors.Normalize | None
- How to normalize the colormap. If ``None``, standard linear normalization
- is performed. If not ``None``, ``vmin`` and ``vmax`` will be ignored.
-- See :doc:`Matplotlib docs <matplotlib:tutorials/colors/colormapnorms>`
-+ See :ref:`Matplotlib docs <matplotlib:colormapnorms>`
- for more details on colormap normalization, and
- :ref:`the ERDs example<cnorm-example>` for an example of its use.
- """
-diff --git a/mne/viz/evoked.py b/mne/viz/evoked.py
-index bba7c7556..07ae226d0 100644
---- a/mne/viz/evoked.py
-+++ b/mne/viz/evoked.py
-@@ -2656,8 +2656,8 @@ def plot_compare_evokeds(
- :class:`dict` of :class:`ints <int>` or :class:`floats <float>`
- indicating steps or percentiles (respectively) along the colormap. If
- ``cmap`` is ``None``, list elements or dict values of ``colors`` must
-- be :class:`ints <int>` or valid :doc:`matplotlib colors
-- <matplotlib:tutorials/colors/colors>`; lists are cycled through
-+ be :class:`ints <int>` or valid :ref:`matplotlib colors
-+ <matplotlib:colors_def>`; lists are cycled through
- sequentially,
- while dicts must have keys matching the keys or conditions of an
- ``evokeds`` dict (see Notes for details). If ``None``, the current
-diff --git a/mne/viz/misc.py b/mne/viz/misc.py
-index c8b0d3f88..16d587b02 100644
---- a/mne/viz/misc.py
-+++ b/mne/viz/misc.py
-@@ -774,7 +774,7 @@ def plot_events(
- Dictionary of event_id integers as keys and colors as values. If None,
- colors are automatically drawn from a default list (cycled through if
- number of events longer than list of default colors). Color can be any
-- valid :doc:`matplotlib color <matplotlib:tutorials/colors/colors>`.
-+ valid :ref:`matplotlib color <matplotlib:colors_def>`.
- event_id : dict | None
- Dictionary of event labels (e.g. 'aud_l') as keys and their associated
- event_id values. Labels are used to plot a legend. If None, no legend
-diff --git a/mne/viz/topo.py b/mne/viz/topo.py
-index c81e3199b..f7d51aea5 100644
---- a/mne/viz/topo.py
-+++ b/mne/viz/topo.py
-@@ -495,8 +495,6 @@ def _imshow_tfr_unified(
- data_lines.append(
- ax.imshow(
- tfr[ch_idx],
-- clip_on=True,
-- clip_box=tuple(bn.pos),
- extent=extent,
- aspect="auto",
- origin="lower",
-@@ -505,6 +503,7 @@ def _imshow_tfr_unified(
- cmap=cmap,
- )
- )
-+ data_lines[-1].set_clip_box(_pos_to_bbox(bn.pos, ax))
-
-
- def _plot_timeseries(
-@@ -663,7 +662,6 @@ def _plot_timeseries_unified(
- pos = bn.pos
- data_lines = bn.data_lines
- ax = bn.ax
-- # XXX These calls could probably be made faster by using collections
- for data_, color_, times_ in zip(data, color, times):
- data_lines.append(
- ax.plot(
-@@ -671,10 +669,10 @@ def _plot_timeseries_unified(
- bn.y_t + bn.y_s * data_[ch_idx],
- linewidth=0.5,
- color=color_,
-- clip_on=True,
-- clip_box=tuple(pos),
- )[0]
- )
-+ # Needs to be done afterward for some reason (probable matlotlib bug)
-+ data_lines[-1].set_clip_box(_pos_to_bbox(pos, ax))
- if vline:
- vline = np.array(vline) * bn.x_s + bn.x_t
- ax.vlines(
-@@ -1299,3 +1297,13 @@ def plot_topo_image_epochs(
- add_background_image(fig, fig_background)
- plt_show(show)
- return fig
-+
-+
-+def _pos_to_bbox(pos, ax):
-+ """Convert layout position to bbox."""
-+ import matplotlib.transforms as mtransforms
-+
-+ return mtransforms.TransformedBbox(
-+ mtransforms.Bbox.from_bounds(*pos),
-+ ax.transAxes,
-+ )
-diff --git a/mne/viz/topomap.py b/mne/viz/topomap.py
-index 95bccb361..3b38b0757 100644
---- a/mne/viz/topomap.py
-+++ b/mne/viz/topomap.py
-@@ -2055,8 +2055,8 @@ def plot_evoked_topomap(
- the same call as the colorbar. Note also that the colorbar will not be
- resized automatically when ``axes`` are provided; use Matplotlib's
- :meth:`axes.set_position() <matplotlib.axes.Axes.set_position>` method or
-- :doc:`gridspec <matplotlib:tutorials/intermediate/arranging_axes>`
-- interface to adjust the colorbar size yourself.
-+ :ref:`gridspec <matplotlib:arranging_axes>` interface to adjust the colorbar
-+ size yourself.
- """
- import matplotlib.pyplot as plt
- from matplotlib.gridspec import GridSpec
-diff --git a/tutorials/preprocessing/70_fnirs_processing.py
b/tutorials/preprocessing/70_fnirs_processing.py
-index e8c11f746..1dd30c628 100644
---- a/tutorials/preprocessing/70_fnirs_processing.py
-+++ b/tutorials/preprocessing/70_fnirs_processing.py
-@@ -12,7 +12,6 @@ topographic representation of the response.
-
- Here we will work with the :ref:`fNIRS motor data <fnirs-motor-dataset>`.
- """
--
- # %%
-
- import numpy as np
-diff --git a/tutorials/time-freq/20_sensors_time_frequency.py
b/tutorials/time-freq/20_sensors_time_frequency.py
-index f707ee48d..776a230ec 100644
---- a/tutorials/time-freq/20_sensors_time_frequency.py
-+++ b/tutorials/time-freq/20_sensors_time_frequency.py
-@@ -10,7 +10,7 @@ of your data (frequency and time-frequency). Here we'll work on
Epochs.
-
- We will use this dataset: :ref:`somato-dataset`. It contains so-called event
- related synchronizations (ERS) / desynchronizations (ERD) in the beta band.
--""" # noqa: E501
-+"""
- # Authors: Alexandre Gramfort <alexandre.gramfort(a)inria.fr>
- # Stefan Appelhoff <stefan.appelhoff(a)mailbox.org>
- # Richard Höchenberger <richard.hoechenberger(a)gmail.com>
---
-2.41.0
-
diff --git a/0001-MAINT-Ignore-SciPy-using-deprecated-API-12115.patch
b/0001-MAINT-Ignore-SciPy-using-deprecated-API-12115.patch
deleted file mode 100644
index 2a28725..0000000
--- a/0001-MAINT-Ignore-SciPy-using-deprecated-API-12115.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 484e5b6e37c322f4caa4619af7065f24af637383 Mon Sep 17 00:00:00 2001
-From: Eric Larson <larson.eric.d(a)gmail.com>
-Date: Wed, 18 Oct 2023 05:12:58 +0300
-Subject: [PATCH] MAINT: Ignore SciPy using deprecated API (#12115)
-
----
- mne/conftest.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/mne/conftest.py b/mne/conftest.py
-index afde5697e..2fe14b4be 100644
---- a/mne/conftest.py
-+++ b/mne/conftest.py
-@@ -160,6 +160,13 @@ def pytest_configure(config):
- ignore:(\n|.)*numpy\.distutils` is deprecated since NumPy(\n|.)*:DeprecationWarning
- ignore:datetime\.utcfromtimestamp.*is deprecated:DeprecationWarning
- ignore:The numpy\.array_api submodule is still experimental.*:UserWarning
-+ # numpy 2.0 <-> SciPy
-+ ignore:numpy\.core\._multiarray_umath.*:DeprecationWarning
-+ ignore:numpy\.core\.numeric is deprecated.*:DeprecationWarning
-+ ignore:numpy\.core\.multiarray is deprecated.*:DeprecationWarning
-+ # TODO: Should actually fix these two
-+ ignore:scipy.signal.morlet2 is deprecated in SciPy.*:DeprecationWarning
-+ ignore:The `needs_threshold` and `needs_proba`.*:FutureWarning
- # tqdm (Fedora)
- ignore:.*'tqdm_asyncio' object has no attribute
'last_print_t':pytest.PytestUnraisableExceptionWarning
- """ # noqa: E501
---
-2.41.0
-
diff --git a/python-mne.spec b/python-mne.spec
index 32b1fff..c936c99 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -38,17 +38,6 @@ Source0:
https://github.com/mne-tools/mne-python/archive/v%{version}/%{na
#Source1:
https://s3.amazonaws.com/mne-python/datasets/MNE-sample-data-processed.ta...
-# BUG: Fix bug with clip box setting
-#
https://github.com/mne-tools/mne-python/pull/11999
-# Backported to v1.5.1
-Patch: 0001-BUG-Fix-bug-with-clip-box-setting-11999.patch
-
-# MAINT: Ignore SciPy using deprecated API
-#
https://github.com/mne-tools/mne-python/pull/12115
-# Merged as 4beb8dde7588c3153ee0a240b5e363dc987c95f1
-# Backported to v1.5.1
-Patch: 0001-MAINT-Ignore-SciPy-using-deprecated-API-12115.patch
-
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
commit 2fee5758f6ee827c2e89b410d497a4475b80e4b5
Author: Packit <hello(a)packit.dev>
Date: Thu Jan 18 06:10:01 2024 +0000
[packit] 1.6.1 upstream release
- Resolves rhbz#2250903
Upstream tag: v1.6.1
Upstream commit: dc9f53d5
diff --git a/.gitignore b/.gitignore
index 4e4e08f..4fb9767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/python-mne-1.5.0.tar.gz
/python-mne-f44636f.tar.gz
/python-mne-1.5.1.tar.gz
+/python-mne-1.6.1.tar.gz
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..115b422
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.88.0.post1.dev4+gc070191b.
diff --git a/python-mne.spec b/python-mne.spec
index c1a7e1a..32b1fff 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -1,7 +1,7 @@
#global commit f44636f00666b8eb869417960926d01690ff4f42
#global shortcommit #(c=#{commit}; echo ${c:0:7})
#global checkout_date 2023094
-%global upstream_version 1.5.1
+%global upstream_version 1.6.1
# setup.py does not list all requirements, and we also unbundle quite a few
# from the externals folder, so we can't only rely on the automatic generator
diff --git a/sources b/sources
index b364ba2..1b5fb13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-mne-1.5.1.tar.gz) =
8646019a75b2988d7bc17218f8af881b30c7800e65bb6c371cd9e9f4c49b062b1e4f381d9986a69e6a1a1959ff6b173acc82e70c26e8c3ac005807e8dfe9ecfc
+SHA512 (python-mne-1.6.1.tar.gz) =
d7141f74526958c82c18d5c27a166266c8a989adca3a762361eb8fcfeff6ce57e77c209ea2567d7476ffa0e0d40abce461491b05da563d507abda37857aef230
commit fa1eb7a6af3bfc263f1b4ea2ea33ce4746b5cc2f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Jan 3 14:54:41 2024 -0500
Assert that the .dist-info directory contains a license file
diff --git a/python-mne.spec b/python-mne.spec
index 38deb53..c1a7e1a 100644
--- a/python-mne.spec
+++ b/python-mne.spec
@@ -172,7 +172,7 @@ export SETUPTOOLS_SCM_PRETEND_VERSION='%{python_version}'
%install
export SETUPTOOLS_SCM_PRETEND_VERSION='%{python_version}'
%pyproject_install
-%pyproject_save_files mne
+%pyproject_save_files -l mne
%check
export SETUPTOOLS_SCM_PRETEND_VERSION='%{python_version}'