On Wed, Mar 12, 2014 at 11:35:23AM +0000, Edd Barrett wrote: > Hi, > > The following diff updates ipython to the latest stable release. I have > been using this for work for a couple of weeks now without issue.
Fix duplicate TEST_DEPENDS, noticed by benoit@ OK? Index: Makefile =================================================================== RCS file: /home/edd/cvsync/cvs/ports/devel/ipython/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 4 Nov 2013 11:31:12 -0000 1.24 +++ Makefile 13 Mar 2014 10:08:10 -0000 @@ -2,7 +2,7 @@ COMMENT= enhanced interactive Python shell -MODPY_EGG_VERSION = 1.1.0 +MODPY_EGG_VERSION = 1.2.1 DISTNAME= ipython-${MODPY_EGG_VERSION} CATEGORIES= devel @@ -22,7 +22,10 @@ RUN_DEPENDS = devel/desktop-file-utils textproc/py-pygments \ www/py-tornado \ www/py-jinja2 -TEST_DEPENDS = devel/py-nose +# 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. +TEST_DEPENDS = ${FULLPKGNAME}:devel/ipython \ + devel/py-nose BUILD_DEPENDS = textproc/py-sphinx \ graphics/py-matplotlib>=1.2.0 \ net/py-zmq \ @@ -72,10 +75,13 @@ post-install: pre-build: ${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py -# Oddly enough, Ipython installs the test suite, so we can run it right out -# of ${LOCALBASE}. -TEST_DEPENDS = ${FULLPKGNAME}:devel/ipython do-test: PYTHONIOENCODING='utf-8' ${LOCALBASE}/bin/iptest -vvs + +# 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 +# become legacy: https://github.com/ipython/ipython/issues/5217 +# To repro: +# python2.7 /usr/local/lib/python2.7/site-packages/IPython/testing/iptest.py -vvs IPython.core .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/edd/cvsync/cvs/ports/devel/ipython/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 4 Nov 2013 11:31:12 -0000 1.13 +++ distinfo 25 Feb 2014 12:32:22 -0000 @@ -1,2 +1,2 @@ -SHA256 (ipython-1.1.0.tar.gz) = bE5KZSJatFvpI/a9C3G2BN34rNdpxOKBj6yJeTzfkb4= -SIZE (ipython-1.1.0.tar.gz) = 8658909 +SHA256 (ipython-1.2.1.tar.gz) = wnrq6bjlxKLSi6DwS4eSFtb5bzY4DNRlqCOx77BZWHQ= +SIZE (ipython-1.2.1.tar.gz) = 8666632 Index: pkg/PLIST =================================================================== RCS file: /home/edd/cvsync/cvs/ports/devel/ipython/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 4 Nov 2013 11:31:12 -0000 1.13 +++ pkg/PLIST 25 Feb 2014 12:32:22 -0000 @@ -289,6 +289,13 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/IPython/external/ lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.py lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/ +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/__init__.py +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/_dummy.py +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/_dummy.pyc +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/_nope.py +lib/python${MODPY_VERSION}/site-packages/IPython/external/appnope/_nope.pyc lib/python${MODPY_VERSION}/site-packages/IPython/external/argparse/ lib/python${MODPY_VERSION}/site-packages/IPython/external/argparse/__init__.py lib/python${MODPY_VERSION}/site-packages/IPython/external/argparse/__init__.pyc @@ -2351,6 +2358,8 @@ share/doc/ipython/html/_sources/whatsnew share/doc/ipython/html/_sources/whatsnew/github-stats-0.13.txt share/doc/ipython/html/_sources/whatsnew/github-stats-1.0.txt share/doc/ipython/html/_sources/whatsnew/index.txt +share/doc/ipython/html/_sources/whatsnew/pr/ +share/doc/ipython/html/_sources/whatsnew/pr/incompat-mpl-backend.txt share/doc/ipython/html/_sources/whatsnew/version0.10.txt share/doc/ipython/html/_sources/whatsnew/version0.11.txt share/doc/ipython/html/_sources/whatsnew/version0.12.txt @@ -2726,6 +2735,8 @@ share/doc/ipython/html/whatsnew/github-s share/doc/ipython/html/whatsnew/github-stats-0.13.html share/doc/ipython/html/whatsnew/github-stats-1.0.html share/doc/ipython/html/whatsnew/index.html +share/doc/ipython/html/whatsnew/pr/ +share/doc/ipython/html/whatsnew/pr/incompat-mpl-backend.html share/doc/ipython/html/whatsnew/version0.10.html share/doc/ipython/html/whatsnew/version0.11.html share/doc/ipython/html/whatsnew/version0.12.html -- Best Regards Edd Barrett http://www.theunixzoo.co.uk