Merge IB/CMSSW_11_3_X/master into IB/CMSSW_11_3_X/rootmaster.

cms-sw · Feb 24, 2021 · bf7e4b4 · bf7e4b4
2 parents e61a6c4 + cfe7eb0
commit bf7e4b4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -1 +1,2 @@
 Requires: py2-jedi py3-prompt_toolkit py3-backcall
+%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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		Requires: py2-jedi py3-prompt_toolkit py3-backcall
		%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's\| %{i}/.python3 \| python3 \|' %{i}/bin/3
Original file line number	Diff line number	Diff line change
		@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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