diff --git a/python-moss.spec b/python-moss.spec index 02ce22e..cb70800 100644 --- a/python-moss.spec +++ b/python-moss.spec @@ -10,7 +10,7 @@ Name: python-%{modname} Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Assorted utilities for neuroimaging and cognitive science # moss/external/mvpasurf.py is MIT @@ -30,37 +30,6 @@ and cognitive science, there is probably some bias towards applications that are useful in that domain. However, the functions are intended to be written in as general and lightweight a fashion as possible. -%package -n python2-%{modname} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{modname}} -Provides: bundled(PyMVPA) -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if %{with check} -# install_requires -BuildRequires: python2dist(matplotlib) -BuildRequires: python2dist(munch) -BuildRequires: python2dist(numpy) -BuildRequires: python2dist(nibabel) -BuildRequires: python2dist(pandas) -BuildRequires: python2dist(scikit-learn) -BuildRequires: python2dist(scipy) -BuildRequires: python2dist(seaborn) -BuildRequires: python2dist(six) -# tests_require -BuildRequires: python2dist(nose) -BuildRequires: python2dist(pytest) -%endif - -%description -n python2-%{modname} -Moss is a library of functions, classes, and scripts to that may be useful for -analyzing scientific data. Because this package is developed for neuroimaging -and cognitive science, there is probably some bias towards applications that -are useful in that domain. However, the functions are intended to be written -in as general and lightweight a fashion as possible. - -Python 2 version. - %package -n python3-%{modname} Summary: %{summary} %{?python_provide:%python_provide python3-%{modname}} @@ -69,18 +38,29 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %if %{with check} # install_requires -BuildRequires: python3dist(matplotlib) -BuildRequires: python3dist(munch) -BuildRequires: python3dist(numpy) -BuildRequires: python3dist(nibabel) -BuildRequires: python3dist(pandas) -BuildRequires: python3dist(scikit-learn) -BuildRequires: python3dist(scipy) -BuildRequires: python3dist(seaborn) -BuildRequires: python3dist(six) +BuildRequires: python3dist +BuildRequires: matplotlib +BuildRequires: python3dist +BuildRequires: munch +BuildRequires: python3dist +BuildRequires: numpy +BuildRequires: python3dist +BuildRequires: nibabel +BuildRequires: python3dist +BuildRequires: pandas +BuildRequires: python3dist +BuildRequires: scikit-learn +BuildRequires: python3dist +BuildRequires: scipy +BuildRequires: python3dist +BuildRequires: seaborn +BuildRequires: python3dist +BuildRequires: six # tests_require -BuildRequires: python3dist(nose) -BuildRequires: python3dist(pytest) +BuildRequires: python3dist +BuildRequires: nose +BuildRequires: python3dist +BuildRequires: pytest %endif %description -n python3-%{modname} @@ -97,11 +77,9 @@ Python 3 version. rm -vf licenses/BUNCH_LICENSE moss/external/bunch.py %build -%py2_build %py3_build %install -%py2_install %py3_install # Depends on 'freeview' utility @@ -109,15 +87,9 @@ rm -vf %{buildroot}%{_bindir}/recon_qc %if %{with check} %check -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v %endif -%files -n python2-%{modname} -%license LICENSE licenses/* -%doc README.md -%{python2_sitelib}/%{modname}* - %files -n python3-%{modname} %license LICENSE licenses/* %doc README.md @@ -130,6 +102,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v %{python3_sitelib}/%{modname}* %changelog +* Wed Oct 17 2018 Zbigniew Jędrzejewski-Szmek - 0.5.0-4 +- Subpackage python2-moss has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Jul 14 2018 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild