#2 Fix FTBFS
Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.
rpms/ churchyard/python-nipy py37  into  master

file modified
+1

@@ -1,2 +1,3 @@ 

  /nipy-0.4.0.tar.gz

  /nipy-0.4.1.tar.gz

+ /nipy-0.4.2.tar.gz

file modified
+18 -45

@@ -3,8 +3,8 @@ 

  %global _docdir_fmt %{name}

  

  Name:           python-%{modname}

- Version:        0.4.1

- Release:        7%{?dist}

+ Version:        0.4.2

+ Release:        1%{?dist}

  Summary:        Neuroimaging in Python FMRI analysis package

  

  License:        BSD

@@ -20,29 +20,6 @@ 

  The aim of NIPY is to produce a platform-independent Python environment for the

  analysis of functional brain imaging data using an open development model.

  

- %package -n python2-%{modname}

- Summary:        %{summary}

- %{?python_provide:%python_provide python2-%{modname}}

- BuildRequires:  python2-devel python2-setuptools

- BuildRequires:  python2-numpy python2-scipy python2-nibabel python2-sympy

- BuildRequires:  python2-Cython

- # Test deps

- BuildRequires:  python2-nose

- BuildRequires:  python2-six python2-transforms3d

- BuildRequires:  nipy-data

- Requires:       python2-numpy python2-scipy python2-nibabel python2-sympy

- Requires:       python2-six python2-transforms3d

- Requires:       python2-matplotlib

- Suggests:       nipy-data

- 

- %description -n python2-%{modname}

- Neuroimaging tools for Python.

- 

- The aim of NIPY is to produce a platform-independent Python environment for the

- analysis of functional brain imaging data using an open development model.

- 

- Python 2 version.

- 

  %package -n python3-%{modname}

  Summary:        %{summary}

  %{?python_provide:%python_provide python3-%{modname}}

@@ -51,10 +28,16 @@ 

  BuildRequires:  python3-Cython

  # Test deps

  BuildRequires:  python3-nose

- BuildRequires:  python3-six python3-transforms3d

+ BuildRequires:  python3-six

+ BuildRequires:  python3-transforms3d

  BuildRequires:  nipy-data

- Requires:       python3-numpy python3-scipy python3-nibabel python3-sympy

- Requires:       python3-six python3-transforms3d

+ Requires:       python3-configobj

+ Requires:       python3-numpy

+ Requires:       python3-scipy

+ Requires:       python3-nibabel

+ Requires:       python3-sympy

+ Requires:       python3-six

+ Requires:       python3-transforms3d

  Requires:       python3-matplotlib

  Suggests:       nipy-data

  

@@ -91,19 +74,16 @@ 

  %build

  export NIPY_EXTERNAL_LAPACK=1

  

- %py2_build

  %py3_build

  

  %install

  export NIPY_EXTERNAL_LAPACK=1

  

  %py3_install

- %py2_install

  

- find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod 755 {} ';'

  find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'

  

- find %{buildroot}%{python2_sitearch}/%{modname}/ %{buildroot}%{python3_sitearch}/%{modname}/ -name '*.py' -type f > tmp

+ find %{buildroot}%{python3_sitearch}/%{modname}/ -name '*.py' -type f > tmp

  while read lib

  do

   sed -i '1{\@^#!/usr/bin/env python@d}' $lib

@@ -126,14 +106,8 @@ 

  nipy/modalities/fmri/tests/dct_100.txt                     \

  )

  

- pushd build/lib.*-%{python2_version}

-   for i in ${TESTING_DATA[@]}

-   do

-     mkdir -p ./${i%/*}/

-     cp -a ../../$i ./$i

-   done

-   nosetests-%{python2_version} -v %{?skip_tests:-e %{skip_tests}} -I test_scripts.py

- popd

+ # It seems like this is checking some internals of sympy that were changed:

+ %global skip_tests test_implemented_function

  

  pushd build/lib.*-%{python3_version}

    for i in ${TESTING_DATA[@]}

@@ -144,11 +118,6 @@ 

    PATH="%{buildroot}%{_bindir}:$PATH" nosetests-%{python3_version} -v %{?skip_tests:-e %{skip_tests}}

  popd

  

- %files -n python2-%{modname}

- %license LICENSE

- %doc README.rst AUTHOR THANKS examples

- %{python2_sitearch}/%{modname}*

- 

  %files -n python3-%{modname}

  %license LICENSE

  %doc README.rst AUTHOR THANKS examples

@@ -160,6 +129,10 @@ 

  %{python3_sitearch}/%{modname}*

  

  %changelog

+ * Tue Aug 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-1

+ - Update to 0.4.2

+ - Remove python2 subpackage

+ 

  * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-7

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (nipy-0.4.1.tar.gz) = fa0b5d1834c49d23d29c053ca5995f4941981486293290c738f7ac672ad5402cd2b8d867c2abf410a5569411200da38d8abfc5c9c363be22d48f61e732de279d

+ SHA512 (nipy-0.4.2.tar.gz) = 730654e422c9fd15c0abf7ce0e0cb5e9569788527a35e9cc6deb71e2384b0ed2dbbf82f9eafe9cd739647bb1dc3a3d43606d0244fae5accd0896f1fc5bb3a8cc

  • Update to 0.4.2
  • Remove python2 subpackage
  • Skip one test
  • Add unbundled stuff to requires

This needs https://src.fedoraproject.org/rpms/sympy/pull-request/2

Pull-Request has been merged by churchyard

2 years ago