Merge pull request #7008 from davidlange6/dl210606

continue with removing python2 versions
cms-sw · Jun 10, 2021 · 3161cb9 · 3161cb9
2 parents 28cc644 + 13ed469
commit 3161cb9
Show file tree

Hide file tree

Showing 23 changed files with 50 additions and 59 deletions.
diff --git a/pip/Keras.file b/pip/Keras.file
@@ -1,2 +1,2 @@
-Requires: py2-PyYAML py2-six py2-scipy py3-Theano
-Requires: py2-h5py py3-keras-applications py3-keras-preprocessing
+Requires: py3-PyYAML py2-six py2-scipy py3-Theano
+Requires: py3-h5py py3-keras-applications py3-keras-preprocessing
diff --git a/pip/bokeh.file b/pip/bokeh.file
@@ -1,3 +1,3 @@
-Requires: py2-pillow py2-PyYAML py3-python-dateutil py3-Jinja2 py2-numpy py2-packaging
+Requires: py2-pillow py3-PyYAML py3-python-dateutil py3-Jinja2 py2-numpy py2-packaging
 Requires: py3-tornado py3-numpy py3-pillow
 %define RelocatePython %{i}/bin/*
diff --git a/pip/cffi.file b/pip/cffi.file
@@ -1,2 +1,2 @@
-Requires: py2-pycparser libffi
+Requires: py3-pycparser libffi
 %define PipBuildOptions --global-option=build_ext --global-option="-L${LIBFFI_ROOT}/lib64" --global-option="-I${LIBFFI_ROOT}/include"
diff --git a/pip/conan.file b/pip/conan.file
@@ -1,3 +1,3 @@
-Requires: py3-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
+Requires: py3-python-dateutil py3-requests py3-PyJWT py3-tqdm py3-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 py3-colorama
 %define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/conan*
diff --git a/pip/flake8.file b/pip/flake8.file
@@ -1,2 +1,2 @@
-Requires: py2-backports py2-enum34 py3-mccabe py3-pycodestyle py2-pyflakes py3-entrypoints py2-typing py2-importlib-metadata
+Requires: py2-backports py2-enum34 py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py2-typing py2-importlib-metadata
 %define RelocatePython %{i}/bin/*
diff --git a/pip/h5py.file b/pip/h5py.file
@@ -1,3 +1,3 @@
 Requires: py2-numpy py3-numpy hdf5 py2-six
-BuildRequires: py2-cython py2-pkgconfig openmpi
+Requires: py2-cython py3-pkgconfig openmpi
 %define PipPreBuild export HDF5_DIR=${HDF5_ROOT} CC="mpicc"
diff --git a/pip/hepdata-lib.file b/pip/hepdata-lib.file
@@ -1 +1 @@
-Requires: root py2-pytest py3-pytest-cov py2-PyYAML py2-future py3-pylint
+Requires: root py2-pytest py3-pytest-cov py3-PyYAML py2-future py3-pylint
diff --git a/pip/html5lib.file b/pip/html5lib.file
@@ -1 +1 @@
-Requires: py2-ordereddict py2-six py2-packaging py3-webencodings py2-pyparsing py2-appdirs
+Requires: py3-ordereddict py2-six py2-packaging py3-webencodings py2-pyparsing py2-appdirs
diff --git a/pip/hyperopt.file b/pip/hyperopt.file
@@ -1,4 +1,4 @@
-Requires: py2-six py2-nose py2-future py3-pymongo py2-scipy py3-tqdm
+Requires: py2-six py3-nose 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/importlib-metadata.file b/pip/importlib-metadata.file
@@ -1 +1 @@
-Requires: py2-zipp py2-contextlib2 py2-configparser py2-pathlib2 py3-zipp
+Requires: py2-contextlib2 py2-configparser py2-pathlib2 py3-zipp py2-zipp
diff --git a/pip/importlib-resources.file b/pip/importlib-resources.file
@@ -1,3 +1,3 @@
 Requires: py2-wheel
-Requires: py2-pathlib2 py2-contextlib2 py3-singledispatch py2-typing py2-zipp py2-importlib-metadata py3-zipp
+Requires: py2-pathlib2 py2-contextlib2 py3-singledispatch py2-typing py2-importlib-metadata py3-zipp
 
diff --git a/pip/jsonschema.file b/pip/jsonschema.file
@@ -1,4 +1,4 @@
-Requires: py3-repoze-lru py2-argparse py2-pyrsistent py3-pyrsistent
+Requires: py3-repoze-lru py3-argparse py3-pyrsistent
 Requires: py2-attrs py2-six py2-importlib-metadata
 %define RelocatePython %{i}/bin/jsonschema
 
diff --git a/pip/keras-applications.file b/pip/keras-applications.file
@@ -1 +1 @@
-Requires: py2-numpy py2-h5py py3-numpy
+Requires: py2-numpy py3-h5py py3-numpy
diff --git a/pip/lz4.file b/pip/lz4.file
@@ -1,4 +1,4 @@
-Requires: lz4 py2-future py2-pkgconfig py2-setuptools-scm
+Requires: lz4 py2-future py3-pkgconfig py2-setuptools-scm
 
 %define PipBuildOptions  --global-option=build_ext --global-option="-L${LZ4_ROOT}/lib"  --global-option="-I${LZ4_ROOT}/include"
 

diff --git a/pip/nbdime.file b/pip/nbdime.file
@@ -1,4 +1,4 @@
-Requires: py3-GitPython py3-requests py2-colorama py2-backports
+Requires: py3-GitPython py3-requests py3-colorama py2-backports
 Requires: py3-notebook py3-GitPython
 %define RelocatePython %{i}/bin/*
 

diff --git a/pip/pkgconfig.file b/pip/pkgconfig.file
@@ -1,2 +1,2 @@
-Requires: py2-nose
-BuildRequires: py3-poetry
+Requires: py3-nose
+Requires: py3-poetry
diff --git a/pip/pytest-cov.file b/pip/pytest-cov.file
@@ -1,2 +1 @@
-Requires: py2-pytest py2-coverage
-Requires: py3-pytest
+Requires: py3-pytest py3-coverage
diff --git a/pip/rep.file b/pip/rep.file
@@ -1,2 +1,2 @@
-Requires: py3-hep_ml py3-theanets py2-nose py2-nose-parameterized py3-mpld3 py3-neurolab py3-pybrain
+Requires: py3-hep_ml py3-theanets py3-nose py3-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
@@ -18,7 +18,7 @@ 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;python_version>'3.0'
-argparse==1.4.0
+argparse==1.4.0; python_version>'3.0'
 asn1crypto==1.4.0; python_version>'3.0'
 astor==0.8.1; python_version>'3.0'
 astroid==2.5.1 ; python_version>'3.0'
@@ -32,7 +32,7 @@ avro==1.10.1; python_version>'3.0'
 awkward==0.14.0; python_version>'3.0'
 awkward1==0.4.4; python_version>'3.0'
 backcall==0.2.0 ; python_version>'3.0'
-backports_abc==0.5
+#backports_abc==0.5
 backports-functools_lru_cache==1.6.1
 backports-lzma==0.0.14
 backports-shutil_get_terminal_size==1.0.0
@@ -47,7 +47,6 @@ boost-histogram==0.13 ; python_version>'3.0'
 bottle==0.12.19 ; python_version>'3.0'
 Bottleneck==1.3.2; python_version>'3.0'
 cachecontrol==0.12.6 ; python_version>'3.0'
-cachetools==3.1.1 ; python_version<'3.0'
 cachetools==4.2.1 ; python_version>'3.0'
 cachy==0.3.0 ; python_version>'3.0'
 cleo==0.8.1 ; python_version>'3.0'
@@ -63,12 +62,12 @@ Click==7.1.2; python_version>'3.0'
 #Looks like package version in PyPi is very old
 climate==0.4.6; python_version>'3.0'
 cloudpickle==1.3.0; python_version>'3.0'
-colorama==0.4.4
+colorama==0.4.4; python_version>'3.0'
 conan==1.34.1 ; python_version>'3.0'
 configparser==4.0.2;python_version<'3.0'
 contextlib2==0.6.0.post1
 contextvars==2.4 ; python_version>'3.0'
-coverage==5.5
+coverage==5.5; python_version>'3.0'
 cx-Oracle==7.3.0
 cycler==0.10.0; python_version>'3.0'
 cython==0.29.22
@@ -105,7 +104,7 @@ grpcio==1.36.0
 grpcio-tools==1.36.0 
 #1.0.1 doesn't download (wheel only?)
 h5py-cache==1.0 ; python_version>'3.0'
-h5py==2.10.0
+h5py==2.10.0; python_version>'3.0'
 hepdata-lib==0.4.1 ; python_version>'3.0'
 hep_ml==0.6.2;python_version>'3.0'
 hist==2.0.1 ; python_version>'3.0'
@@ -129,7 +128,6 @@ isort==4.3.21; python_version>'3.0'
 jedi==0.17.2; python_version>'3.0'
 Jinja2==2.11.3; python_version<'3.0'
 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'
 jsonschema==3.2.0; python_version>'3.0'
@@ -153,7 +151,6 @@ llvmlite==0.35.0 ; python_version>'3.0'
 lockfile==0.12.2; python_version>'3.0'
 luigi==3.0.2 ; python_version>'3.0'
 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; python_version>'3.0'
@@ -175,8 +172,8 @@ nbdime==1.1.0 ; python_version> '3.0'
 nbformat==5.1.2 ; python_version>'3.0'
 networkx==2.5 ; python_version>'3.0'
 neurolab==0.3.5; python_version>'3.0'
-nose-parameterized==0.6.0
-nose==1.3.7
+nose-parameterized==0.6.0; python_version>'3.0'
+nose==1.3.7; python_version>'3.0'
 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'
@@ -189,7 +186,7 @@ onnxmltools==1.7.0 ; python_version>'3.0'
 onnxconverter-common==1.7.0 ; python_version>'3.0'
 oauthlib==3.1.0 ; python_version>'3.0'
 opt-einsum==3.3.0 ; python_version>'3.0'
-ordereddict==1.1
+ordereddict==1.1; python_version>'3.0'
 pkginfo==1.7.0 ; python_version>'3.0'
 packaging==20.9
 pandas==1.2.2 ; python_version>'3.0'
@@ -204,7 +201,7 @@ pexpect==4.8.0; python_version>'3.0'
 pickleshare==0.7.5; python_version>'3.0'
 pillow==6.2.2 ; python_version<'3.0'
 pillow==8.2.0 ; python_version>'3.0'
-pkgconfig==1.5.2
+pkgconfig==1.5.2; python_version>'3.0'
 plac==1.3.2; python_version>'3.0'
 pluginbase==1.0.0 ; python_version>'3.0'
 pluggy==0.13.1
@@ -224,18 +221,16 @@ pyasn1-modules==0.2.8 ; python_version>'3.0'
 pybind11==2.6.2
 pybrain==0.3.3; python_version>'3.0'
 pycodestyle==2.6.0; python_version>'3.0'
-pycparser==2.20
+pycparser==2.20; python_version>'3.0'
 pycuda==2019.1.2; python_version>'3.0'
 pycurl==7.43.0.5
 pydot==1.4.2; python_version>'3.0'
-pyflakes==2.2.0
-Pygments==2.5.2 ; python_version<'3.0'
+pyflakes==2.2.0; 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; python_version>'3.0'
 pyparsing==2.4.7
-pyrsistent==0.16.0 ; python_version<'3.0'
 pyrsistent==0.17.3 ; python_version>'3.0'
 py==1.10.0
 pydantic==1.8.2 ; python_version>'3.0'
@@ -253,7 +248,7 @@ python-rapidjson==1.0;python_version>'3.0'
 pytoml==0.1.21;python_version>'3.0'
 pytools==2020.3;python_version>'3.0'
 pytz==2021.1; python_version>'3.0'
-PyYAML==5.4.1
+PyYAML==5.4.1; python_version>'3.0'
 pyzmq==19.0.2; python_version>'3.0'
 qtconsole==4.7.7 ; python_version> '3.0'
 QtPy==1.9.0; python_version>'3.0'
@@ -330,5 +325,5 @@ xgboost==1.3.3 ; python_version>'3.0'
 #bumping this pulls in xrootd - which looks like it needs some understanding
 xrootdpyfs==0.2.1; python_version>'3.0'
 yarl==1.6.3 ;python_version>'3.0'
-zipp==1.2.0 ; python_version<'3.0'
 zipp==3.4.0 ; python_version>'3.0'
+zipp==1.2.0 ; python_version<'3.0'
diff --git a/pip/tornado.file b/pip/tornado.file
@@ -1 +1 @@
-Requires: py2-six py3-singledispatch py2-backports_abc py2-futures
+Requires: py2-six py3-singledispatch
diff --git a/pip/uproot.file b/pip/uproot.file
@@ -1,2 +1,2 @@
-Requires: py2-numpy py3-awkward py3-uproot-methods py2-cachetools
+Requires: py2-numpy py3-awkward py3-uproot-methods
 Requires: py3-cachetools
diff --git a/pip/uproot4.file b/pip/uproot4.file
@@ -1,2 +1,2 @@
-Requires: py2-numpy py3-awkward1 py3-uproot-methods py2-cachetools
+Requires: py2-numpy py3-awkward1 py3-uproot-methods
 Requires: py3-cachetools
diff --git a/python_tools.spec b/python_tools.spec
@@ -32,12 +32,12 @@ Requires: py3-uncertainties
 Requires: py3-hyperas
 Requires: py3-hyperopt
 Requires: py3-seaborn
-Requires: py2-h5py
+Requires: py3-h5py
 Requires: py3-h5py-cache
 Requires: py3-uproot
 Requires: py3-uproot4
 Requires: py3-opt-einsum
-Requires: py2-joblib py3-joblib
+Requires: py3-joblib
 
 #this DOES NOT depend on numpy..
 Requires: py3-xrootdpyfs
@@ -47,10 +47,9 @@ Requires: root curl python openldap
 Requires: py3-entrypoints
 Requires: py3-psutil
 Requires: py3-repoze-lru
-Requires: py2-Pygments
 Requires: py3-Pygments
 Requires: py2-appdirs
-Requires: py2-argparse
+Requires: py3-argparse
 Requires: py3-bleach
 Requires: py3-certifi
 Requires: py3-decorator
@@ -68,7 +67,7 @@ Requires: py3-mistune
 Requires: py3-nbconvert
 Requires: py3-nbformat
 Requires: py3-notebook
-Requires: py2-ordereddict
+Requires: py3-ordereddict
 Requires: py2-packaging
 Requires: py3-pandocfilters
 Requires: py2-pathlib2
@@ -109,8 +108,8 @@ Requires: py3-mpmath
 Requires: py3-sympy
 Requires: py3-tqdm
 Requires: py2-funcsigs
-Requires: py2-nose
-Requires: py2-pkgconfig
+Requires: py3-nose
+Requires: py3-pkgconfig
 Requires: py2-pysqlite
 Requires: py3-Click
 Requires: py3-jsonpickle
@@ -134,7 +133,7 @@ Requires: py2-numpy-toolfile
 Requires: py2-sqlalchemy
 Requires: py2-pygithub
 Requires: py3-dxr-toolfile
-Requires: py2-PyYAML
+Requires: py3-PyYAML
 Requires: py3-pylint
 Requires: py2-pip
 Requires: py3-pip
@@ -148,7 +147,7 @@ Requires: py3-histbook
 Requires: py3-flake8
 Requires: py3-autopep8
 Requires: py3-pycodestyle
-Requires: py2-lz4
+Requires: py3-lz4
 Requires: py3-ply
 Requires: py2-py
 Requires: py2-typing
@@ -159,8 +158,7 @@ Requires: py3-nbdime
 Requires: py2-onnx
 Requires: py3-onnxmltools
 Requires: py2-backports
-Requires: py2-backports_abc
-Requires: py2-colorama
+Requires: py3-colorama
 Requires: py3-lxml
 Requires: py3-beautifulsoup4
 Requires: py3-GitPython py3-GitPython
@@ -172,7 +170,7 @@ Requires: py2-pluggy
 Requires: py3-prometheus_client
 Requires: py3-pyasn1-modules
 Requires: py2-pyasn1
-Requires: py2-pyflakes
+Requires: py3-pyflakes
 Requires: py3-smmap2
 Requires: py3-stevedore
 Requires: py2-typing_extensions
@@ -183,7 +181,7 @@ Requires: py3-cffi
 Requires: py2-google-common
 Requires: py3-jedi
 Requires: py3-parso
-Requires: py2-pycparser
+Requires: py3-pycparser
 Requires: py2-absl-py
 Requires: py3-gast
 Requires: py2-grpcio
@@ -195,14 +193,13 @@ Requires: py3-bokeh py3-bokeh
 Requires: py3-climate
 Requires: py3-mpld3
 Requires: py3-neurolab
-Requires: py2-nose-parameterized
+Requires: py3-nose-parameterized
 Requires: py2-pillow
 Requires: py3-pybrain
 Requires: py3-pymongo
 Requires: py3-pydot
 
 Requires: py3-astroid
-Requires: py2-coverage
 Requires: py3-hepdata-lib
 Requires: py3-isort
 Requires: py3-lazy-object-proxy
@@ -214,7 +211,7 @@ Requires: py3-filelock
 Requires: py3-gitdb
 Requires: py3-importlib-resources
 Requires: py3-smmap
-Requires: py2-zipp py3-zipp
+Requires: py3-zipp
 
 Requires: py3-pycuda
 Requires: onnxruntime