diff --git a/.gitignore b/.gitignore index abc4312..07482c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-mne-0.10.tar.gz +/python-mne-0.13.1.tar.gz diff --git a/0001-replace-jdcal-calls-with-upstream.patch b/0001-replace-jdcal-calls-with-upstream.patch deleted file mode 100644 index e0a6eea..0000000 --- a/0001-replace-jdcal-calls-with-upstream.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 92e97def3ea15e3f36d92598c1af946ebc9ef342 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Mon, 9 Nov 2015 06:39:54 +0100 -Subject: [PATCH] replace jdcal calls with upstream - -Signed-off-by: Igor Gnatenko ---- - mne/io/tag.py | 2 +- - mne/io/write.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mne/io/tag.py b/mne/io/tag.py -index 1f95733..08d9a79 100644 ---- a/mne/io/tag.py -+++ b/mne/io/tag.py -@@ -475,7 +475,7 @@ def read_tag(fid, pos=None, shape=None, rlims=None): - s, dtype='>i4,>u4,>i4,>i4')[0])) - elif tag.type == FIFF.FIFFT_JULIAN: - tag.data = int(np.fromstring(fid.read(4), dtype=">i4")) -- tag.data = jd2jcal(tag.data) -+ tag.data = jd2jcal(tag.data, 0)[:-1] - else: - raise Exception('Unimplemented tag data type %s' % tag.type) - -diff --git a/mne/io/write.py b/mne/io/write.py -index da090fb..f8a5522 100644 ---- a/mne/io/write.py -+++ b/mne/io/write.py -@@ -91,7 +91,7 @@ def write_julian(fid, kind, data): - """Writes a Julian-formatted date to a FIF file""" - assert len(data) == 3 - data_size = 4 -- jd = np.sum(jcal2jd(*data)) -+ jd = np.sum(jcal2jd(*data)[-1]) - data = np.array(jd, dtype='>i4') - _write(fid, data, kind, data_size, FIFF.FIFFT_JULIAN, '>i4') - --- -2.6.3 - diff --git a/python-mne.spec b/python-mne.spec index 6828d7b..533ebf3 100644 --- a/python-mne.spec +++ b/python-mne.spec @@ -1,8 +1,8 @@ %global modname mne Name: python-%{modname} -Version: 0.10 -Release: 8%{?dist} +Version: 0.13.1 +Release: 1%{?dist} Summary: Magnetoencephalography (MEG) and Electroencephalography (EEG) data analysis # Bundled FieldTrip @@ -29,26 +29,36 @@ Provides: bundled(js-jquery-ui) Provides: bundled(js-d3) Provides: bundled(js-mpld3) Provides: bundled(python2-FieldTrip) -BuildRequires: python2-devel python2-nose -BuildRequires: numpy +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-nose +BuildRequires: python2-numpy # Test deps -BuildRequires: scipy -BuildRequires: python-matplotlib -BuildRequires: python-decorator python2-h5io python2-jdcal python2-six python-tempita -BuildRequires: python-scikit-learn -BuildRequires: python-patsy +BuildRequires: python2-scipy +BuildRequires: python2-matplotlib +BuildRequires: python2-decorator +BuildRequires: python2-h5io +BuildRequires: python2-jdcal +BuildRequires: python2-six +BuildRequires: python-tempita +BuildRequires: python2-scikit-learn +BuildRequires: python2-patsy #BuildRequires: Mayavi # XXX: GUI needed BuildRequires: python2-Traits -Requires: numpy -Requires: scipy -Requires: python-matplotlib -Requires: python-decorator python2-h5io python2-jdcal python2-six python-tempita -Recommends: python-scikit-learn -Recommends: python-pandas -Recommends: python-patsy -Recommends: python-pillow -Recommends: h5py -Recommends: python-statsmodels +Requires: python2-numpy +Requires: python2-scipy +Requires: python2-matplotlib +Requires: python2-decorator +Requires: python2-h5io +Requires: python2-jdcal +Requires: python2-six +Requires: python-tempita +Recommends: python2-scikit-learn +Recommends: python2-pandas +Recommends: python2-patsy +Recommends: python2-pillow +Recommends: python2-h5py +Recommends: python2-statsmodels Recommends: python2-Traits %description -n python2-%{modname} @@ -67,19 +77,29 @@ Provides: bundled(js-jquery-ui) Provides: bundled(js-d3) Provides: bundled(js-mpld3) Provides: bundled(python3-FieldTrip) -BuildRequires: python3-devel python3-nose +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-nose BuildRequires: python3-numpy # Test deps BuildRequires: python3-scipy BuildRequires: python3-matplotlib -BuildRequires: python3-decorator python3-h5io python3-jdcal python3-six python3-tempita +BuildRequires: python3-decorator +BuildRequires: python3-h5io +BuildRequires: python3-jdcal +BuildRequires: python3-six +BuildRequires: python3-tempita BuildRequires: python3-scikit-learn BuildRequires: python3-patsy BuildRequires: python3-Traits Requires: python3-numpy Requires: python3-scipy Requires: python3-matplotlib -Requires: python3-decorator python3-h5io python3-jdcal python3-six python3-tempita +Requires: python3-decorator +Requires: python3-h5io +Requires: python3-jdcal +Requires: python3-six +Requires: python3-tempita Recommends: python3-scikit-learn Recommends: python3-pandas Recommends: python3-patsy @@ -153,24 +173,7 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' \ %{buildroot}%{python2_sitelib}/%{modname}/commands/*.py \ %{buildroot}%{python3_sitelib}/%{modname}/commands/*.py -# Rename binaries -pushd %{buildroot}%{_bindir} - mv %{modname} python3-%{modname} - - sed -i '1s|^#!.*$|#!%{__python3}|' python3-%{modname} - for i in %{modname} %{modname}-3 %{modname}-%{python3_version} - do - ln -s python3-%{modname} $i - done - - cp python3-%{modname} python2-%{modname} - - sed -i '1s|^#!.*$|#!%{__python2}|' python2-%{modname} - for i in %{modname}-2 %{modname}-%{python2_version} - do - ln -s python2-%{modname} $i - done -popd +sed -i '1s|^#!.*$|#!%{__python3}|' %{buildroot}%{_bindir}/%{modname} %check export MNE_SKIP_TESTING_DATASET_TESTS=true @@ -187,23 +190,20 @@ popd %files -n python2-%{modname} %license python2/LICENSE.txt %doc python2/README.rst python2/examples python2/AUTHORS.rst -%{_bindir}/%{modname}-2 -%{_bindir}/%{modname}-%{python2_version} -%{_bindir}/python2-%{modname} %{python2_sitelib}/%{modname}/ -%{python2_sitelib}/%{modname}-%{version}*.egg-info/ +%{python2_sitelib}/%{modname}-*.egg-info/ %files -n python3-%{modname} %license python3/LICENSE.txt %doc python3/README.rst python3/examples python3/AUTHORS.rst %{_bindir}/%{modname} -%{_bindir}/%{modname}-3 -%{_bindir}/%{modname}-%{python3_version} -%{_bindir}/python3-%{modname} %{python3_sitelib}/%{modname}/ -%{python3_sitelib}/%{modname}-%{version}*.egg-info/ +%{python3_sitelib}/%{modname}-*.egg-info/ %changelog +* Tue Nov 29 2016 Igor Gnatenko - 0.13.1-1 +- Update to 0.13.1 + * Mon Sep 26 2016 Dominik Mierzejewski - 0.10-8 - rebuilt for matplotlib-2.0.0 diff --git a/sources b/sources index bc0464a..dab8f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a40628064104e8a7057618f650c692ce python-mne-0.10.tar.gz +8d595791aa1d6ff7c60ed5c340d22ea8 python-mne-0.13.1.tar.gz