Merge pull request #6973 from davidlange6/dl210603

removal of additional python2 tools

pip/GitPython.file

@@ -1 +1 @@
-Requires: py2-gitdb2 py2-smmap2 py3-gitdb
+Requires: py3-smmap2 py3-gitdb

pip/Jinja2.file

@@ -1 +1 @@
-Requires: py2-MarkupSafe
+Requires: py3-MarkupSafe

pip/Mako.file

@@ -1,2 +1,2 @@
-Requires: py2-MarkupSafe
+Requires: py3-MarkupSafe
 %define RelocatePython %{i}/bin/*

pip/astroid.file

@@ -1,2 +1,2 @@
-Requires: py2-lazy-object-proxy py2-six py2-wrapt py2-enum34 py2-singledispatch py2-backports-functools_lru_cache
+Requires: py3-lazy-object-proxy py2-six py2-wrapt py2-enum34 py2-singledispatch py2-backports-functools_lru_cache
 Requires: py2-pytest-runner

pip/avro.file

@@ -1,2 +1,2 @@
-Requires: py2-pycodestyle py2-isort
+Requires: py2-pycodestyle py3-isort
 %define RelocatePython %{i}/bin/*

pip/bokeh.file

@@ -1,3 +1,3 @@
-Requires: py2-tornado py2-pillow py2-PyYAML py2-python-dateutil py2-Jinja2 py2-numpy py2-packaging
+Requires: py2-tornado py2-pillow py2-PyYAML py2-python-dateutil py3-Jinja2 py2-numpy py2-packaging
 Requires: py3-tornado py3-numpy py3-pillow
 %define RelocatePython %{i}/bin/*

pip/climate.file

@@ -1,3 +1,3 @@
-Requires: py2-plac
+Requires: py3-plac
 %define source0 http://cmsrep.cern.ch/cmssw/download/climate-%{realversion}.tar.gz
 

pip/conan.file

@@ -1,3 +1,3 @@
-Requires: py2-python-dateutil py2-requests py3-PyJWT py3-tqdm py2-PyYAML py2-Jinja2 py3-Pygments py3-patch-ng py3-pluginbase
+Requires: py2-python-dateutil py3-requests py3-PyJWT py3-tqdm py2-PyYAML py3-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*

pip/flake8.file

@@ -1,2 +1,2 @@
-Requires: py2-backports py2-enum34 py2-mccabe py2-pycodestyle py2-pyflakes py2-entrypoints py2-functools32 py2-typing py2-importlib-metadata 
+Requires: py2-backports py2-enum34 py3-mccabe py2-pycodestyle py2-pyflakes py2-entrypoints py2-functools32 py2-typing py2-importlib-metadata
 %define RelocatePython %{i}/bin/*

pip/flit.file

@@ -1 +1 @@
-Requires: py2-docutils py3-flit-core py3-pytoml py2-requests
+Requires: py2-docutils py3-flit-core py3-pytoml py3-requests

pip/gitdb2.file

@@ -1 +1 @@
-Requires: py2-smmap2
+Requires: py3-smmap2

pip/ipython.file

@@ -1 +1 @@
-Requires: py3-traitlets py2-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py2-simplegeneric py2-backports
+Requires: py3-traitlets py3-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py3-simplegeneric py2-backports

pip/jedi.file

@@ -1 +1 @@
-Requires: py2-parso
+Requires: py3-parso

pip/jsonschema.file

@@ -1,4 +1,4 @@
-Requires: py2-functools32 py2-repoze-lru py2-argparse py2-pyrsistent py3-pyrsistent
+Requires: py2-functools32 py3-repoze-lru py2-argparse py2-pyrsistent py3-pyrsistent
 Requires: py2-attrs py2-six py2-importlib-metadata
 %define RelocatePython %{i}/bin/jsonschema
 

pip/jupyter_client.file

@@ -1,4 +1,4 @@
-Requires: py3-jupyter_core py2-tornado py2-python-dateutil py2-pyzmq
+Requires: py3-jupyter_core py2-tornado py2-python-dateutil py3-pyzmq
 Requires: py3-tornado
 %define RelocatePython %{i}/bin/*
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done

pip/matplotlib.file

@@ -1,2 +1,2 @@
-Requires: py3-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi
+Requires: py3-cycler py3-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi
 Requires: zlib libpng freetype

pip/mpld3.file

@@ -1 +1 @@
-Requires: py2-Jinja2 py3-matplotlib
+Requires: py3-Jinja2 py3-matplotlib

pip/mplhep.file

@@ -1 +1 @@
-Requires: py3-numpy py3-matplotlib py3-scipy py2-requests py2-packaging
+Requires: py3-numpy py3-matplotlib py3-scipy py3-requests py2-packaging

pip/nbconvert.file

@@ -1,3 +1,3 @@
-Requires: py2-Jinja2 py3-Pygments py3-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py3-nbformat
+Requires: py3-Jinja2 py3-Pygments py3-bleach py2-backports py2-defusedxml py2-entrypoints py3-mistune py2-pandocfilters py3-nbformat
 Requires: py3-testpath py2-testpath
 %define RelocatePython %{i}/bin/jupyter-nbconvert

pip/nbdime.file

@@ -1,4 +1,4 @@
-Requires: py2-GitPython py2-requests py2-colorama py2-backports
+Requires: py3-GitPython py3-requests py2-colorama py2-backports
 Requires: py3-notebook py3-GitPython
 %define RelocatePython %{i}/bin/*
 

pip/pexpect.file

@@ -1 +1 @@
-Requires: py2-ptyprocess
+Requires: py3-ptyprocess

pip/py2-matplotlib.file

@@ -1,4 +1,4 @@
-Requires: py2-pytz py2-backports py2-subprocess32 py2-numpy
+Requires: py2-pytz py2-backports py3-subprocess32 py2-numpy
 
 %define patchsrc \
 cat >> setup.cfg <<- EOF\

pip/py3-gitdb.file

@@ -1 +1 @@
-Requires: py2-smmap
+Requires: py3-smmap

pip/py3-keras2onnx.file

@@ -1,2 +1,2 @@
-Requires:  py3-numpy py2-protobuf py2-requests py2-onnx py3-onnxconverter-common py3-fire
+Requires: py3-numpy py2-protobuf py3-requests py2-onnx py3-onnxconverter-common py3-fire
 %define source0 https://github.com/onnx/keras-onnx/archive/v%{realversion}.tar.gz

pip/py3-tables.file

@@ -1,2 +1,2 @@
-Requires: py2-numexpr py2-six hdf5 bz2lib py2-mock py3-numpy
+Requires: py3-numexpr py2-six hdf5 bz2lib py3-mock py3-numpy
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done

pip/py3-tensorflow.file

@@ -1,4 +1,4 @@
-Requires: py3-tensorboard py3-opt-einsum py2-tensorflow-estimator py2-wrapt py2-google-pasta py3-scipy
-BuildRequires: tensorflow-sources
+Requires: py3-tensorboard py3-opt-einsum py3-tensorflow-estimator py2-wrapt py2-google-pasta py3-scipy
+Requires: tensorflow-sources
 %define PipPreBuildPy3 PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp38-cp38-linux_%{_arch}.whl
 %define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'

pip/pylint.file

@@ -1 +1 @@
-Requires: py2-astroid py2-six py2-isort py2-mccabe py2-configparser
+Requires: py3-astroid py2-six py3-isort py3-mccabe py2-configparser

pip/python-ldap.file

@@ -1,2 +1,2 @@
-Requires: python openldap py2-pyasn1-modules
+Requires: python openldap py3-pyasn1-modules
 %define PipBuildOptions --global-option=build_ext --global-option="-L${PYTHON_ROOT}/lib" --global-option="-L${OPENLDAP_ROOT}/lib" --global-option="-I${PYTHON_ROOT}/include" --global-option="-I${OPENLDAP_ROOT}/include"  --global-option="-UHAVE_SASL"

pip/qtconsole.file

@@ -1,2 +1,2 @@
-Requires: py3-ipykernel py2-QtPy
+Requires: py3-ipykernel py3-QtPy
 %define RelocatePython %{i}/bin/jupyter-qtconsole

pip/requests-oauthlib.file

@@ -1 +1 @@
-Requires: py3-oauthlib py2-requests
+Requires: py3-oauthlib py3-requests

pip/requests-toolbelt.file

@@ -1 +1 @@
-Requires: py2-requests
+Requires: py3-requests

pip/requests.file

@@ -1 +1 @@
-Requires: py2-urllib3 py2-chardet py2-idna py2-certifi
+Requires: py2-urllib3 py2-chardet py3-idna py2-certifi

pip/requirements.txt

@@ -21,7 +21,6 @@ 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'
-astroid==1.6.6 ; python_version<'3.0'
 astroid==2.5.1 ; python_version>'3.0'
 astunparse==1.6.3; python_version>'3.0'
 async-lru==1.0.2 ; python_version>'3.0'
@@ -43,7 +42,6 @@ backports-weakref==1.0.post1
 backports-os==0.1.1
 beautifulsoup4==4.9.3; python_version>'3.0'
 bleach==3.3.0; python_version>'3.0'
-bokeh==1.4.0 ; python_version<'3.0'
 bokeh==2.3.0 ; python_version>'3.0'
 boost-histogram==0.13 ; python_version>'3.0'
 bottle==0.12.19 ; python_version>'3.0'
@@ -71,7 +69,6 @@ configparser==4.0.2;python_version<'3.0'
 contextlib2==0.6.0.post1
 contextvars==2.4 ; python_version>'3.0'
 coverage==5.5
-cryptography==3.2.1; python_version>'3.0'
 cx-Oracle==7.3.0
 cycler==0.10.0; python_version>'3.0'
 cython==0.29.22
@@ -86,7 +83,7 @@ downhill==0.4.0; python_version>'3.0'
 entrypoints==0.3
 enum34==1.1.10;python_version<'3.0'
 fasteners==0.16 ; python_version>'3.0'
-filelock==3.0.12
+filelock==3.0.12; python_version>'3.0'
 fire==0.4.0; python_version>'3.0'
 flit==3.1.0; python_version>'3.0'
 flit-core==3.1.0; python_version>'3.0'
@@ -99,9 +96,7 @@ functools32==3.2.3-2;python_version<'3.0'
 future==0.18.2
 futures==3.3.0;python_version<'3.0'
 gast==0.4.0; python_version>'3.0'
-gitdb2==2.0.6 ; python_version<'3.0'
 gitdb==4.0.5 ; python_version>'3.0'
-GitPython==2.1.15 ; python_version<'3.0'
 GitPython==3.1.14 ; python_version>'3.0'
 google-auth==1.27.0 ; python_version>'3.0'
 google-auth-oauthlib==0.4.2 ; python_version>'3.0'
@@ -121,19 +116,19 @@ histogrammar==1.0.10 ; python_version>'3.0'
 html5lib==1.1; python_version>'3.0'
 hyperas==0.4.1 ; python_version>'3.0'
 hyperopt==0.2.5; python_version>'3.0'
-idna==2.10
+idna==2.10; python_version>'3.0'
 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;python_version>'3.0'
 ipykernel==5.5.0 ; python_version>'3.0'
-ipython_genutils==0.2.0
+ipython_genutils==0.2.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
+isort==4.3.21; python_version>'3.0'
 jedi==0.17.2; python_version>'3.0'
-Jinja2==2.11.3
+Jinja2==2.11.3; python_version>'3.0'
 joblib==0.14.1 ; python_version<'3.0'
 joblib==1.0.1 ; python_version>'3.0'
 jsonpickle==1.4.2; python_version>'3.0'
@@ -148,10 +143,10 @@ keras-applications==1.0.8; python_version>'3.0'
 keras-preprocessing==1.1.2; python_version>'3.0'
 keras2onnx==1.7.0 ; python_version>'3.0'
 keyring==22.3.0 ; python_version>'3.0'
-kiwisolver==1.1.0
+kiwisolver==1.1.0; python_version>'3.0'
 law==0.1.3; python_version>'3.0'
 #can not go to 1.5.x in python2 due to astroid
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.4.3; python_version>'3.0'
 lizard==1.17.7; python_version>'3.0'
 #NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources. Still, keep the version
 llvmlite==0.35.0 ; python_version>'3.0'
@@ -161,12 +156,12 @@ lxml==4.6.3; python_version>'3.0'
 lz4==2.2.1 ; python_version<'3.0'
 lz4==3.1.3 ; python_version>'3.0'
 Mako==1.1.4; python_version>'3.0'
-Markdown==3.1.1
-MarkupSafe==1.1.1
+Markdown==3.1.1; python_version>'3.0'
+MarkupSafe==1.1.1; python_version>'3.0'
 matplotlib==3.3.4 ; python_version>'3.0'
-mccabe==0.6.1
-mistune==0.8.4
-mock==3.0.5
+mccabe==0.6.1; python_version>'3.0'
+mistune==0.8.4; python_version>'3.0'
+mock==3.0.5; python_version>'3.0'
 more-itertools==5.0.0 ; python_version<'3.0'
 more-itertools==8.7.0 ; python_version>'3.0'
 mpld3==0.5.2; python_version>'3.0'
@@ -185,7 +180,7 @@ nose==1.3.7
 node-semver==0.8.0 ; python_version>'3.0'
 notebook==6.2.0 ; python_version>'3.0'
 numba==0.52.0 ; python_version>'3.0'
-numexpr==2.7.2
+numexpr==2.7.2; python_version>'3.0'
 numpy==1.16.6 ; python_version<'3.0'
 #numpy 1.19 needs an updated tensorflow
 numpy==1.17.5 ; python_version>'3.0'
@@ -201,17 +196,17 @@ packaging==20.9
 pandas==1.2.2 ; python_version>'3.0'
 pandocfilters==1.4.3
 parsimonious==0.8.1
-parso==0.7.1
+parso==0.7.1; python_version>'3.0'
 pastel==0.2.1 ; python_version>'3.0'
 patch-ng==1.17.4 ; python_version>'3.0'
 pathlib2==2.3.5
 pbr==5.5.1
 pexpect==4.8.0; python_version>'3.0'
-pickleshare==0.7.5
+pickleshare==0.7.5; python_version>'3.0'
 pillow==6.2.2 ; python_version<'3.0'
 pillow==8.1.1 ; python_version>'3.0'
 pkgconfig==1.5.2
-plac==1.3.2
+plac==1.3.2; python_version>'3.0'
 pluginbase==1.0.0 ; python_version>'3.0'
 pluggy==0.13.1
 ply==3.11; python_version>'3.0'
@@ -223,8 +218,8 @@ prompt_toolkit==3.0.16 ; python_version>'3.0'
 protobuf==3.15.1
 prwlock==0.4.1; python_version>'3.0'
 psutil==5.8.0; python_version>'3.0'
-ptyprocess==0.7.0
-pyasn1-modules==0.2.8
+ptyprocess==0.7.0; python_version>'3.0'
+pyasn1-modules==0.2.8; python_version>'3.0'
 pyasn1==0.4.8
 pyasn1-modules==0.2.8 ; python_version>'3.0'
 pybind11==2.6.2
@@ -259,12 +254,12 @@ pytoml==0.1.21;python_version>'3.0'
 pytools==2020.3;python_version>'3.0'
 pytz==2021.1
 PyYAML==5.4.1
-pyzmq==19.0.2
+pyzmq==19.0.2; python_version>'3.0'
 qtconsole==4.7.7 ; python_version> '3.0'
-QtPy==1.9.0
-repoze-lru==0.7
+QtPy==1.9.0; python_version>'3.0'
+repoze-lru==0.7; python_version>'3.0'
 rep==0.6.6 ; python_version> '3.0'
-requests==2.25.1
+requests==2.25.1; python_version>'3.0'
 requests-toolbelt==0.9.1 ; python_version> '3.0'
 requests-oauthlib==1.3.0 ; python_version> '3.0'
 root_numpy==4.8.0; python_version>'3.0'
@@ -283,24 +278,24 @@ seaborn==0.9.1; python_version>'3.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
+simplegeneric==0.8.1; python_version>'3.0'
 singledispatch==3.6.1
 six==1.15.0
 skl2onnx==1.7.1 ; python_version>'3.0'
-smmap==3.0.4
-smmap2==3.0.1
+smmap==3.0.4; python_version>'3.0'
+smmap2==3.0.1; python_version>'3.0'
 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'
-subprocess32==3.5.4
+subprocess32==3.5.4; python_version>'3.0'
 sympy==1.7.1 ; python_version>'3.0'
 tables==3.6.1 ; python_version>'3.0'
 #NO_AUTO_UPDATE:2: Force to use tensorflow 2.4.1; this should match the version in tensorflow-sources.spec
 tensorboard==2.4.1 ; python_version>'3.0'
 tensorboard-plugin-wit==1.8.0 ; python_version>'3.0'
 tensorflow==2.4.1 ; python_version>'3.0'
-tensorflow-estimator==2.4.0
+tensorflow-estimator==2.4.0; python_version>'3.0'
 termcolor==1.1.0
 terminado==0.8.3; python_version>'3.0'
 testpath==0.4.4 ; python_version<'3.0'

pip/smmap2.file

@@ -1 +1 @@
-Requires: py2-smmap
+Requires: py3-smmap

pip/tables.file

@@ -1,4 +1,4 @@
-Requires: py2-numexpr py2-six py2-numpy hdf5 bz2lib py2-mock
-BuildRequires: openmpi
+Requires: py3-numexpr py2-six py2-numpy hdf5 bz2lib py3-mock
+Requires: openmpi
 %define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc"; export DISABLE_AVX2=true
 %define PipBuildOptions  --global-option="--hdf5=${HDF5_ROOT}" --global-option="--bzip2=${BZ2LIB_ROOT}"

pip/tensorboard.file

@@ -1,2 +1,2 @@
-Requires: py2-Markdown py2-futures py3-Werkzeug py2-protobuf py3-html5lib py2-six py2-wheel py3-bleach
+Requires: py3-Markdown py2-futures py3-Werkzeug py2-protobuf py3-html5lib py2-six py2-wheel py3-bleach
 %define PipDownloadSourceType none

pip/tensorflow.file

@@ -1,5 +1,5 @@
 ## INCLUDE tensorflow-requires
-Requires: py2-funcsigs py2-pbr py2-packaging py2-appdirs py2-pyparsing py2-mock py3-Werkzeug
+Requires: py2-funcsigs py2-pbr py2-packaging py2-appdirs py2-pyparsing py3-mock py3-Werkzeug
 Requires: py2-grpcio py3-astunparse
 %define source0 none
 %define source_file none

pip/terminado.file

@@ -1,2 +1,2 @@
-Requires: py2-tornado py2-ptyprocess
+Requires: py2-tornado py3-ptyprocess
 Requires: py3-tornado py3-flit

pip/traitlets.file

@@ -1 +1 @@
-Requires: py2-ipython_genutils py2-six py2-decorator py2-enum34
+Requires: py3-ipython_genutils py2-six py2-decorator py2-enum34

pip/virtualenv.file

@@ -1,2 +1,2 @@
-Requires: py2-appdirs py2-distlib py2-filelock py2-six py2-importlib-metadata py2-importlib-resources
+Requires: py2-appdirs py2-distlib py3-filelock py2-six py2-importlib-metadata py2-importlib-resources
 %define RelocatePython %{i}/bin/*

pip/yarl.file

@@ -1 +1 @@
-Requires: py3-multidict py2-idna
+Requires: py3-multidict py3-idna