#2 Remove python2 subpackage
Merged 5 years ago by ignatenkobrain. Opened 5 years ago by churchyard.
rpms/ churchyard/python-pywt nopy  into  master

file modified
+5 -35
@@ -4,7 +4,7 @@ 

  

  Name:           python-%{modname}

  Version:        1.0.1

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        PyWavelets, wavelet transform module

  License:        MIT

  URL:            https://pywavelets.readthedocs.io/en/latest
@@ -33,28 +33,6 @@ 

  %description doc

  Documentation for %{name}.

  

- %package -n python2-%{modname}

- Summary:        %{summary}

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

- BuildRequires:  python2-devel

- BuildRequires:  python2-setuptools

- BuildRequires:  python2-Cython

- BuildRequires:  python2dist(numpy) >= 1.9.1

- BuildRequires:  python2-nose

- 

- %description -n python2-%{modname}

- PyWavelets is a Python wavelet transforms module that can do:

- 

- * 1D and 2D Forward and Inverse Discrete Wavelet Transform (DWT and IDWT)

- * 1D and 2D Stationary Wavelet Transform (Undecimated Wavelet Transform)

- * 1D and 2D Wavelet Packet decomposition and reconstruction

- * Computing Approximations of wavelet and scaling functions

- * Over seventy built-in wavelet filters and support for custom wavelets

- * Single and double precision calculations

- * Results compatibility with Matlab Wavelet Toolbox

- 

- Python 2 version.

- 

  %package -n python3-%{modname}

  Summary:        %{summary}

  %{?python_provide:%python_provide python3-%{modname}}
@@ -83,17 +61,15 @@ 

  sed -i '1{\@^#!/usr/bin/env python@d}' %{modname}/tests/*.py 

  

  %build

- %py2_build -- --force

  %py3_build -- --force

  

  pushd doc

    export PYTHONPATH=`readlink -f ../build/lib.*-%{python3_version}`

-   make html SPHINXBUILD=sphinx-build-%{python3_version}

+   make html SPHINXBUILD=sphinx-build-3

any specific reason for this?

I've just seen this and thought it's needlessly complicated. But it's out fo scope here and I can remove that bit if you really like me to.

    find -name '.buildinfo' -delete

  popd

  

  %install

- %py2_install

  %py3_install

  

  %check
@@ -101,9 +77,6 @@ 

  mkdir -p matplotlib

  touch matplotlib/matplotlibrc

  export XDG_CONFIG_HOME=`pwd`

- pushd %{buildroot}/%{python2_sitearch}

-   xvfb-run -a nosetests-%{python2_version} pywt -verbose --no-byte-compile

- popd

  pushd %{buildroot}/%{python3_sitearch}

    xvfb-run -a nosetests-%{python3_version} pywt -verbose --no-byte-compile

  popd
@@ -111,12 +84,6 @@ 

  %files doc

  %doc doc/build/html

  

- %files -n python2-%{modname}

- %license LICENSE

- %doc README.rst

- %{python2_sitearch}/%{modname}/

- %{python2_sitearch}/%{pkgname}*.egg-info

- 

  %files -n python3-%{modname}

  %license LICENSE

  %doc README.rst
@@ -124,6 +91,9 @@ 

  %{python3_sitearch}/%{pkgname}*.egg-info

  

  %changelog

+ * Fri Oct 05 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-2

+ - Remove python2 subpackage

+ 

  * Tue Sep 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.1-1

  - Update to 1.0.1

  

no initial comment

any specific reason for this?

I've just seen this and thought it's needlessly complicated. But it's out fo scope here and I can remove that bit if you really like me to.

Pull-Request has been merged by ignatenkobrain

5 years ago