Update to ipython-2.0.0.
OK rpointel@, and some input from ajacoutot@, thanks.
This commit is contained in:
edd
parent
f250d42da7
commit
a98444ea99
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2014/03/17 23:15:01 edd Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2014/04/28 21:19:41 edd Exp $
|
||||
|
||||
COMMENT= enhanced interactive Python shell
|
||||
|
||||
MODPY_EGG_VERSION = 1.2.1
|
||||
MODPY_EGG_VERSION = 2.0.0
|
||||
DISTNAME= ipython-${MODPY_EGG_VERSION}
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://ipython.org/
|
||||
|
||||
MAINTAINER= Will Maier <wcmaier@openbsd.org>
|
||||
MAINTAINER= Edd Barrett <edd@openbsd.org>
|
||||
|
||||
MODULES= lang/python
|
||||
|
||||
@ -20,7 +20,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
|
||||
net/py-zmq \
|
||||
graphics/py-matplotlib>=1.2.0 \
|
||||
textproc/py-pygments \
|
||||
www/py-tornado \
|
||||
www/py-tornado>=3.2 \
|
||||
www/py-jinja2
|
||||
# Oddly enough, Ipython installs the test suite, so we can run it right out
|
||||
# of ${LOCALBASE}. Note that if you have pdb++ installed, tests will fail.
|
||||
@ -29,7 +29,8 @@ TEST_DEPENDS = ${FULLPKGNAME}:devel/ipython \
|
||||
BUILD_DEPENDS = textproc/py-sphinx \
|
||||
graphics/py-matplotlib>=1.2.0 \
|
||||
net/py-zmq \
|
||||
math/graphviz
|
||||
math/graphviz \
|
||||
textproc/py-numpydoc
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -43,6 +44,7 @@ pre-patch:
|
||||
MAKE_ENV += PYTHONPATH=${WRKSRC}
|
||||
post-build:
|
||||
cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
|
||||
${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
|
||||
|
||||
# Despite the fact that setupbase.py defines paths for examples to
|
||||
# be installed into, we still have to do it manually for some reason.
|
||||
@ -60,23 +62,20 @@ EXAMPLES_DIR = ${PREFIX}/share/examples/ipython-examples/
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${EXAMPLES_DIR}
|
||||
${INSTALL_DATA_DIR} ${APPS_DIR}
|
||||
${INSTALL_DATA_DIR} ${DOCS_DIR}
|
||||
|
||||
cp -r ${WRKSRC}/examples/* ${EXAMPLES_DIR}
|
||||
chown -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLES_DIR}/*
|
||||
${INSTALL_DATA} ${WRKSRC}/docs/emacs/ipython.el ${EXAMPLES_DIR}
|
||||
mv ${EXAMPLES_DIR}/core/*.desktop ${APPS_DIR}
|
||||
mv ${EXAMPLES_DIR}/IPython\ Kernel/*.desktop ${APPS_DIR}
|
||||
|
||||
cp -r ${WRKSRC}/docs/build/html ${DOCS_DIR}/html
|
||||
chown -R ${SHAREOWN}:${SHAREGRP} ${DOCS_DIR}
|
||||
|
||||
# empty dir i dont want in the PLIST
|
||||
rmdir ${DOCS_DIR}/extensions
|
||||
|
||||
pre-build:
|
||||
${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
|
||||
|
||||
do-test:
|
||||
PYTHONIOENCODING='utf-8' ${LOCALBASE}/bin/iptest -vvs
|
||||
PYTHONIOENCODING='utf-8' ${LOCALBASE}/bin/iptest
|
||||
|
||||
# A couple of test failures, reported, but upstream think these are bugs
|
||||
# in the test harness. They refuse to fix since the 1.x branch is about to
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (ipython-1.2.1.tar.gz) = wnrq6bjlxKLSi6DwS4eSFtb5bzY4DNRlqCOx77BZWHQ=
|
||||
SIZE (ipython-1.2.1.tar.gz) = 8666632
|
||||
SHA256 (ipython-2.0.0.tar.gz) = ToPAj41v0OiEjGj8DrL5sFT5t0L5F8jRZMIP1O3XiTo=
|
||||
SIZE (ipython-2.0.0.tar.gz) = 11877967
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-IPython_core_tests_test_interactiveshell_py,v 1.1 2013/11/04 11:31:12 edd Exp $
|
||||
--- IPython/core/tests/test_interactiveshell.py.orig Sun Nov 3 15:43:31 2013
|
||||
+++ IPython/core/tests/test_interactiveshell.py Sun Nov 3 15:43:44 2013
|
||||
@@ -431,7 +431,7 @@ class TestSystemRaw(unittest.TestCase):
|
||||
$OpenBSD: patch-IPython_core_tests_test_interactiveshell_py,v 1.2 2014/04/28 21:19:41 edd Exp $
|
||||
--- IPython/core/tests/test_interactiveshell.py.orig Mon Apr 28 22:01:28 2014
|
||||
+++ IPython/core/tests/test_interactiveshell.py Mon Apr 28 22:01:48 2014
|
||||
@@ -465,7 +465,7 @@ class TestSystemRaw(unittest.TestCase, ExitCodeChecks)
|
||||
def test_1(self):
|
||||
"""Test system_raw with non-ascii cmd
|
||||
"""
|
||||
- cmd = ur'''python -c "'åäö'" '''
|
||||
+ cmd = ur'''${MODPY_BIN} -c "'åäö'" '''
|
||||
- cmd = u'''python -c "'åäö'" '''
|
||||
+ cmd = u'''${MODPY_BIN} -c "'åäö'" '''
|
||||
ip.system_raw(cmd)
|
||||
|
||||
def test_exit_code(self):
|
||||
|
||||
# TODO: Exit codes are currently ignored on Windows.
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-docs_source_conf_py,v 1.1 2013/11/04 11:31:12 edd Exp $
|
||||
$OpenBSD: patch-docs_source_conf_py,v 1.2 2014/04/28 21:19:41 edd Exp $
|
||||
|
||||
Inheritance diagrams have non-deterministic filenames therefore cannot
|
||||
appear in a PLIST. Disable them.
|
||||
A problem with inheritance diagrams. Causes build to crash. Even if it
|
||||
did work, the generated diagrams have non-deterministic names, making
|
||||
putting their name in a PLIST somewhat difficult.
|
||||
|
||||
--- docs/source/conf.py.orig Mon Oct 21 22:14:12 2013
|
||||
+++ docs/source/conf.py Mon Oct 21 22:14:15 2013
|
||||
@@ -45,7 +45,7 @@ extensions = [
|
||||
'matplotlib.sphinxext.plot_directive',
|
||||
--- docs/source/conf.py.orig Sun Apr 27 16:25:47 2014
|
||||
+++ docs/source/conf.py Sun Apr 27 16:25:55 2014
|
||||
@@ -46,7 +46,6 @@ extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
'sphinx.ext.autosummary',
|
||||
'sphinx.ext.doctest',
|
||||
- 'sphinx.ext.inheritance_diagram',
|
||||
+ #'sphinx.ext.inheritance_diagram',
|
||||
'sphinx.ext.intersphinx',
|
||||
'IPython.sphinxext.ipython_console_highlighting',
|
||||
'IPython.sphinxext.ipython_directive',
|
||||
'numpydoc', # to preprocess docstrings
|
||||
|
||||
@ -1,22 +1,15 @@
|
||||
$OpenBSD: patch-setupbase_py,v 1.4 2013/11/04 11:31:12 edd Exp $
|
||||
$OpenBSD: patch-setupbase_py,v 1.5 2014/04/28 21:19:41 edd Exp $
|
||||
|
||||
--- setupbase.py.orig Fri Aug 9 02:02:40 2013
|
||||
+++ setupbase.py Wed Sep 4 22:05:57 2013
|
||||
@@ -208,7 +208,7 @@ def find_data_files():
|
||||
Put man pages where they belong.
|
||||
|
||||
--- setupbase.py.orig Sun Apr 27 16:47:44 2014
|
||||
+++ setupbase.py Sun Apr 27 16:48:09 2014
|
||||
@@ -272,7 +272,7 @@ def find_data_files():
|
||||
Just man pages at this point.
|
||||
"""
|
||||
|
||||
docdirbase = pjoin('share', 'doc', 'ipython')
|
||||
- manpagebase = pjoin('share', 'man', 'man1')
|
||||
+ manpagebase = pjoin('man', 'man1')
|
||||
|
||||
# Simple file lists can be made by hand
|
||||
manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)]
|
||||
@@ -222,7 +222,7 @@ def find_data_files():
|
||||
example_files = make_dir_struct(
|
||||
'data',
|
||||
pjoin('docs','examples'),
|
||||
- pjoin(docdirbase,'examples')
|
||||
+ pjoin('share','examples', 'ipython-examples')
|
||||
)
|
||||
manual_files = make_dir_struct(
|
||||
'data',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user