diff --git a/.gitignore b/.gitignore index b02b35c..947ac3d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /scikit-learn-0.15.0.tar.gz /scikit-learn-0.15.1.tar.gz /scikit-learn-0.15.2.tar.gz +/scikit-learn-0.16.0.tar.gz diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec index 3f38abf..faca91b 100644 --- a/python-scikit-learn.spec +++ b/python-scikit-learn.spec @@ -2,8 +2,8 @@ %global with_python3 1 Name: python-scikit-learn -Version: 0.15.2 -Release: 2%{?dist} +Version: 0.16.0 +Release: 1%{?dist} Summary: Machine learning in Python License: BSD @@ -12,18 +12,14 @@ Source0: https://pypi.python.org/packages/source/s/scikit-learn/%{upname}-%{vers Source1: system-six.py Source2: system-joblib.py Patch0: sklearn-unbundle-joblib.patch -Patch1: sklearn-unbundle-cblas.patch BuildRequires: python2-devel BuildRequires: numpy scipy python-nose python-matplotlib -BuildRequires: python-joblib >= 0.8.0 +BuildRequires: python-joblib >= 0.8.2 BuildRequires: python-six >= 1.4.1 BuildRequires: atlas-devel blas-devel BuildRequires: Cython python-pillow -Requires: numpy scipy python-joblib >= 0.8.0 - -# we don't want to provide private python extension libs -%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ +Requires: numpy scipy python-joblib >= 0.8.2 %description Scikit-learn integrates machine learning algorithms in the tightly-knit @@ -37,11 +33,11 @@ efficient, accessible to everybody, and reusable in various contexts. Summary: Machine learning in Python BuildRequires: python3-devel python3-nose BuildRequires: python3-numpy python3-scipy python3-matplotlib -BuildRequires: python3-joblib >= 0.8.0 +BuildRequires: python3-joblib >= 0.8.2 BuildRequires: python3-six >= 1.4.1 BuildRequires: atlas-devel blas-devel BuildRequires: python3-Cython python3-pillow -Requires: python3-numpy python3-scipy python3-joblib >= 0.8.0 +Requires: python3-numpy python3-scipy python3-joblib >= 0.8.2 %description -n python3-%{upname} Scikit-learn integrates machine learning algorithms in the tightly-knit @@ -55,7 +51,6 @@ efficient, accessible to everybody, and reusable in various contexts. %setup -n %{upname}-%{version} -q %patch0 -p1 -%patch1 -p1 # Code to load system six and joblib at runtime mkdir sklearn/externals/bundled @@ -66,9 +61,10 @@ mv sklearn/externals/test_externals_setup.py sklearn/externals/bundled cp %{SOURCE1} sklearn/externals/six.py cp %{SOURCE2} sklearn/externals/joblib.py -rm -rf sklearn/src/cblas +# Remove the source code of the bundled blas library +rm -rf sklearn/src/cblas/* -chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py +#chmod -x examples/decomposition/plot_pca_vs_fa_model_selection.py find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' @@ -90,38 +86,43 @@ popd %install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} +%{__python3} setup.py install --skip-build --root %{buildroot} popd %endif # with_python3 -%{__python2} setup.py install --skip-build --root %{buildroot} +%{__python2} setup.py install --skip-build --root %{buildroot} find %{buildroot} -name "*.so" | xargs chmod 755 %check %if 0%{?with_python3} - pushd %{buildroot}/%{python3_sitearch} +pushd %{buildroot}/%{python3_sitearch} nosetests-%{python3_version} -x sklearn - popd +popd %endif # with_python3 -pushd %{buildroot}/%{python_sitearch} +pushd %{buildroot}/%{python2_sitearch} nosetests-%{python2_version} -x sklearn popd %files -%doc examples/ AUTHORS.rst README.rst COPYING +%doc examples/ AUTHORS.rst README.rst +%license COPYING %{python2_sitearch}/sklearn %{python2_sitearch}/scikit_learn-*.egg-info %if 0%{?with_python3} %files -n python3-%{upname} -%doc examples/ AUTHORS.rst README.rst COPYING +%doc examples/ AUTHORS.rst README.rst +%license COPYING %{python3_sitearch}/sklearn %{python3_sitearch}/scikit_learn-*.egg-info %endif # with_python3 %changelog +* Thu Apr 09 2015 Sergio Pascual - 0.16.0-1 +- New upstream (0.16.0) + * Tue Sep 16 2014 Sergio Pascual - 0.15.2-2 - Remove patch for broken test (fixed in scipy 0.14.1) diff --git a/sklearn-unbundle-cblas.patch b/sklearn-unbundle-cblas.patch deleted file mode 100644 index 091dcf5..0000000 --- a/sklearn-unbundle-cblas.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur scikit-learn-0.15.0b1/sklearn/cluster/setup.py scikit-learn-0.15.0b1.cblas/sklearn/cluster/setup.py ---- scikit-learn-0.15.0b1/sklearn/cluster/setup.py 2014-06-06 18:29:49.477078831 +0200 -+++ scikit-learn-0.15.0b1.cblas/sklearn/cluster/setup.py 2014-06-06 18:31:40.898010511 +0200 -@@ -29,7 +29,7 @@ - '_k_means', - libraries=cblas_libs, - sources=['_k_means.c'], -- include_dirs=[join('..', 'src', 'cblas'), -+ include_dirs=[ - numpy.get_include(), - blas_info.pop('include_dirs', [])], - extra_compile_args=blas_info.pop('extra_compile_args', []), -diff -ur scikit-learn-0.15.0b1/sklearn/linear_model/setup.py scikit-learn-0.15.0b1.cblas/sklearn/linear_model/setup.py ---- scikit-learn-0.15.0b1/sklearn/linear_model/setup.py 2014-06-06 18:29:49.430078438 +0200 -+++ scikit-learn-0.15.0b1.cblas/sklearn/linear_model/setup.py 2014-06-06 18:32:13.443283001 +0200 -@@ -20,7 +20,7 @@ - - config.add_extension('cd_fast', sources=['cd_fast.c'], - libraries=cblas_libs, -- include_dirs=[join('..', 'src', 'cblas'), -+ include_dirs=[ - numpy.get_include(), - blas_info.pop('include_dirs', [])], - extra_compile_args=blas_info.pop('extra_compile_args', -diff -ur scikit-learn-0.15.0b1/sklearn/utils/setup.py scikit-learn-0.15.0b1.cblas/sklearn/utils/setup.py ---- scikit-learn-0.15.0b1/sklearn/utils/setup.py 2014-06-06 18:29:49.399078179 +0200 -+++ scikit-learn-0.15.0b1.cblas/sklearn/utils/setup.py 2014-06-06 18:32:33.203448442 +0200 -@@ -13,7 +13,7 @@ - - cblas_libs, blas_info = get_blas_info() - cblas_compile_args = blas_info.pop('extra_compile_args', []) -- cblas_includes = [join('..', 'src', 'cblas'), -+ cblas_includes = [ - numpy.get_include(), - blas_info.pop('include_dirs', [])] - diff --git a/sklearn-unbundle-joblib.patch b/sklearn-unbundle-joblib.patch index 4f8575b..35083b6 100644 --- a/sklearn-unbundle-joblib.patch +++ b/sklearn-unbundle-joblib.patch @@ -1,14 +1,11 @@ -diff -ur a/sklearn/externals/setup.py b/sklearn/externals/setup.py ---- a/sklearn/externals/setup.py 2014-06-23 17:03:05.831777265 +0200 -+++ b/sklearn/externals/setup.py 2014-06-23 17:03:59.904217048 +0200 -@@ -4,7 +4,8 @@ +diff -ur scikit-learn-0.16.0/sklearn/externals/setup.py scikit-learn-0.16.0.joblib/sklearn/externals/setup.py +--- scikit-learn-0.16.0/sklearn/externals/setup.py 2015-04-09 12:33:08.302385298 +0200 ++++ scikit-learn-0.16.0.joblib/sklearn/externals/setup.py 2015-04-09 12:34:03.614850166 +0200 +@@ -4,6 +4,6 @@ def configuration(parent_package='', top_path=None): from numpy.distutils.misc_util import Configuration config = Configuration('externals', parent_package, top_path) - config.add_subpackage('joblib') -- config.add_subpackage('joblib/test') -+ config.add_subpackage('bundled') + config.add_subpackage('bundled/joblib') -+ config.add_subpackage('bundled/joblib/test') return config diff --git a/sources b/sources index 59a1b7a..3a0aac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9822ad0238e17b382a3c756ea94fe0d scikit-learn-0.15.2.tar.gz +aab04c077f91615137c0da266cf29398 scikit-learn-0.16.0.tar.gz