PR#6: Update to 7.6.1 (#1725333) - rpms/ipython

rpms / ipython

#6 Update to 7.6.1 (#1725333)

Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.

rpms/ churchyard/ipython 7.6.1 into master

Update to 7.6.1 (#1725333)

Miro Hrončok • 4 years ago

1cc48cf

11720.patch

file removed

-97

		`@@ -1,97 +0,0 @@`
		`- From 248128dfaabb33e922b1e36a298fd7ec0c730069 Mon Sep 17 00:00:00 2001`
		`- From: stonebig <stonebig34@gmail.com>`
		`- Date: Sat, 11 May 2019 14:19:20 +0200`
		`- Subject: [PATCH 1/2] Python-3.8 PEP570 positional only argument`
		`-`
		`- ---`
		`- IPython/core/interactiveshell.py \| 54 ++++++++++++++++++++++----------`
		`- 1 file changed, 37 insertions(+), 17 deletions(-)`
		`-`
		`- diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py`
		`- index ce8ceb196c..8cc89e4192 100644`
		`- --- a/IPython/core/interactiveshell.py`
		`- +++ b/IPython/core/interactiveshell.py`
		`- @@ -138,23 +138,43 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:`
		`- from types import CodeType, FunctionType`
		`- CO_NEWLOCALS = 0x0002`
		`- code = function.__code__`
		`- - new_code = CodeType(`
		`- - code.co_argcount,`
		`- - code.co_kwonlyargcount,`
		`- - code.co_nlocals,`
		`- - code.co_stacksize,`
		`- - code.co_flags & ~CO_NEWLOCALS,`
		`- - code.co_code,`
		`- - code.co_consts,`
		`- - code.co_names,`
		`- - code.co_varnames,`
		`- - code.co_filename,`
		`- - code.co_name,`
		`- - code.co_firstlineno,`
		`- - code.co_lnotab,`
		`- - code.co_freevars,`
		`- - code.co_cellvars`
		`- - )`
		`- + if sys.version_info > (3,8):`
		`- + new_code = CodeType(`
		`- + code.co_argcount,`
		`- + code.co_posonlyargcount, # Python-3.8 PEP570 positional only argument`
		`- + code.co_kwonlyargcount,`
		`- + code.co_nlocals,`
		`- + code.co_stacksize,`
		`- + code.co_flags & ~CO_NEWLOCALS,`
		`- + code.co_code,`
		`- + code.co_consts,`
		`- + code.co_names,`
		`- + code.co_varnames,`
		`- + code.co_filename,`
		`- + code.co_name,`
		`- + code.co_firstlineno,`
		`- + code.co_lnotab,`
		`- + code.co_freevars,`
		`- + code.co_cellvars`
		`- + )`
		`- + else:`
		`- + new_code = CodeType(`
		`- + code.co_argcount,`
		`- + code.co_kwonlyargcount,`
		`- + code.co_nlocals,`
		`- + code.co_stacksize,`
		`- + code.co_flags & ~CO_NEWLOCALS,`
		`- + code.co_code,`
		`- + code.co_consts,`
		`- + code.co_names,`
		`- + code.co_varnames,`
		`- + code.co_filename,`
		`- + code.co_name,`
		`- + code.co_firstlineno,`
		`- + code.co_lnotab,`
		`- + code.co_freevars,`
		`- + code.co_cellvars`
		`- + )`
		`- return FunctionType(new_code, globals(), function.__name__, function.__defaults__)`
		`-`
		`-`
		`-`
		`- From 3b160421894ef3495781a6d76fe0edd0fe44ea2d Mon Sep 17 00:00:00 2001`
		`- From: stonebig <stonebig34@gmail.com>`
		`- Date: Sat, 11 May 2019 14:31:54 +0200`
		`- Subject: [PATCH 2/2] be more precise : >3.8.0a3`
		`-`
		`- ---`
		`- IPython/core/interactiveshell.py \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py`
		`- index 8cc89e4192..c102b2352d 100644`
		`- --- a/IPython/core/interactiveshell.py`
		`- +++ b/IPython/core/interactiveshell.py`
		`- @@ -138,7 +138,7 @@ def removed_co_newlocals(function:types.FunctionType) -> types.FunctionType:`
		`- from types import CodeType, FunctionType`
		`- CO_NEWLOCALS = 0x0002`
		`- code = function.__code__`
		`- - if sys.version_info > (3,8):`
		`- + if sys.version_info > (3, 8, 0, 'alpha', 3):`
		`- new_code = CodeType(`
		`- code.co_argcount,`
		`- code.co_posonlyargcount, # Python-3.8 PEP570 positional only argument`

ipython.spec

file modified

+6 -10

		`@@ -2,7 +2,7 @@`
		`%bcond_without doc`

		`Name: ipython`
		`- Version: 7.5.0`
		`+ Version: 7.6.1`
		`Release: 1%{?dist}`
		`Summary: An enhanced interactive Python shell`

		`@@ -13,9 +13,6 @@`
		`URL: http://ipython.org/`
		`Source0: %pypi_source`

		`- # Python 3.8: PEP 570 positional only arguments`
		`- Patch1: https://github.com/ipython/ipython/pull/11720.patch`
		`-`
		`BuildArch: noarch`
		`BuildRequires: python3-devel`

		`@@ -122,9 +119,6 @@`
		`Requires: python3-testpath`
		`Requires: python3-zmq-tests`

		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1440518`
		`- Requires: python3-numpy`
		`-`
		`%description -n python3-ipython-tests`
		`This package contains the tests of %{name}.`
		`You can check this way, if ipython works on your platform.`
		`@@ -146,9 +140,6 @@`
		`ls -l`
		`ls -l *`

		`- # use decorators of numpy`
		`- rm decorators/_decorators.py`
		`-`
		`popd`

		`# Remove shebangs`
		`@@ -181,6 +172,8 @@`
		`%check`
		`# Ensure that the user's .pythonrc.py is not invoked during any tests.`
		`export PYTHONSTARTUP=""`
		`+ # Koji builders can be slow, especially on arms, we scale timeouts 4 times`
		`+ export IPYTHON_TESTING_TIMEOUT_SCALE=4`
		`mkdir -p run_tests`
		`pushd run_tests`
		`PYTHONPATH=%{buildroot}%{python3_sitelib} \`
		`@@ -235,6 +228,9 @@`


		`%changelog`
		`+ * Wed Jul 03 2019 Miro Hrončok <mhroncok@redhat.com> - 7.6.1-1`
		`+ - Update to 7.6.1 (#1725333)`
		`+`
		`* Tue May 21 2019 Miro Hrončok <mhroncok@redhat.com> - 7.5.0-1`
		`- Update to 7.5.0 (#1678562)`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (ipython-7.5.0.tar.gz) = 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b`
		`+ SHA512 (ipython-7.6.1.tar.gz) = e45a83c98587ae8f809a2f917b40d8274ffa56e469b13ebf993211034c5a4d302c8a6a531b54137e71aa2985f617b7408a69323720157d9cd58fbcc38f49b6ae`