python-ipython: update to 4.2.1
This commit is contained in:
parent
12623d20ca
commit
119edcc631
2 changed files with 3 additions and 65 deletions
|
@ -1,62 +0,0 @@
|
||||||
https://github.com/ipython/ipython/pull/9417
|
|
||||||
|
|
||||||
diff --git IPython/utils/terminal.py IPython/utils/terminal.py
|
|
||||||
index 9e7be2a..a1f0f73 100644
|
|
||||||
--- IPython/utils/terminal.py
|
|
||||||
+++ IPython/utils/terminal.py
|
|
||||||
@@ -9,22 +9,18 @@ Authors:
|
|
||||||
* Alexander Belchenko (e-mail: bialix AT ukr.net)
|
|
||||||
"""
|
|
||||||
|
|
||||||
-#-----------------------------------------------------------------------------
|
|
||||||
-# Copyright (C) 2008-2011 The IPython Development Team
|
|
||||||
-#
|
|
||||||
-# Distributed under the terms of the BSD License. The full license is in
|
|
||||||
-# the file COPYING, distributed as part of this software.
|
|
||||||
-#-----------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-#-----------------------------------------------------------------------------
|
|
||||||
-# Imports
|
|
||||||
-#-----------------------------------------------------------------------------
|
|
||||||
+# Copyright (c) IPython Development Team.
|
|
||||||
+# Distributed under the terms of the Modified BSD License.
|
|
||||||
|
|
||||||
import os
|
|
||||||
import struct
|
|
||||||
import sys
|
|
||||||
import warnings
|
|
||||||
-import backports.shutil_get_terminal_size
|
|
||||||
+try:
|
|
||||||
+ from shutil import get_terminal_size as _get_terminal_size
|
|
||||||
+except ImportError:
|
|
||||||
+ # use backport on Python 2
|
|
||||||
+ from backports.shutil_get_terminal_size import get_terminal_size as _get_terminal_size
|
|
||||||
|
|
||||||
from . import py3compat
|
|
||||||
|
|
||||||
@@ -122,4 +118,4 @@ def freeze_term_title():
|
|
||||||
|
|
||||||
|
|
||||||
def get_terminal_size(defaultx=80, defaulty=25):
|
|
||||||
- return backports.shutil_get_terminal_size.get_terminal_size((defaultx, defaulty))
|
|
||||||
+ return _get_terminal_size((defaultx, defaulty))
|
|
||||||
diff --git setup.py setup.py
|
|
||||||
index 6479c51..14b5142 100755
|
|
||||||
--- setup.py
|
|
||||||
+++ setup.py
|
|
||||||
@@ -195,7 +195,6 @@ install_requires = [
|
|
||||||
'pickleshare',
|
|
||||||
'simplegeneric>0.8',
|
|
||||||
'traitlets',
|
|
||||||
- 'backports.shutil_get_terminal_size',
|
|
||||||
]
|
|
||||||
|
|
||||||
# Platform-specific dependencies:
|
|
||||||
@@ -203,6 +202,7 @@ install_requires = [
|
|
||||||
# but requires pip >= 6. pip < 6 ignores these.
|
|
||||||
|
|
||||||
extras_require.update({
|
|
||||||
+ ':python_version == "2.7"': ['backports.shutil_get_terminal_size'],
|
|
||||||
':sys_platform != "win32"': ['pexpect'],
|
|
||||||
':sys_platform == "darwin"': ['appnope'],
|
|
||||||
':sys_platform == "darwin" and platform_python_implementation == "CPython"': ['gnureadline'],
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'python-ipython'
|
# Template file for 'python-ipython'
|
||||||
pkgname=python-ipython
|
pkgname=python-ipython
|
||||||
version=4.2.0
|
version=4.2.1
|
||||||
revision=2
|
revision=1
|
||||||
noarch=yes
|
noarch=yes
|
||||||
wrksrc="ipython-${version}"
|
wrksrc="ipython-${version}"
|
||||||
build_style=python-module
|
build_style=python-module
|
||||||
|
@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
|
||||||
homepage="http://ipython.org/"
|
homepage="http://ipython.org/"
|
||||||
license="3-clause-BSD"
|
license="3-clause-BSD"
|
||||||
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
|
||||||
checksum=dba42f182b5f6f26630d2202efd30383712d9f7d8d8d9896b37ae2145deca616
|
checksum=e21c3d7f410014b04d36fe12998f132ed9ef4c6119b81016c04eedb09f0716a5
|
||||||
|
|
||||||
alternatives="
|
alternatives="
|
||||||
ipython:ipython:/usr/bin/ipython2.7
|
ipython:ipython:/usr/bin/ipython2.7
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue