diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/ipython/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/ipython/files')
3 files changed, 94 insertions, 0 deletions
diff --git a/dev-python/ipython/files/2.1.0-disable-tests.patch b/dev-python/ipython/files/2.1.0-disable-tests.patch new file mode 100644 index 000000000000..bdbb1be4246e --- /dev/null +++ b/dev-python/ipython/files/2.1.0-disable-tests.patch @@ -0,0 +1,32 @@ +The extension magics for oct2py and rpy live now in the oct2py and rpy2 package. The tests shipped with ipython are broken. We should disable +those tests and remove the magics files: + +IPython/extensions/rmagic.py -> rpy/ipython/rmagic.py +IPython/extension/octavemagic.py -> oct2py/ipython/octavemagic.py + +deleted: IPython/extensions/octavemagic.py +deleted: IPython/extensions/rmagic.py +modified: IPython/testing/iptest.py + +diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py +index 45d2c78..db0bdfe 100644 +--- a/IPython/testing/iptest.py ++++ b/IPython/testing/iptest.py +@@ -250,12 +250,10 @@ sec = test_sections['extensions'] + if not have['cython']: + sec.exclude('cythonmagic') + sec.exclude('tests.test_cythonmagic') +-if not have['oct2py']: +- sec.exclude('octavemagic') +- sec.exclude('tests.test_octavemagic') +-if not have['rpy2'] or not have['numpy']: +- sec.exclude('rmagic') +- sec.exclude('tests.test_rmagic') ++sec.exclude('octavemagic') ++sec.exclude('tests.test_octavemagic') ++sec.exclude('rmagic') ++sec.exclude('tests.test_rmagic') + # autoreload does some strange stuff, so move it to its own test section + sec.exclude('autoreload') + sec.exclude('tests.test_autoreload') + diff --git a/dev-python/ipython/files/2.1.0-substitute-files.patch b/dev-python/ipython/files/2.1.0-substitute-files.patch new file mode 100644 index 000000000000..659df39226ac --- /dev/null +++ b/dev-python/ipython/files/2.1.0-substitute-files.patch @@ -0,0 +1,27 @@ +substitute the insource files with these messages +diff --git a/IPython/extensions/octavemagic.py b/IPython/extensions/octavemagic.py +new file mode 100644 +index 0000000..dc93fe4 +--- /dev/null ++++ b/IPython/extensions/octavemagic.py +@@ -0,0 +1,7 @@ ++import warnings ++ ++def load_ipython_extension(ip): ++ msg = ("The octavemagic extension has been moved to oct2py. " ++ "After installing oct2py, you can load octavemagic with the " ++ "following command: '%load_ext oct2py.ipython'.") ++ warnings.warn(msg, Warning, stacklevel=2) +diff --git a/IPython/extensions/rmagic.py b/IPython/extensions/rmagic.py +new file mode 100644 +index 0000000..739e491 +--- /dev/null ++++ b/IPython/extensions/rmagic.py +@@ -0,0 +1,7 @@ ++import warnings ++ ++def load_ipython_extension(ip): ++ msg = ("The rmagic extension has been moved to rpy2. " ++ "After installing rpy2, you can load rmagic with the " ++ "following command: '%load_ext rpy2.ipython'.") ++ warnings.warn(msg, Warning, stacklevel=2) diff --git a/dev-python/ipython/files/ipython-2.2.0-login-backport.patch b/dev-python/ipython/files/ipython-2.2.0-login-backport.patch new file mode 100644 index 000000000000..cf6a99db21e8 --- /dev/null +++ b/dev-python/ipython/files/ipython-2.2.0-login-backport.patch @@ -0,0 +1,35 @@ +From 5d6ce3671318c8d32bab770ece841590bbec358d Mon Sep 17 00:00:00 2001 +From: Matthias Bussonnier <bussonniermatthias@gmail.com> +Date: Fri, 17 Apr 2015 13:08:32 -0700 +Subject: [PATCH] Set secure cookie by default if login handler is hit. + + backport of https://github.com/jupyter/jupyter_notebook/pull/22 b8e99bc + +> There is few chances that logged-in people do not use https connexion, +> but I guess it can happened if the server is ran in front of a proxy +> that does the https termination, so leave it configurable. +> +> closes ipython/ipython#8325 +--- + IPython/html/auth/login.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/IPython/html/auth/login.py b/IPython/html/auth/login.py +index 1ad4673..1a340c8 100644 +--- a/IPython/html/auth/login.py ++++ b/IPython/html/auth/login.py +@@ -46,7 +46,13 @@ class LoginHandler(IPythonHandler): + pwd = self.get_argument('password', default=u'') + if self.login_available: + if passwd_check(self.password, pwd): +- self.set_secure_cookie(self.cookie_name, str(uuid.uuid4())) ++ # tornado <4.2 have a bug that consider secure==True as soon as ++ # 'secure' kwarg is passed to set_secure_cookie ++ if self.settings.get('secure_cookie', self.request.protocol == 'https'): ++ kwargs = {'secure':True} ++ else: ++ kwargs = {} ++ self.set_secure_cookie(self.cookie_name, str(uuid.uuid4()), **kwargs) + else: + self._render(message={'error': 'Invalid password'}) + return |