[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.11-1-25-g7ddd407
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at debian.org
Mon Oct 31 17:25:57 UTC 2011
The following commit has been merged in the master branch:
commit cc5d0b0f931a7a6040b0698cd0a558fa9de3a410
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Mon Oct 31 17:13:13 2011 +0100
refresh the patch series
diff --git a/debian/changelog b/debian/changelog
index be6405a..7f9487e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
spyder (2.1.0-1) UNRELEASED; urgency=low
+ * Import Upstream version 2.1.0 (Closes: #636726)
* use the old upstream url http://code.google.com/p/spyder/
until the transition is done.
* debian/control
@@ -11,8 +12,6 @@ spyder (2.1.0-1) UNRELEASED; urgency=low
* debian/patches
- 0001-fix-documentation-installation.patch (updated)
build the sphinx documentation only once.
- - 0002-feature-forwarded-fix-for-ipython-0.11.patch (new)
- Thanks Julian Taylor for the patch (Closes: #636726)
-- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 31 Oct 2011 12:43:34 +0200
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 36c8b22..d6faf21 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -1,36 +1,37 @@
From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sat, 6 Aug 2011 10:39:46 +0200
+Date: Mon, 31 Oct 2011 17:10:37 +0100
Subject: fix-documentation-installation
---
- setup.py | 2 --
- spyderlib/config.py | 2 +-
- 2 files changed, 1 insertions(+), 3 deletions(-)
+ setup.py | 4 ++--
+ spyderlib/__init__.py | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
-index b2a6754..717cb27 100644
+index 6f80210..ec81533 100644
--- a/setup.py
+++ b/setup.py
-@@ -47,8 +47,6 @@ class MyBuildDoc(setup_command.BuildDoc):
+@@ -47,8 +47,8 @@ class MyBuildDoc(setup_command.BuildDoc):
def run(self):
build = self.get_finalized_command('build')
sys.path.insert(0, os.path.abspath(build.build_lib))
- dirname = self.distribution.get_command_obj('build').build_purelib
- self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
++ # dirname = self.distribution.get_command_obj('build').build_purelib
++ # self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
try:
setup_command.BuildDoc.run(self)
except UnicodeDecodeError:
-diff --git a/spyderlib/config.py b/spyderlib/config.py
-index 9fbca59..7838054 100644
---- a/spyderlib/config.py
-+++ b/spyderlib/config.py
-@@ -28,7 +28,7 @@ DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
+diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
+index a2308a9..93332bd 100644
+--- a/spyderlib/__init__.py
++++ b/spyderlib/__init__.py
+@@ -35,6 +35,7 @@ __forum_url__ = 'http://groups.google.com/group/spyderlib'
+ # Dear (Debian, RPM, ...) package makers, please feel free to customize the
+ # following path to module's data (images) and translations:
+ DATAPATH = LOCALEPATH = DOCPATH = ''
++DOCPATH = '/usr/share/doc/python-spyderlib/html'
- # The two following lines are patched when making the debian package:
- DATA_PATH = DATA_DEV_PATH # @@@DATA_PATH@@@
--DOC_PATH = DOC_DEV_PATH # @@@DOC_PATH@@@
-+DOC_PATH = "/usr/share/doc/python-spyderlib/html" # @@@DOC_PATH@@@
-
- EDITABLE_TYPES = [int, long, float, list, dict, tuple, str, unicode, date]
- try:
+ def add_to_distribution(dist):
+ """Add package to py2exe/cx_Freeze distribution object
--
diff --git a/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch b/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch
deleted file mode 100644
index a5d96e5..0000000
--- a/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Fri, 5 Aug 2011 21:43:04 +0200
-Subject: feature-forwarded-fix-for-ipython-0.11
-
----
- spyderlib/widgets/externalshell/startup.py | 15 +++++++++++----
- spyderlib/widgets/internalshell.py | 5 ++++-
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/spyderlib/widgets/externalshell/startup.py b/spyderlib/widgets/externalshell/startup.py
-index 92f4e54..cf8ae4d 100644
---- a/spyderlib/widgets/externalshell/startup.py
-+++ b/spyderlib/widgets/externalshell/startup.py
-@@ -178,9 +178,16 @@ if __name__ == "__main__":
- # For pyreadline v1.5-1.6 only:
- import pyreadline
- pyreadline.GetOutputFile = lambda: None
-- import IPython.Shell
-- del __is_ipython
-- __ipythonshell__ = IPython.Shell.start(user_ns={'runfile': runfile,
-+ try:
-+ from IPython.frontend.terminal.embed import InteractiveShellEmbed
-+ del __is_ipython
-+ __ipythonshell__ = InteractiveShellEmbed(user_ns={'runfile': runfile,
-+ 'debugfile': debugfile})
-+ __ipythonshell__.stdin_encoding = os.environ['SPYDER_ENCODING']
-+ except ImportError:
-+ import IPython.Shell
-+ del __is_ipython
-+ __ipythonshell__ = IPython.Shell.start(user_ns={'runfile': runfile,
- 'debugfile': debugfile})
-- __ipythonshell__.IP.stdin_encoding = os.environ['SPYDER_ENCODING']
-+ __ipythonshell__.IP.stdin_encoding = os.environ['SPYDER_ENCODING']
- __ipythonshell__.mainloop()
-diff --git a/spyderlib/widgets/internalshell.py b/spyderlib/widgets/internalshell.py
-index 9f1cd37..0230fe3 100644
---- a/spyderlib/widgets/internalshell.py
-+++ b/spyderlib/widgets/internalshell.py
-@@ -15,7 +15,10 @@
- #----Builtins
- import __builtin__
- try:
-- from IPython.deep_reload import reload
-+ try:
-+ from IPython.lib.deepreload import reload
-+ except ImportError:
-+ from IPython.deep_reload import reload
- __builtin__.dreload = reload
- except ImportError:
- pass
---
diff --git a/debian/patches/series b/debian/patches/series
index ae99ae4..d88d3bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-fix-documentation-installation.patch
-0002-feature-forwarded-fix-for-ipython-0.11.patch
--
A Python IDE for scientists
More information about the debian-science-commits
mailing list