[scikit-learn] 02/02: New upstream version
Andreas Tille
tille at debian.org
Thu Dec 29 12:42:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository scikit-learn.
commit 09aa89dc4ef28ea391dc9737686c0c2ccdcdb82c
Author: Andreas Tille <tille at debian.org>
Date: Thu Dec 29 13:15:28 2016 +0100
New upstream version
---
debian/changelog | 3 ++-
debian/patches/deb_disable_google_anals | 2 +-
debian/patches/deb_no_google_analytics | 2 +-
debian/patches/deb_no_plot_gallery | 2 +-
debian/patches/deb_no_tinyclues_external_image | 4 ++--
debian/patches/deb_nopaypal | 4 ++--
debian/patches/deb_optional_linkcode | 7 ++++---
debian/patches/deb_skip_some_tests_on_arm | 2 +-
debian/patches/deb_tests_lower_precision | 2 +-
debian/patches/deb_use_system_joblib | 29 +++++++++++---------------
debian/patches/up_workaround_buggy_pil | 2 +-
11 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index af5961a..6ca808d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-scikit-learn (0.18-6) UNRELEASED; urgency=medium
+scikit-learn (0.18.1-1) UNRELEASED; urgency=medium
* Fix watch file
+ * new upstream version
-- Andreas Tille <tille at debian.org> Thu, 29 Dec 2016 11:00:07 +0100
diff --git a/debian/patches/deb_disable_google_anals b/debian/patches/deb_disable_google_anals
index 18b23c1..ada7b04 100644
--- a/debian/patches/deb_disable_google_anals
+++ b/debian/patches/deb_disable_google_anals
@@ -1,6 +1,6 @@
--- a/doc/themes/scikit-learn/layout.html
+++ b/doc/themes/scikit-learn/layout.html
-@@ -351,14 +351,8 @@
+@@ -348,14 +348,8 @@
</script>
{% endif %}
diff --git a/debian/patches/deb_no_google_analytics b/debian/patches/deb_no_google_analytics
index 0b90fb8..f234e9c 100644
--- a/debian/patches/deb_no_google_analytics
+++ b/debian/patches/deb_no_google_analytics
@@ -14,7 +14,7 @@ Last-Update: 2013-11-24
--- a/doc/conf.py
+++ b/doc/conf.py
-@@ -129,7 +129,7 @@ html_theme = 'scikit-learn'
+@@ -130,7 +130,7 @@ html_theme = 'scikit-learn'
# further. For a list of options available for each theme, see the
# documentation.
html_theme_options = {'oldversion': False, 'collapsiblesidebar': True,
diff --git a/debian/patches/deb_no_plot_gallery b/debian/patches/deb_no_plot_gallery
index a39d10e..331946a 100644
--- a/debian/patches/deb_no_plot_gallery
+++ b/debian/patches/deb_no_plot_gallery
@@ -1,6 +1,6 @@
--- a/doc/conf.py
+++ b/doc/conf.py
-@@ -61,7 +61,10 @@ source_suffix = '.rst'
+@@ -62,7 +62,10 @@ source_suffix = '.rst'
#source_encoding = 'utf-8'
# Generate the plots for the gallery
diff --git a/debian/patches/deb_no_tinyclues_external_image b/debian/patches/deb_no_tinyclues_external_image
index 2434b96..f319e86 100644
--- a/debian/patches/deb_no_tinyclues_external_image
+++ b/debian/patches/deb_no_tinyclues_external_image
@@ -7,7 +7,7 @@ Last-Update: 2015-11-05
--- a/doc/about.rst
+++ b/doc/about.rst
-@@ -166,49 +166,12 @@ for code sprints, as well as towards the
+@@ -178,49 +178,12 @@ for code sprints, as well as towards the
The 2013 Paris international sprint
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -22,7 +22,7 @@ Last-Update: 2015-11-05
- <div style="text-align: center; margin: -7px 0 -10px 0;">
-
-
--.. |telecom| image:: http://f.hypotheses.org/wp-content/blogs.dir/331/files/2011/03/Logo-TPT.jpg
+-.. |telecom| image:: themes/scikit-learn/static/img/telecom.png
- :width: 120pt
- :target: http://www.telecom-paristech.fr/
-
diff --git a/debian/patches/deb_nopaypal b/debian/patches/deb_nopaypal
index 6e1cbfd..c6ad39c 100644
--- a/debian/patches/deb_nopaypal
+++ b/debian/patches/deb_nopaypal
@@ -1,6 +1,6 @@
--- a/doc/about.rst
+++ b/doc/about.rst
-@@ -127,7 +127,8 @@ Donating to the project
+@@ -139,7 +139,8 @@ Donating to the project
~~~~~~~~~~~~~~~~~~~~~~~
If you are interested in donating to the project or to one of our code-sprints, you can use
@@ -10,7 +10,7 @@
All donations will be handled by `NumFOCUS
<http://www.numfocus.org>`_, a non-profit-organization which is
-@@ -140,24 +141,6 @@ the project funded and available while i
+@@ -152,24 +153,6 @@ the project funded and available while i
The received donations for the scikit-learn project mostly will go towards covering travel-expenses
for code sprints, as well as towards the organization budget of the project [#f1]_.
diff --git a/debian/patches/deb_optional_linkcode b/debian/patches/deb_optional_linkcode
index cf5d11d..1c31a5e 100644
--- a/debian/patches/deb_optional_linkcode
+++ b/debian/patches/deb_optional_linkcode
@@ -1,12 +1,13 @@
--- a/doc/conf.py
+++ b/doc/conf.py
-@@ -33,10 +33,17 @@ import sphinx_gallery
+@@ -33,11 +33,18 @@ import sphinx_gallery
extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autosummary',
'numpy_ext.numpydoc',
- 'sphinx.ext.linkcode', 'sphinx.ext.doctest',
-+ 'sphinx.ext.doctest',
++ 'sphinx.ext.linkcode',
'sphinx_gallery.gen_gallery',
+ 'sphinx_issues',
]
+if make_linkcode_resolve:
@@ -19,7 +20,7 @@
# pngmath / imgmath compatibility layer for different sphinx versions
import sphinx
from distutils.version import LooseVersion
-@@ -279,7 +286,8 @@ def setup(app):
+@@ -287,7 +294,8 @@ def setup(app):
# The following is used by sphinx.ext.linkcode to provide links to github
diff --git a/debian/patches/deb_skip_some_tests_on_arm b/debian/patches/deb_skip_some_tests_on_arm
index 88df24b..46326a9 100644
--- a/debian/patches/deb_skip_some_tests_on_arm
+++ b/debian/patches/deb_skip_some_tests_on_arm
@@ -1,6 +1,6 @@
--- a/sklearn/feature_extraction/tests/test_text.py
+++ b/sklearn/feature_extraction/tests/test_text.py
-@@ -352,6 +352,10 @@ def test_tfidf_no_smoothing():
+@@ -348,6 +348,10 @@ def test_tfidf_no_smoothing():
numpy_provides_div0_warning = len(w) == 1
in_warning_message = 'divide by zero'
diff --git a/debian/patches/deb_tests_lower_precision b/debian/patches/deb_tests_lower_precision
index 6865319..1ccc949 100644
--- a/debian/patches/deb_tests_lower_precision
+++ b/debian/patches/deb_tests_lower_precision
@@ -1,6 +1,6 @@
--- a/sklearn/feature_selection/tests/test_from_model.py
+++ b/sklearn/feature_selection/tests/test_from_model.py
-@@ -92,7 +92,7 @@ def test_feature_importances():
+@@ -93,7 +93,7 @@ def test_feature_importances():
importances = transformer.estimator_.feature_importances_
transformer.fit(X, y, sample_weight=3 * sample_weight)
importances_bis = transformer.estimator_.feature_importances_
diff --git a/debian/patches/deb_use_system_joblib b/debian/patches/deb_use_system_joblib
index 169861c..958c9e7 100644
--- a/debian/patches/deb_use_system_joblib
+++ b/debian/patches/deb_use_system_joblib
@@ -3,25 +3,9 @@ Subject: use system-wide joblib and do not attempt to install joblib/test
Relies on DFSG-ed sources with no joblib present
---- /dev/null
-+++ b/sklearn/externals/joblib/__init__.py
-@@ -0,0 +1,4 @@
-+# yoh: use system-wide joblib
-+# replace local name space with the one from system-wide joblib
-+import joblib
-+locals().update(joblib.__dict__)
--- a/sklearn/metrics/pairwise.py
+++ b/sklearn/metrics/pairwise.py
-@@ -24,7 +24,7 @@ from ..utils.extmath import row_norms, s
- from ..preprocessing import normalize
- from ..externals.joblib import Parallel
- from ..externals.joblib import delayed
--from ..externals.joblib.parallel import cpu_count
-+from ..externals.joblib import parallel
-
- from .pairwise_fast import _chi2_kernel_fast, _sparse_manhattan
-
-@@ -1068,7 +1068,7 @@ def _parallel_pairwise(X, Y, func, n_job
+@@ -1073,7 +1073,7 @@ def _parallel_pairwise(X, Y, func, n_job
"""Break the pairwise matrix in n_jobs even slices
and compute them in parallel"""
if n_jobs < 0:
@@ -30,3 +14,14 @@ Subject: use system-wide joblib and do not attempt to install joblib/test
if Y is None:
Y = X
+---- sklearn/metrics/pairwise.py
+-+++ sklearn/metrics/pairwise.py
+-@@ -24,7 +24,7 @@ from ..utils.extmath import row_norms, s
+- from ..preprocessing import normalize
+- from ..externals.joblib import Parallel
+- from ..externals.joblib import delayed
+--from ..externals.joblib.parallel import cpu_count
+-+from ..externals.joblib import parallel
+-
+- from .pairwise_fast import _chi2_kernel_fast, _sparse_manhattan
+-
diff --git a/debian/patches/up_workaround_buggy_pil b/debian/patches/up_workaround_buggy_pil
index 6e75c6c..a5a2d64 100644
--- a/debian/patches/up_workaround_buggy_pil
+++ b/debian/patches/up_workaround_buggy_pil
@@ -4,7 +4,7 @@ Last-Update: 2014-10-07
--- a/sklearn/datasets/lfw.py
+++ b/sklearn/datasets/lfw.py
-@@ -168,7 +168,7 @@ def _load_imgs(file_paths, slice_, color
+@@ -170,7 +170,7 @@ def _load_imgs(file_paths, slice_, color
face = np.asarray(img[slice_], dtype=np.float32)
face /= 255.0 # scale uint8 coded colors to the [0.0, 1.0] floats
if resize is not None:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scikit-learn.git
More information about the debian-science-commits
mailing list