Merge pull request #6962 from davidlange6/dl210602

Another set of python2 tools to be removed
cms-sw · Jun 3, 2021 · 59a2f5d · 59a2f5d
2 parents 9fb6ed0 + d6cadca
commit 59a2f5d
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 49 deletions.
diff --git a/pip/Keras.file b/pip/Keras.file
@@ -1,2 +1,2 @@
-Requires: py2-PyYAML py2-six py2-scipy py2-Theano
+Requires: py2-PyYAML py2-six py2-scipy py3-Theano
 Requires: py2-h5py py3-keras-applications py3-keras-preprocessing
diff --git a/pip/beautifulsoup4.file b/pip/beautifulsoup4.file
@@ -1 +1 @@
-Requires: py2-soupsieve
+Requires: py3-soupsieve
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 py3-Pygments py3-patch-ng py3-pluginbase
+Requires: py2-python-dateutil py2-requests py3-PyJWT py3-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/cryptography.file b/pip/cryptography.file
@@ -1 +1 @@
-Requires: py2-cffi py3-asn1crypto py2-enum34 py2-idna py2-ipaddress py2-six py2-wheel
+Requires: py2-cffi py3-asn1crypto py2-enum34 py2-idna py3-ipaddress py2-six py2-wheel
diff --git a/pip/downhill.file b/pip/downhill.file
@@ -1 +1 @@
-Requires: py2-Theano py3-Click
+Requires: py3-Theano py3-Click
diff --git a/pip/hep_ml.file b/pip/hep_ml.file
@@ -1,2 +1,2 @@
-Requires: py2-pandas py2-scikit-learn py2-Theano
+Requires: py3-Theano
 Requires: py3-pandas py3-scikit-learn
