diff --git a/.gitignore b/.gitignore index 14c80b4..8aee80d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /patsy-0.2.1.tar.gz +/patsy-0.3.0.zip diff --git a/python-patsy.spec b/python-patsy.spec index 2b26387..3277406 100644 --- a/python-patsy.spec +++ b/python-patsy.spec @@ -2,8 +2,8 @@ %global with_python3 1 Name: python-%{upname} -Version: 0.2.1 -Release: 6%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: Describing statistical models in Python using symbolic formulas Group: Development/Languages @@ -12,27 +12,22 @@ Group: Development/Languages License: BSD and Python URL: https://github.com/pydata/patsy -Source0: https://pypi.python.org/packages/source/p/patsy/patsy-%{version}.tar.gz -# Disable test if pandas not present -Patch0: patsy-nopandas.patch -# Fix for IPython 2.x -# https://github.com/pydata/patsy/commit/5a94297e46a02b8940f520d92e777bdbf6b42822 -Patch1: patsy-ipython-doc.patch +Source0: https://pypi.python.org/packages/source/p/patsy/patsy-%{version}.zip BuildArch: noarch BuildRequires: python2-devel python-nose +BuildRequires: python-six # For the docs BuildRequires: python-sphinx -%if 0%{?fedora} >= 21 BuildRequires: python-ipython-sphinx -%endif BuildRequires: numpy # For splines BuildRequires: scipy BuildRequires: python-pandas Requires: numpy scipy python-pandas +Requires: python-six %description A Python package for describing statistical models and for building design @@ -50,16 +45,16 @@ This package contains the full API documentation for %{name}. %package -n python3-%{upname} Summary: Describing statistical models in Python using symbolic formulas BuildRequires: python3-devel +BuildRequires: python3-six BuildRequires: python3-numpy python3-scipy python3-pandas BuildRequires: python3-nose # For the docs BuildRequires: python3-sphinx -%if 0%{?fedora} >= 21 BuildRequires: python3-ipython-sphinx -%endif Requires: python3-numpy python3-scipy python3-pandas +Requires: python3-six %description -n python3-%{upname} A Python package for describing statistical models and for building design @@ -77,10 +72,6 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n %{upname}-%{version} -%patch0 -p1 -%if 0%{?fedora} >= 21 -%patch1 -p1 -%endif %if 0%{?with_python3} rm -rf %{py3dir} @@ -92,7 +83,6 @@ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' %build %{__python2} setup.py build -# Doc creation broken due to new ipython %{__python2} setup.py build_sphinx rm -f build/sphinx/html/.buildinfo @@ -124,22 +114,26 @@ popd %endif # with_python3 %files -%doc LICENSE.txt README TODO +%doc LICENSE.txt README.rst TODO %{python2_sitelib}/patsy* %files doc -%doc LICENSE.txt README TODO build/sphinx/html +%doc LICENSE.txt README.rst TODO build/sphinx/html %if 0%{?with_python3} %files -n python3-%{upname} -%doc LICENSE.txt README TODO +%doc LICENSE.txt README.rst TODO %{python3_sitelib}/patsy* %files -n python3-%{upname}-doc -%doc LICENSE.txt README TODO build/sphinx/html +%doc LICENSE.txt README.rst TODO build/sphinx/html %endif # with_python3 %changelog +* Mon Jul 21 2014 Sergio Pascual - 0.3.0-1 +- New upstream source (0.3.0) +- Removed patches + * Tue Jun 17 2014 Sergio Pascual - 0.2.1-6 - Doc generation enabled, patch from upstream diff --git a/sources b/sources index 16c98a9..2b7f3e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea36c846d62231e41df684a827a5fd58 patsy-0.2.1.tar.gz +7545518b413136ba8343dcebea07e5e2 patsy-0.3.0.zip