diff --git a/.gitignore b/.gitignore index 5d0d599..e9bc94a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /elephant-0.6.2.tar.gz /elephant-0.6.4.tar.gz +/elephant-0.10.0.tar.gz diff --git a/python-elephant.spec b/python-elephant.spec index 5f396f9..80d8190 100644 --- a/python-elephant.spec +++ b/python-elephant.spec @@ -1,20 +1,22 @@ -# Docs fail to build -# Reported: https://github.com/NeuralEnsemble/elephant/issues/228 +# Issue filed upstream asking them to not use nose +# https://github.com/NeuralEnsemble/elephant/issues/408 + +# Disabled by default %bcond_with docs -%global pypi_name elephant +# Try to download data, so a few are disabled. +# We test these in mock using --with=net_tests --enable-network +%bcond_with net_tests -%define _binaries_in_noarch_packages_terminate_build 0 +%global pypi_name elephant Name: python-%{pypi_name} -Version: 0.6.4 -Release: 5%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: Elephant is a package for analysis of electrophysiology data in Python License: BSD URL: http://neuralensemble.org/elephant -# Must use github tarball. Test data not included in pypi tar -# https://github.com/NeuralEnsemble/elephant/issues/225 -Source0: https://github.com/neuralensemble/%{pypi_name}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz +Source0: %{pypi_source} BuildArch: noarch # Remove bits from setup.py that try to download fim. @@ -24,15 +26,17 @@ BuildArch: noarch BuildRequires: git-core BuildRequires: python3-devel BuildRequires: python3dist(neo) -BuildRequires: python3dist(nose) BuildRequires: python3dist(numpy) BuildRequires: python3dist(pandas) BuildRequires: python3dist(quantities) BuildRequires: python3dist(scikit-learn) BuildRequires: python3dist(scipy) +BuildRequires: python3dist(statsmodels) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(six) BuildRequires: python3dist(fim) +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(tqdm) %if %{with docs} BuildRequires: python3dist(nbsphinx) @@ -51,7 +55,6 @@ analysis of neurophysiology data, based on Neo. %package -n python3-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} Elephant - Electrophysiology Analysis Toolkit Elephant is a package for the @@ -79,11 +82,8 @@ for lib in $(find . -type f -name "*.py"); do mv $lib.new $lib done -# remove neo version constraints -sed -i 's/neo.*/neo>=0.7.1/' requirements.txt - # Use fim from python-pyfim which is faster -sed -i 's|from elephant.spade_src import fim|import fim|' elephant/spade.py elephant/test/test_spade.py +sed -i 's|from elephant.spade_src import fim|import fim|' elephant/spade.py %build %py3_build @@ -99,12 +99,18 @@ popd %install %py3_install -# %check -# Ignore tests: -# test_unitary_event_analysis: tries to download data -# test_cubic: seems to fail on 32 bit machines. -# Reported upstream: https://github.com/NeuralEnsemble/elephant/issues/227 -# nosetests-3 -I test_unitary_event_analysis.py -I test_cubic.py +%check +# One test fails generally: reported upstream +# https://github.com/NeuralEnsemble/elephant/issues/409 +# Another fails on 32 bit builders: reported upstream +# https://github.com/NeuralEnsemble/elephant/issues/410 +%if %{with net_tests} +pytest-%{python3_version} -k "not test_repr and not test__UE_surrogate" +%else +# Disable tests that download bits +pytest-%{python3_version} -k "not test_repr and not test__UE_surrogate and not test_spike_contrast_with_Izhikevich_network_auto and not test_Riehle_et_al_97_UE" +%endif + %files -n python3-%{pypi_name} %license LICENSE.txt elephant/spade_src/LICENSE @@ -119,6 +125,13 @@ popd %endif %changelog +* Thu Mar 11 2021 Ankur Sinha - 0.10.0-1 +- Update to new release +- Enable all non-network dependent tests +- File bug for failing tests +- Update fim tweak: no longer required in the test file +- include statsmodels dependency + * Wed Jan 27 2021 Fedora Release Engineering - 0.6.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 4db21b5..f426633 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (elephant-0.6.4.tar.gz) = 498e700e9f118742eb51604689b9dea31e076c1b743d1c661d08539fb9884e1b4fb890591430e2a37cb5af4dc5e518a42ff5f0d75f8511ec480a97ec3245c0bd +SHA512 (elephant-0.10.0.tar.gz) = cc10c0e9e44346a97b183408e92b4c5f55b0887e029c1bf4222473253297507e89f2af15210fb58e84adc90d7448bff97b28f814f2b6a072f06ae9049eaa6580