Revision: 22917
http://sourceforge.net/p/gar/code/22917
Author: opk
Date: 2014-01-30 13:20:12 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
ipython: update to 1.1.0
Modified Paths:
--------------
csw/mgar/pkg/lang-python/ipython/trunk/Makefile
csw/mgar/pkg/lang-python/ipython/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch
Modified: csw/mgar/pkg/lang-python/ipython/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2014-01-30 09:51:42 UTC
(rev 22916)
+++ csw/mgar/pkg/lang-python/ipython/trunk/Makefile 2014-01-30 13:20:12 UTC
(rev 22917)
@@ -7,7 +7,7 @@
# shipping ipythonx?)
#
NAME = ipython
-VERSION = 0.13.2
+VERSION = 1.1.0
CATEGORIES = python
GARTYPE = v2
@@ -23,13 +23,18 @@
PACKAGES = CSWipython
CATALOGNAME = ipython
-PATCHFILES += 0001-rename-filenames-containing-spaces.patch
+EXTRA_MERGE_EXCLUDE_FILES = .*\.gitignore
-CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/IPython/core/usage.py
-CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/utils/tests/test_path.py
-CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/pexpect/_pexpect.py
-CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/external/path/_path.py
-CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/utils/tests/test_path.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/external/path/_path.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/external/pexpect/_pexpect.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/IPython/core/usage.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/external/path/_path.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/external/pexpect/_pexpect.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/utils/tests/test_path.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/IPython/core/magics/osm.py
+CHECKPKG_OVERRIDES_CSWipython +=
file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/IPython/core/usage.py
CHECKPKG_OVERRIDES_CSWipython += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWipython += catalogname-does-not-start-with-py_
@@ -37,8 +42,7 @@
include gar/category.mk
-post-extract:
- @( cd $(WORKSRC)/docs/examples/notebooks && mv Capturing\ Output.ipynb
Capturing_Output.ipynb )
- @( cd $(WORKSRC)/docs/examples/notebooks && mv Script\ Magics.ipynb
Script_Magics.ipynb )
- @( cd $(WORKSRC)/docs/examples/parallel && mv Parallel\ Magics.ipynb
Parallel_Magics.ipynb )
+post-build-modulated:
+ @gsed -i '1 s/$(subst _,.,$(PYTHON_VERSION))//'
$(WORKSRC)/build/scripts-$(subst _,.,$(PYTHON_VERSION))/*
@$(MAKECOOKIE)
+
Modified: csw/mgar/pkg/lang-python/ipython/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/ipython/trunk/checksums 2014-01-30 09:51:42 UTC
(rev 22916)
+++ csw/mgar/pkg/lang-python/ipython/trunk/checksums 2014-01-30 13:20:12 UTC
(rev 22917)
@@ -1 +1 @@
-ead3b7eb70c653b537fb9d96d71b8b2a ipython-0.13.2.tar.gz
+70d69c78122923879232567ac3c47cef ipython-1.1.0.tar.gz
Deleted:
csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch
===================================================================
---
csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch
2014-01-30 09:51:42 UTC (rev 22916)
+++
csw/mgar/pkg/lang-python/ipython/trunk/files/0001-rename-filenames-containing-spaces.patch
2014-01-30 13:20:12 UTC (rev 22917)
@@ -1,27 +0,0 @@
-From 941fe385c376854c443eb777fe67630650f3ea14 Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <o...@opencsw.org>
-Date: Thu, 4 Jul 2013 11:48:13 +0200
-Subject: [PATCH] rename filenames containing spaces
-
----
- docs/examples/notebooks/00_notebook_tour.ipynb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/examples/notebooks/00_notebook_tour.ipynb
b/docs/examples/notebooks/00_notebook_tour.ipynb
-index c5f8c4c..0dffdd1 100644
---- a/docs/examples/notebooks/00_notebook_tour.ipynb
-+++ b/docs/examples/notebooks/00_notebook_tour.ipynb
-@@ -65,8 +65,8 @@
- "00_notebook_tour.ipynb callbacks.ipynb
python-logo.svg\r\n",
- "01_notebook_introduction.ipynb cython_extension.ipynb
rmagic_extension.ipynb\r\n",
- "Animations_and_Progress.ipynb display_protocol.ipynb
sympy.ipynb\r\n",
-- "Capturing Output.ipynb formatting.ipynb
sympy_quantum_computing.ipynb\r\n",
-- "Script Magics.ipynb octavemagic_extension.ipynb
trapezoid_rule.ipynb\r\n",
-+ "Capturing_Output.ipynb formatting.ipynb
sympy_quantum_computing.ipynb\r\n",
-+ "Script_Magics.ipynb octavemagic_extension.ipynb
trapezoid_rule.ipynb\r\n",
- "animation.m4v progbar.ipynb\r\n"
- ]
- }
---
-1.8.3.1
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
