From 305b2c12b19ca914a03809bdc1e2ce02e10ed41c Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 24 Feb 2021 19:12:47 +0100 Subject: [PATCH 1/2] relocate ipython3 startup script --- pip/ipython.file | 1 - pip/py3-ipython.file | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pip/ipython.file b/pip/ipython.file index 27a6b1f6a76..06d06d44ddc 100644 --- a/pip/ipython.file +++ b/pip/ipython.file @@ -1,2 +1 @@ Requires: py2-traitlets py2-pickleshare py2-Pygments py2-prompt_toolkit py2-pexpect py2-simplegeneric py2-backports -%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython diff --git a/pip/py3-ipython.file b/pip/py3-ipython.file index 74045526fa6..3e72b4ad0ca 100644 --- a/pip/py3-ipython.file +++ b/pip/py3-ipython.file @@ -1 +1,3 @@ Requires: py2-jedi py3-prompt_toolkit py3-backcall +%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython +define PipPostBuild sed -i -e 's| %{i}/.*python3 | python3 |' %{i}/bin/ipython3 %{i}/bin/iptest3 From b2022cb2ed28acb2eb7d14799f58759bc6558f17 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 24 Feb 2021 19:36:29 +0100 Subject: [PATCH 2/2] fix pylint3 location --- pip/py3-ipython.file | 3 +-- pip/py3-pylint.file | 1 + pip/pylint.file | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pip/py3-ipython.file b/pip/py3-ipython.file index 3e72b4ad0ca..2e167c98f1d 100644 --- a/pip/py3-ipython.file +++ b/pip/py3-ipython.file @@ -1,3 +1,2 @@ Requires: py2-jedi py3-prompt_toolkit py3-backcall -%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython -define PipPostBuild sed -i -e 's| %{i}/.*python3 | python3 |' %{i}/bin/ipython3 %{i}/bin/iptest3 +%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's| %{i}/.*python3 | python3 |' %{i}/bin/*3 diff --git a/pip/py3-pylint.file b/pip/py3-pylint.file index fad14b8c1cf..4e86a2e5f79 100644 --- a/pip/py3-pylint.file +++ b/pip/py3-pylint.file @@ -1 +1,2 @@ Requires: py3-astroid py2-toml +%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done ; sed -i -e 's| %{i}/.*python3 | python3 |' %{i}/bin/*3 diff --git a/pip/pylint.file b/pip/pylint.file index 2a4100dc7e1..94736f02b07 100644 --- a/pip/pylint.file +++ b/pip/pylint.file @@ -1,2 +1 @@ Requires: py2-astroid py2-six py2-isort py2-mccabe py2-configparser -%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done