Merge pull request #6770 from cms-sw/smuzaffar-patch-2

Updated Pygments to 2.7.4
cms-sw · Apr 20, 2021 · 17e7561 · 17e7561
2 parents d289f48 + e208562
commit 17e7561
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 48 deletions.
diff --git a/pip/conan.file b/pip/conan.file
@@ -1,3 +1,3 @@
-Requires: py2-python-dateutil py2-requests py3-PyJWT py2-tqdm py2-PyYAML py2-Jinja2 py2-Pygments py3-patch-ng py3-pluginbase
+Requires: py2-python-dateutil py2-requests py3-PyJWT py2-tqdm py2-PyYAML py2-Jinja2 py3-Pygments py3-patch-ng py3-pluginbase
 Requires: py3-fasteners py3-patch-ng py3-pluginbase py3-node-semver py3-distro py2-future py3-deprecation py3-bottle py2-colorama
 %define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/conan*
diff --git a/pip/hyperas.file b/pip/hyperas.file
@@ -1 +1 @@
-Requires: py2-jupyter py2-Keras py2-hyperopt
+Requires: py3-jupyter py2-Keras py2-hyperopt
diff --git a/pip/ipykernel.file b/pip/ipykernel.file
@@ -1 +1 @@
-Requires: py2-ipython py2-jupyter_client py2-jedi py3-backcall
+Requires: py3-ipython py3-jupyter_client py2-jedi py3-backcall
diff --git a/pip/ipython.file b/pip/ipython.file
@@ -1 +1 @@
-Requires: py2-traitlets py2-pickleshare py2-Pygments py2-prompt_toolkit py2-pexpect py2-simplegeneric py2-backports
+Requires: py2-traitlets py2-pickleshare py3-Pygments py2-prompt_toolkit py2-pexpect py2-simplegeneric py2-backports
diff --git a/pip/ipywidgets.file b/pip/ipywidgets.file
@@ -1,2 +1,2 @@
-Requires: py2-widgetsnbextension 
+Requires: py3-widgetsnbextension 
 #needed for py3 upgrade py2-jupyterlab-widgets 