diff --git a/pip/hyperopt.file b/pip/hyperopt.file
@@ -1,4 +1,4 @@
-Requires: py2-six py2-pymongo py2-nose py2-networkx py2-future py2-pymongo py2-scipy py2-tqdm
-Requires: py3-scipy py3-networkx py2-cloudpickle
+Requires: py2-six py2-nose py2-networkx py2-future py3-pymongo py2-scipy py3-tqdm
+Requires: py3-scipy py3-networkx py3-cloudpickle
 %define patchsrc sed -i -e 's|packages = None|packages = ["hyperopt"]|' setup.py
 %define RelocatePython %{i}/bin/*
diff --git a/pip/ipykernel.file b/pip/ipykernel.file
@@ -1 +1 @@
-Requires: py3-ipython py3-jupyter_client py2-jedi py3-backcall
+Requires: py3-ipython py3-jupyter_client py3-jedi py3-backcall
diff --git a/pip/notebook.file b/pip/notebook.file
@@ -1,2 +1,2 @@
-Requires: py2-terminado py3-nbconvert py3-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client py2-argon2-cffi
+Requires: py3-terminado py3-nbconvert py3-ipykernel py3-Send2Trash py3-ipaddress py3-prometheus_client py3-argon2-cffi
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/py2-root_pandas.file b/pip/py2-root_pandas.file
diff --git a/pip/py3-ipython.file b/pip/py3-ipython.file
@@ -1,2 +1,2 @@
-Requires: py2-jedi py3-prompt_toolkit py3-backcall
+Requires: py3-jedi py3-prompt_toolkit py3-backcall
 %define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3
diff --git a/pip/rep.file b/pip/rep.file
@@ -1,2 +1,2 @@
-Requires: py2-hep_ml py3-theanets py2-nose py2-nose-parameterized py2-bokeh py3-mpld3 py2-neurolab py2-pybrain py2-xgboost
+Requires: py3-hep_ml py3-theanets py2-nose py2-nose-parameterized py3-mpld3 py3-neurolab py3-pybrain
 Requires: py3-notebook py3-xgboost py3-matplotlib py3-bokeh
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -17,7 +17,7 @@ absl-py==0.11.0
 aiohttp==3.7.4 ;python_version>'3.0'
 aiosqlite==0.17.0 ;python_version>'3.0'
 appdirs==1.4.4
-argon2-cffi==20.1.0
+argon2-cffi==20.1.0;python_version>'3.0'
 argparse==1.4.0
 asn1crypto==1.4.0; python_version>'3.0'
 astor==0.8.1; python_version>'3.0'
@@ -64,7 +64,7 @@ Click==7.1.2; python_version>'3.0'
 #NO_AUTO_UPDATE: Source is defined in climate.file, changing version here is not going to get new sources
 #Looks like package version in PyPi is very old
 climate==0.4.6; python_version>'3.0'
-cloudpickle==1.3.0
+cloudpickle==1.3.0; python_version>'3.0'
 colorama==0.4.4
 conan==1.34.1 ; python_version>'3.0'
 configparser==4.0.2;python_version<'3.0'
@@ -113,7 +113,7 @@ grpcio-tools==1.36.0
 h5py-cache==1.0 ; python_version>'3.0'
 h5py==2.10.0
 hepdata-lib==0.4.1 ; python_version>'3.0'
-hep_ml==0.6.2
+hep_ml==0.6.2;python_version>'3.0'
 hist==2.0.1 ; python_version>'3.0'
 histbook==1.2.5 ; python_version>'3.0'
 histoprint==1.6.0 ; python_version>'3.0'
@@ -126,23 +126,19 @@ 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'
+ipaddress==1.0.23;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.22.0 ; python_version>'3.0'
 ipywidgets==7.5.1 ; python_version>'3.0'
 isort==4.3.21
-jedi==0.17.2
+jedi==0.17.2; python_version>'3.0'
 Jinja2==2.11.3
 joblib==0.14.1 ; python_version<'3.0'
 joblib==1.0.1 ; python_version>'3.0'
 jsonpickle==1.4.2; python_version>'3.0'
 jsonschema==3.2.0; 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==6.2.0 ; python_version>'3.0'
 jupyter_core==4.6.3 ; python_version>'3.0'
 jupyter==1.0.0 ; python_version>'3.0'
@@ -183,11 +179,10 @@ nbdime==1.1.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'
-neurolab==0.3.5
+neurolab==0.3.5; python_version>'3.0'
 nose-parameterized==0.6.0
 nose==1.3.7
 node-semver==0.8.0 ; python_version>'3.0'
-notebook==5.7.10 ; python_version<'3.0'
 notebook==6.2.0 ; python_version>'3.0'
 numba==0.52.0 ; python_version>'3.0'
 numexpr==2.7.2
@@ -203,7 +198,6 @@ opt-einsum==3.3.0 ; python_version>'3.0'
 ordereddict==1.1
 pkginfo==1.7.0 ; python_version>'3.0'
 packaging==20.9
-pandas==0.24.2 ; python_version<'3.0'
 pandas==1.2.2 ; python_version>'3.0'
 pandocfilters==1.4.3
 parsimonious==0.8.1
@@ -224,7 +218,7 @@ ply==3.11; python_version>'3.0'
 poetry==1.1.4 ; python_version>'3.0'
 poetry-core==1.0.2 ; python_version>'3.0'
 prettytable==1.0.1
-prometheus_client==0.9.0
+prometheus_client==0.9.0; python_version>'3.0'
 prompt_toolkit==3.0.16 ; python_version>'3.0'
 protobuf==3.15.1
 prwlock==0.4.1; python_version>'3.0'
@@ -234,7 +228,7 @@ pyasn1-modules==0.2.8
 pyasn1==0.4.8
 pyasn1-modules==0.2.8 ; python_version>'3.0'
 pybind11==2.6.2
-pybrain==0.3.3
+pybrain==0.3.3; python_version>'3.0'
 pycodestyle==2.6.0
 pycparser==2.20
 pycuda==2019.1.2; python_version>'3.0'
@@ -245,7 +239,7 @@ Pygments==2.5.2 ; python_version<'3.0'
 Pygments==2.8.1 ; python_version>'3.0'
 PyJWT==2.0.1 ; python_version>'3.0'
 pylint==2.7.2 ; python_version>'3.0'
-pymongo==3.11.3
+pymongo==3.11.3; python_version>'3.0'
 pyparsing==2.4.7
 pyrsistent==0.16.0 ; python_version<'3.0'
 pyrsistent==0.17.3 ; python_version>'3.0'
@@ -286,7 +280,7 @@ scipy==1.2.3 ; python_version<'3.0'
 scipy==1.6.1 ; python_version>'3.0'
 threadpoolctl==2.0.0 ; python_version> '3.0'
 seaborn==0.9.1; python_version>'3.0'
-Send2Trash==1.5.0
+Send2Trash==1.5.0; python_version>'3.0'
 setuptools-scm==3.5.0
 shellingham==1.4.0 ; python_version> '3.0'
 simplegeneric==0.8.1
@@ -295,7 +289,7 @@ six==1.15.0
 skl2onnx==1.7.1 ; python_version>'3.0'
 smmap==3.0.4
 smmap2==3.0.1
-soupsieve==1.9.6
+soupsieve==1.9.6; python_version>'3.0'
 #to update the patch needs to be fixed...
 sqlalchemy==1.3.11
 stevedore==1.32.0; python_version>'3.0'
@@ -308,17 +302,17 @@ tensorboard-plugin-wit==1.8.0 ; python_version>'3.0'
 tensorflow==2.4.1 ; python_version>'3.0'
 tensorflow-estimator==2.4.0
 termcolor==1.1.0
-terminado==0.8.3
+terminado==0.8.3; python_version>'3.0'
 testpath==0.4.4 ; python_version<'3.0'
 testpath==0.4.4 ; python_version>'3.0'
 theanets==0.7.3; python_version>'3.0'
-Theano==1.0.5
+Theano==1.0.5; python_version>'3.0'
 toml==0.10.2
 tomlkit==0.7.0 ; python_version>'3.0'
 tornado==5.1.1 ; python_version<'3.0'
 tornado==6.1 ; python_version>'3.0'
 #update needs setuptools update I think
-tqdm==4.51.0
+tqdm==4.51.0; python_version>'3.0'
 traitlets==4.3.3; python_version>'3.0'
 typed-ast==1.4.2 ; python_version>'3.0'
 typing_extensions==3.7.4.3

diff --git a/pip/root_pandas.file b/pip/root_pandas.file
@@ -1 +1 @@
-Requires: py3-pandas py2-pandas py3-root_numpy
+Requires: py3-pandas py3-root_numpy
diff --git a/pip/seaborn.file b/pip/seaborn.file
@@ -1 +1 @@
-Requires: py3-matplotlib py2-scipy py2-pandas py3-scipy py3-pandas
+Requires: py3-matplotlib py3-scipy py3-pandas
diff --git a/pip/theanets.file b/pip/theanets.file
@@ -1 +1 @@
-Requires: py2-Theano py3-downhill py3-climate
+Requires: py3-Theano py3-downhill py3-climate
diff --git a/python_tools.spec b/python_tools.spec
@@ -7,27 +7,27 @@ Requires: root curl python python3 xrootd llvm hdf5 mxnet-predict yoda opencv
 
 Requires: py2-scipy
 Requires: py3-Keras
-Requires: py2-Theano
+Requires: py3-Theano
 Requires: py2-scikit-learn
 #save for the end
 Requires: py3-tensorflow
 Requires: py2-googlePackages
 Requires: py3-cmsml
 Requires: py3-law
 
-Requires: py2-cloudpickle
+Requires: py3-cloudpickle
 Requires: py3-tables
 Requires: py2-numexpr
 Requires: py3-histogrammar
-Requires: py2-pandas
+Requires: py3-pandas
 Requires: py3-root_numpy
 Requires: py3-Bottleneck
 Requires: py3-downhill
 Requires: py3-theanets
 Requires: py2-xgboost py3-xgboost
 Requires: py3-llvmlite
 Requires: py3-numba
-Requires: py2-hep_ml
+Requires: py3-hep_ml
 Requires: py3-rep
 Requires: py3-uncertainties
 Requires: py3-hyperas
@@ -89,7 +89,7 @@ Requires: py3-setuptools
 Requires: py2-simplegeneric
 Requires: py2-singledispatch
 Requires: py2-six
-Requires: py2-terminado
+Requires: py3-terminado
 Requires: py2-testpath
 Requires: py3-testpath
 Requires: py2-tornado
@@ -115,7 +115,7 @@ Requires: py2-mock
 Requires: py2-pbr
 Requires: py3-mpmath
 Requires: py3-sympy
-Requires: py2-tqdm
+Requires: py3-tqdm
 Requires: py2-funcsigs
 Requires: py2-nose
 Requires: py2-pkgconfig
@@ -172,13 +172,13 @@ Requires: py2-colorama
 Requires: py3-lxml
 Requires: py3-beautifulsoup4
 Requires: py2-GitPython py3-GitPython
-Requires: py2-Send2Trash
+Requires: py3-Send2Trash
 Requires: py2-gitdb2
-Requires: py2-ipaddress
+Requires: py3-ipaddress
 Requires: py2-mccabe
 Requires: py2-more-itertools
 Requires: py2-pluggy
-Requires: py2-prometheus_client
+Requires: py3-prometheus_client
 Requires: py2-pyasn1-modules
 Requires: py2-pyasn1
 Requires: py2-pyflakes
@@ -191,7 +191,7 @@ Requires: py3-backcall
 Requires: py2-cffi
 Requires: py3-cryptography
 Requires: py2-google-common
-Requires: py2-jedi
+Requires: py3-jedi
 Requires: py2-parso
 Requires: py2-pycparser
 Requires: py2-absl-py
@@ -204,11 +204,11 @@ Requires: py2-kiwisolver
 Requires: py2-bokeh py3-bokeh
 Requires: py3-climate
 Requires: py3-mpld3
-Requires: py2-neurolab
+Requires: py3-neurolab
 Requires: py2-nose-parameterized
 Requires: py2-pillow
-Requires: py2-pybrain
-Requires: py2-pymongo
+Requires: py3-pybrain
+Requires: py3-pymongo
 Requires: py3-pydot
 
 Requires: py2-astroid
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py2-cffi py3-asn1crypto py2-enum34 py2-idna py2-ipaddress py2-six py2-wheel
		Requires: py2-cffi py3-asn1crypto py2-enum34 py2-idna py3-ipaddress py2-six py2-wheel
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py2-Theano py3-Click
		Requires: py3-Theano py3-Click
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-ipython py3-jupyter_client py2-jedi py3-backcall
		Requires: py3-ipython py3-jupyter_client py3-jedi py3-backcall
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-pandas py2-pandas py3-root_numpy
		Requires: py3-pandas py3-root_numpy
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-matplotlib py2-scipy py2-pandas py3-scipy py3-pandas
		Requires: py3-matplotlib py3-scipy py3-pandas
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py2-Theano py3-downhill py3-climate
		Requires: py3-Theano py3-downhill py3-climate