diff --git a/python-statsmodels.spec b/python-statsmodels.spec index f49e53e..7ea7b47 100644 --- a/python-statsmodels.spec +++ b/python-statsmodels.spec @@ -1,10 +1,9 @@ %global with_python3 1 -# We need python3-pandas %global upname statsmodels Name: python-%{upname} Version: 0.5.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Statistics in Python # Package is licensed under BSD (3 clauses) # except the following files in Public Domain @@ -23,14 +22,12 @@ Patch0: statsmodels-skiptests.patch Patch1: statsmodels-f21-arm.patch # This tests fails in F20 i686, but no in F21 i686 Patch2: statsmodels-f20-32.patch +Patch3: statsmodels-ipython-doc.patch BuildRequires: python2-devel python-nose BuildRequires: numpy scipy Cython python-patsy python-pandas -BuildRequires: python-sphinx python-ipython-console +BuildRequires: python-sphinx python-ipython-sphinx BuildRequires: python-matplotlib -# Included due to bug #1030396 -#BuildRequires: python-matplotlib-qt4 -#BuildRequires: tex-preview Requires: numpy scipy python-patsy python-pandas @@ -56,10 +53,7 @@ This package contains the full API documentation for %{name}. Summary: Statistics in Python BuildRequires: python3-devel python3-nose BuildRequires: python3-numpy python3-scipy python3-Cython python3-patsy python3-pandas -BuildRequires: python3-sphinx python3-matplotlib python3-ipython-console -# Due to bug #1030396 -#BuildRequires: python3-matplotlib-qt4 -#BuildRequires: tex-preview +BuildRequires: python3-sphinx python3-matplotlib python-ipython-sphinx Requires: python3-numpy python3-scipy python3-patsy python3-pandas @@ -88,6 +82,8 @@ This package contains the full API documentation for %{name}. %ifarch %{ix86} %patch2 -p1 %endif +%patch3 -p1 + # Remove cython generated code, doesn't work with python3.4 # C files are regenerated pushd statsmodels @@ -127,8 +123,8 @@ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' %build CFLAGS="%{optflags}" %{__python2} setup.py build -#%{__python2} setup.py build_sphinx -#rm -f build/sphinx/html/.buildinfo +%{__python2} setup.py build_sphinx +rm -f build/sphinx/html/.buildinfo %if 0%{?with_python3} pushd %{py3dir} @@ -137,8 +133,8 @@ CFLAGS="%{optflags}" %{__python3} setup.py build #%{__python3} setup.py build_sphinx popd # Copying the python2 docs for the moment -#mkdir -p docs/_build3/ -#cp -a build/sphinx/html build/sphinx3 +mkdir -p build/sphinx3 +cp -a build/sphinx/html build/sphinx3 %endif # with_python3 %install @@ -184,8 +180,7 @@ popd %{python2_sitearch}/* %files doc -%doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets -#doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples build/sphinx/html LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets +%doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples build/sphinx/html LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets %if 0%{?with_python3} %files -n python3-%{upname} @@ -193,8 +188,7 @@ popd %{python3_sitearch}/* %files -n python3-%{upname}-doc -%doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets -#doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples build/sphinx3/html LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets +%doc LICENSE.txt COPYRIGHTS.txt README_l1.txt README.txt examples build/sphinx3/html LICENSE.libqsturng.txt LICENSE.statsmodels.txt README.datasets.txt COPYING.datasets %endif # with_python3 diff --git a/statsmodels-ipython-doc.patch b/statsmodels-ipython-doc.patch new file mode 100644 index 0000000..c1f25c1 --- /dev/null +++ b/statsmodels-ipython-doc.patch @@ -0,0 +1,14 @@ +diff -ur a/docs/source/conf.py b/docs/source/conf.py +--- a/docs/source/conf.py 2014-06-17 16:38:31.727477317 +0200 ++++ b/docs/source/conf.py 2014-06-17 16:39:35.234998082 +0200 +@@ -32,8 +32,8 @@ + 'sphinx.ext.inheritance_diagram', + 'matplotlib.sphinxext.plot_directive', + 'matplotlib.sphinxext.only_directives', +- 'ipython_console_highlighting', +- 'ipython_directive', ++ 'IPython.sphinxext.ipython_console_highlighting', ++ 'IPython.sphinxext.ipython_directive', + 'numpy_ext.numpydoc', + 'github' # for GitHub links + ]