diff --git a/pip/jupyter.file b/pip/jupyter.file
@@ -1,2 +1 @@
-Requires: py2-notebook py2-qtconsole py2-jupyter_console py2-nbconvert py2-ipykernel py2-ipywidgets
-Requires: py3-jupyter_console
+Requires: py3-notebook py3-qtconsole py3-jupyter_console py3-nbconvert py3-ipykernel py3-ipywidgets
diff --git a/pip/jupyter_client.file b/pip/jupyter_client.file
@@ -1,4 +1,4 @@
-Requires: py2-jupyter_core py2-tornado py2-python-dateutil py2-pyzmq
+Requires: py3-jupyter_core py2-tornado py2-python-dateutil py2-pyzmq
 Requires: py3-tornado
 %define RelocatePython %{i}/bin/*
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/jupyter_console.file b/pip/jupyter_console.file
@@ -1,2 +1,2 @@
-Requires: py2-ipykernel
+Requires: py3-ipykernel
 %define PipPostBuildPy3 mv %{i}/bin/jupyter-console %{i}/bin/jupyter-console3
diff --git a/pip/nbconvert.file b/pip/nbconvert.file
@@ -1,3 +1,3 @@
-Requires: py2-nbformat py2-Jinja2 py2-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py3-nbformat
+Requires: py2-Jinja2 py3-Pygments py2-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py3-nbformat
 Requires: py3-testpath py2-testpath
 %define RelocatePython %{i}/bin/jupyter-nbconvert
diff --git a/pip/nbdime.file b/pip/nbdime.file
@@ -1,4 +1,4 @@
-Requires: py2-notebook py2-GitPython py2-requests py2-colorama py2-backports
+Requires: py2-GitPython py2-requests py2-colorama py2-backports
 Requires: py3-notebook py3-GitPython
 %define RelocatePython %{i}/bin/*
 

diff --git a/pip/nbformat.file b/pip/nbformat.file
@@ -1,3 +1,3 @@
-Requires: py2-traitlets py2-jsonschema py2-jupyter_core
+Requires: py2-traitlets py2-jsonschema py3-jupyter_core
 %define RelocatePython %{i}/bin/jupyter-trust
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/notebook.file b/pip/notebook.file
@@ -1,2 +1,2 @@
-Requires: py2-terminado py2-nbconvert py2-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client py2-argon2-cffi
+Requires: py2-terminado py3-nbconvert py3-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client py2-argon2-cffi
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/qtconsole.file b/pip/qtconsole.file
@@ -1,2 +1,2 @@
-Requires: py2-ipykernel py3-ipykernel py2-QtPy
+Requires: py3-ipykernel py2-QtPy
 %define RelocatePython %{i}/bin/jupyter-qtconsole
diff --git a/pip/rep.file b/pip/rep.file
@@ -1,2 +1,2 @@
-Requires: py2-notebook py2-hep_ml py2-matplotlib py2-theanets py2-nose py2-nose-parameterized py2-bokeh py2-mpld3 py2-neurolab py2-pybrain py2-xgboost
+Requires: py2-hep_ml py2-matplotlib py2-theanets py2-nose py2-nose-parameterized py2-bokeh py2-mpld3 py2-neurolab py2-pybrain py2-xgboost
 Requires: py3-notebook py3-xgboost py3-matplotlib py3-bokeh
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -120,33 +120,33 @@ histoprint==1.6.0 ; python_version>'3.0'
 histogrammar==1.0.9 ; python_version<'3.0'
 histogrammar==1.0.10 ; python_version>'3.0'
 html5lib==1.1
-hyperas==0.4.1
+hyperas==0.4.1 ; python_version>'3.0'
 hyperopt==0.2.5
 idna==2.10
 immutables==0.15 ; python_version>'3.0'
 importlib-metadata==2.1.1
 importlib-resources==3.3.1
 iniconfig==1.1.1
 ipaddress==1.0.23
-ipykernel==4.10.1 ; python_version<'3.0'
+#ipykernel==4.10.1 ; python_version<'3.0'
 ipykernel==5.5.0 ; python_version>'3.0'
 ipython_genutils==0.2.0
-ipython==5.10.0 ; python_version<'3.0'
-ipython==7.21.0 ; python_version>'3.0'
-ipywidgets==7.5.1
+#ipython==5.10.0 ; python_version<'3.0'
+ipython==7.22.0 ; python_version>'3.0'
+ipywidgets==7.5.1 ; python_version>'3.0'
 isort==4.3.21
 jedi==0.17.2
 Jinja2==2.11.3
 joblib==0.14.1 ; python_version<'3.0'
 joblib==1.0.1 ; python_version>'3.0'
 jsonpickle==1.4.2
 jsonschema==3.2.0
-jupyter_client==5.3.5 ; python_version<'3.0'
+#jupyter_client==5.3.5 ; python_version<'3.0'
 jupyter_client==6.1.11 ; python_version>'3.0'
-jupyter_console==5.2.0 ; python_version<'3.0'
+#jupyter_console==5.2.0 ; python_version<'3.0'
 jupyter_console==6.2.0 ; python_version>'3.0'
-jupyter_core==4.6.3
-jupyter==1.0.0
+jupyter_core==4.6.3 ; python_version>'3.0'
+jupyter==1.0.0 ; python_version>'3.0'
 jupyterlab-widgets==1.0.0 ; python_version>'3.0'
 Keras==2.4.3
 keras-applications==1.0.8
@@ -180,10 +180,10 @@ mpld3==0.5.2
 mplhep==0.2.16 ; python_version>'3.0'
 mpmath==1.2.1
 multidict==5.1.0 ; python_version>'3.0'
-nbconvert==5.6.1
-nbdime==1.1.0
+nbconvert==5.6.1; python_version>'3.0'
+nbdime==1.1.0 ; python_version> '3.0'
 #5.0.3 does not support python2.7 even if pip thinks so
-nbformat==4.4.0 ; python_version<'3.0'
+#nbformat==4.4.0 ; python_version<'3.0'
 nbformat==5.1.2 ; python_version>'3.0'
 networkx==2.2 ; python_version<'3.0'
 networkx==2.5 ; python_version>'3.0'
@@ -246,7 +246,7 @@ pycuda==2019.1.2
 pycurl==7.43.0.5
 pydot==1.4.2
 pyflakes==2.2.0
-Pygments==2.5.2
+Pygments==2.8.1 ; python_version>'3.0'
 PyJWT==2.0.1 ; python_version>'3.0'
 pylint==1.9.5 ; python_version<'3.0'
 pylint==2.7.2 ; python_version>'3.0'
@@ -273,10 +273,10 @@ pytools==2020.3
 pytz==2021.1
 PyYAML==5.4.1
 pyzmq==19.0.2
-qtconsole==4.7.7
+qtconsole==4.7.7 ; python_version> '3.0'
 QtPy==1.9.0
 repoze-lru==0.7
-rep==0.6.6
+rep==0.6.6 ; python_version> '3.0'
 requests==2.25.1
 requests-toolbelt==0.9.1 ; python_version> '3.0'
 requests-oauthlib==1.3.0 ; python_version> '3.0'
@@ -344,7 +344,7 @@ wcwidth==0.2.5
 webencodings==0.5.1
 Werkzeug==1.0.1
 wheel==0.33.6
-widgetsnbextension==3.5.1
+widgetsnbextension==3.5.1 ; python_version>'3.0'
 #cannot wrapt update before astroid is
 wrapt==1.11.2
 xgboost==0.82 ; python_version<'3.0'

diff --git a/pip/widgetsnbextension.file b/pip/widgetsnbextension.file
@@ -1 +1 @@
-Requires: py2-notebook py3-notebook
+Requires: py3-notebook
diff --git a/python_tools.spec b/python_tools.spec
@@ -29,9 +29,9 @@ Requires: py2-xgboost py3-xgboost
 Requires: py3-llvmlite
 Requires: py3-numba
 Requires: py2-hep_ml
-Requires: py2-rep
+Requires: py3-rep
 Requires: py2-uncertainties
-Requires: py2-hyperas
+Requires: py3-hyperas
 Requires: py2-hyperopt
 Requires: py2-seaborn
 Requires: py2-h5py
@@ -52,26 +52,26 @@ Requires: py2-psutil
 Requires: py2-repoze-lru
 Requires: py2-Jinja2
 Requires: py2-MarkupSafe
-Requires: py2-Pygments
+Requires: py3-Pygments
 Requires: py2-appdirs
 Requires: py2-argparse
 Requires: py2-bleach
 Requires: py2-certifi
 Requires: py2-decorator
 Requires: py2-html5lib
-Requires: py2-ipykernel
-Requires: py2-ipython
+Requires: py3-ipykernel
+Requires: py3-ipython
 Requires: py2-ipython_genutils
-Requires: py2-ipywidgets
+Requires: py3-ipywidgets
 Requires: py2-jsonschema
-Requires: py2-jupyter
-Requires: py2-jupyter_client
-Requires: py2-jupyter_console
-Requires: py2-jupyter_core
+Requires: py3-jupyter
+Requires: py3-jupyter_client
+Requires: py3-jupyter_console
+Requires: py3-jupyter_core
 Requires: py2-mistune
-Requires: py2-nbconvert
-Requires: py2-nbformat
-Requires: py2-notebook
+Requires: py3-nbconvert
+Requires: py3-nbformat
+Requires: py3-notebook
 Requires: py2-ordereddict
 Requires: py2-packaging
 Requires: py2-pandocfilters
@@ -82,7 +82,7 @@ Requires: py2-prompt_toolkit
 Requires: py2-ptyprocess
 Requires: py2-pyparsing
 Requires: py2-pyzmq
-Requires: py2-qtconsole
+Requires: py3-qtconsole
 Requires: py2-scandir
 Requires: py2-setuptools
 Requires: py3-setuptools
@@ -96,7 +96,7 @@ Requires: py2-tornado
 Requires: py2-traitlets
 Requires: py2-wcwidth
 Requires: py2-webencodings
-Requires: py2-widgetsnbextension
+Requires: py3-widgetsnbextension
 Requires: py2-cycler
 Requires: py2-docopt
 Requires: py2-futures
@@ -164,7 +164,7 @@ Requires: py2-typing
 Requires: py2-defusedxml
 Requires: py2-atomicwrites
 Requires: py2-attrs
-Requires: py2-nbdime
+Requires: py3-nbdime
 Requires: py2-onnx
 Requires: py3-onnxmltools
 Requires: py2-backports