Hello community,
here is the log from the commit of package python3-jupyter_ipython for
openSUSE:Factory checked in at 2016-11-12 13:02:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-jupyter_ipython (Old)
and /work/SRC/openSUSE:Factory/.python3-jupyter_ipython.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-jupyter_ipython"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python3-jupyter_ipython/python3-jupyter_ipython.changes
2016-10-28 10:45:13.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-jupyter_ipython.new/python3-jupyter_ipython.changes
2016-11-12 13:02:44.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Nov 10 16:17:49 UTC 2016 - toddrme2...@gmail.com
+
+- Update do_not_reload_numpy_globals.patch to really fix errors
+ in iptest.
+
+-------------------------------------------------------------------
+Tue Nov 1 20:56:09 UTC 2016 - toddrme2...@gmail.com
+
+- Add do_not_reload_numpy_globals.patch to fix errors in iptest.
+
+-------------------------------------------------------------------
New:
----
do_not_reload_numpy_globals.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-jupyter_ipython-doc.spec ++++++
--- /var/tmp/diff_new_pack.SeHkm9/_old 2016-11-12 13:02:45.000000000 +0100
+++ /var/tmp/diff_new_pack.SeHkm9/_new 2016-11-12 13:02:45.000000000 +0100
@@ -46,6 +46,7 @@
BuildRequires: python3-nose
BuildRequires: python3-numpydoc
BuildRequires: python3-requests
+BuildRequires: python3-jupyter_ipython-iptest = %{version}
%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} >
1110 )
BuildRequires: python3-Sphinx-latex
%endif
@@ -86,8 +87,9 @@
%fdupes %{buildroot}%{_docdir}/python3-jupyter_ipython/html/
%check
+mkdir temp
+pushd temp
export LANG="en_US.UTF-8"
-pushd docs
iptest
popd
++++++ python3-jupyter_ipython.spec ++++++
--- /var/tmp/diff_new_pack.SeHkm9/_old 2016-11-12 13:02:45.000000000 +0100
+++ /var/tmp/diff_new_pack.SeHkm9/_new 2016-11-12 13:02:45.000000000 +0100
@@ -24,6 +24,8 @@
Group: Development/Languages/Python
Url: http://ipython.org
Source:
https://files.pythonhosted.org/packages/source/i/ipython/ipython-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM do_not_reload_numpy_globals.patch -- disable reloading
numpy _globals which is now forbidden
https://github.com/ipython/ipython/issues/9983 and
https://github.com/ipython/ipython/pull/9988
+Patch0: do_not_reload_numpy_globals.patch
BuildRequires: fdupes
BuildRequires: python3-backports.shutil_get_terminal_size
BuildRequires: python3-decorator
@@ -109,6 +111,7 @@
%prep
%setup -q -n ipython-%{version}
+%patch0 -p1
%build
python3 setup.py build
++++++ do_not_reload_numpy_globals.patch ++++++
>From 181f693e103e44b0c1f95b6092490de9c92d34e5 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <tho...@kluyver.me.uk>
Date: Fri, 7 Oct 2016 15:43:55 +0100
Subject: [PATCH] Exclude numpy._globals from deepreload
Closes gh-9983, though not in a terribly satisfying way.
---
IPython/lib/deepreload.py | 3 ++-
IPython/lib/tests/test_deepreload.py | 29 ++---------------------------
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
index 9795eac..572ce78 100644
--- a/IPython/lib/deepreload.py
+++ b/IPython/lib/deepreload.py
@@ -327,7 +327,8 @@ def deep_reload_hook(m):
original_reload = imp.reload # Python 3
# Replacement for reload()
-def reload(module, exclude=('sys', 'os.path', builtin_mod_name, '__main__')):
+def reload(module, exclude=('sys', 'os.path', builtin_mod_name, '__main__',
+ 'numpy', 'numpy._globals')):
"""Recursively reload all modules used in the given module. Optionally
takes a list of modules to exclude from reloading. The default exclude
list contains sys, __main__, and __builtin__, to prevent, e.g., resetting
diff --git a/IPython/lib/tests/test_deepreload.py
b/IPython/lib/tests/test_deepreload.py
index 50fc66c..abc57a3 100644
--- a/IPython/lib/tests/test_deepreload.py
+++ b/IPython/lib/tests/test_deepreload.py
@@ -1,42 +1,17 @@
# -*- coding: utf-8 -*-
"""Test suite for the deepreload module."""
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
import os
import nose.tools as nt
-from IPython.testing import decorators as dec
-from IPython.utils.py3compat import builtin_mod_name, PY3
from IPython.utils.syspathcontext import prepended_to_syspath
from IPython.utils.tempdir import TemporaryDirectory
from IPython.lib.deepreload import reload as dreload
-#-----------------------------------------------------------------------------
-# Test functions begin
-#-----------------------------------------------------------------------------
-
-@dec.skipif_not_numpy
-def test_deepreload_numpy():
- "Test that NumPy can be deep reloaded."
- import numpy
- # TODO: Find a way to exclude all standard library modules from reloading.
- exclude = [
- # Standard exclusions:
- 'sys', 'os.path', builtin_mod_name, '__main__',
- # Test-related exclusions:
- 'unittest', 'UserDict', '_collections_abc', 'tokenize',
- 'collections', 'collections.abc',
- 'importlib', 'importlib.machinery', '_imp',
- 'importlib._bootstrap', 'importlib._bootstrap_external',
- '_frozen_importlib', '_frozen_importlib_external',
- ]
-
- dreload(numpy, exclude=exclude)
-
def test_deepreload():
"Test that dreload does deep reloads and skips excluded modules."
with TemporaryDirectory() as tmpdir:
