cms-sw · smuzaffar · Jul 5, 2021 · Jul 5, 2021
diff --git a/das-cache.file b/das-cache.file
diff --git a/fwlite-tool-conf.spec b/fwlite-tool-conf.spec
@@ -43,6 +43,7 @@ Requires: tinyxml2-toolfile
 Requires: md5-toolfile
 Requires: davix-toolfile
 Requires: py2-numpy-toolfile
+Requires: py3-numpy-toolfile
 Requires: OpenBLAS-toolfile
 Requires: py3-pybind11-toolfile
 Requires: fwlite_python_tools

diff --git a/fwlite_python_tools.spec b/fwlite_python_tools.spec
@@ -4,8 +4,9 @@
 Source: none
 
 Requires: py2-six
+Requires: py3-six
 Requires: py3-scipy
-Requires: py2-numpy
+Requires: py3-numpy
 
 %prep
 

diff --git a/madgraph5amcatnlo.spec b/madgraph5amcatnlo.spec
@@ -7,7 +7,7 @@ Patch0: madgraph5amcatnlo-config
 # Compile and install internal and external packages
 Patch1: madgraph5amcatnlo-compile
 
-Requires: python3 py2-six
+Requires: python3 py3-six
 Requires: hepmc
 # Needed for ExRoot analysis package
 Requires: root   

diff --git a/mxnet-predict.spec b/mxnet-predict.spec
@@ -9,7 +9,7 @@ Source: git+https://github.com/%{github_user}/incubator-mxnet.git?obj=%{branch}/
 
 BuildRequires: cmake ninja
 
-Requires: OpenBLAS python3 py2-numpy py3-numpy
+Requires: OpenBLAS python3 py3-numpy
 
 %prep
 %setup -q -n %{n}-%{realversion}

diff --git a/onnxruntime.spec b/onnxruntime.spec
@@ -6,7 +6,7 @@
 Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake ninja
-Requires: protobuf py3-numpy py2-wheel py3-onnx zlib libpng py3-pybind11
+Requires: protobuf py3-numpy py3-wheel py3-onnx zlib libpng py3-pybind11
 %if "%{cmsos}" != "slc7_aarch64"
 Requires: cuda cudnn
 %endif

diff --git a/opencv.spec b/opencv.spec
@@ -7,7 +7,7 @@
 Source0: git+https://github.com/%{github_user}/opencv.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
 Source1: https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/19692.patch
 BuildRequires: cmake ninja
-Requires: python3 py2-numpy py3-numpy libpng libjpeg-turbo libtiff zlib eigen OpenBLAS
+Requires: python3 py3-numpy libpng libjpeg-turbo libtiff zlib eigen OpenBLAS
 
 %prep
 %setup -n %{n}-%{realversion}

diff --git a/pip/Bottleneck.file b/pip/Bottleneck.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy py2-wheel
+Requires: py3-numpy py3-wheel
diff --git a/pip/Keras.file b/pip/Keras.file
@@ -1,2 +1,2 @@
-Requires: py2-PyYAML py2-six py3-Theano
+Requires: py3-PyYAML py3-six py3-Theano
 Requires: py3-h5py py3-keras-applications py3-keras-preprocessing
diff --git a/pip/PyJWT.file b/pip/PyJWT.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/absl-py.file b/pip/absl-py.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file
@@ -1 +1 @@
-Requires: py3-cffi py2-six py2-wheel
+Requires: py3-cffi py3-six py3-wheel
diff --git a/pip/astroid.file b/pip/astroid.file
@@ -1,2 +1,2 @@
-Requires: py3-lazy-object-proxy py2-six py3-wrapt py3-singledispatch py2-backports-functools_lru_cache
+Requires: py3-lazy-object-proxy py3-six py3-wrapt py3-singledispatch
 Requires: py3-pytest-runner
diff --git a/pip/astunparse.file b/pip/astunparse.file
@@ -1 +1 @@
-Requires: py2-wheel py2-six
+Requires: py3-wheel py3-six
diff --git a/pip/attrs.file b/pip/attrs.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/awkward.file b/pip/awkward.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy py3-pytest-runner
+Requires: py3-numpy py3-pytest-runner
diff --git a/pip/awkward1.file b/pip/awkward1.file
@@ -1,2 +1,2 @@
-Requires: py2-numpy py3-numpy py3-pytest-runner py3-pybind11 cmake
+Requires: py3-numpy py3-pytest-runner py3-pybind11 cmake
 %define source0 git+https://github.com/scikit-hep/awkward-1.0?obj=main/%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/source.tar.gz
diff --git a/pip/backports-os.file b/pip/backports-os.file
diff --git a/pip/backports-weakref.file b/pip/backports-weakref.file
diff --git a/pip/bokeh.file b/pip/bokeh.file
@@ -1,3 +1,3 @@
-Requires: py2-PyYAML py3-python-dateutil py3-Jinja2 py2-numpy py3-packaging
+Requires: py3-PyYAML py3-python-dateutil py3-Jinja2 py3-numpy py3-packaging
 Requires: py3-tornado py3-numpy py3-pillow
 %define RelocatePython %{i}/bin/*
diff --git a/pip/boost-histogram.file b/pip/boost-histogram.file
@@ -1 +1 @@
-Requires: py3-numpy py3-typing py2-wheel
+Requires: py3-numpy py3-typing py3-wheel
diff --git a/pip/cachy.file b/pip/cachy.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/cmsml.file b/pip/cmsml.file
@@ -1,3 +1,3 @@
-Requires: py2-six
+Requires: py3-six
 
 %define RelocatePython %{i}/bin/*
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 py3-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 py3-future py3-deprecation py3-bottle py3-colorama
 %define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/conan*
diff --git a/pip/cycler.file b/pip/cycler.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/fasteners.file b/pip/fasteners.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/fire.file b/pip/fire.file
@@ -1 +1 @@
-Requires: py2-six py3-termcolor
+Requires: py3-six py3-termcolor
diff --git a/pip/fs.file b/pip/fs.file
@@ -1,2 +1,2 @@
-Requires: py2-six py3-typing py3-appdirs py3-pytz
+Requires: py3-six py3-typing py3-appdirs py3-pytz
 %define RelocatePython %{i}/bin/*
diff --git a/pip/google-auth.file b/pip/google-auth.file
@@ -1 +1 @@
-Requires: py3-cachetools py3-pyasn1-modules py3-rsa py2-six
+Requires: py3-cachetools py3-pyasn1-modules py3-rsa py3-six
diff --git a/pip/google-pasta.file b/pip/google-pasta.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/grpcio.file b/pip/grpcio.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/h5py.file b/pip/h5py.file
@@ -1,3 +1,3 @@
-Requires: py2-numpy py3-numpy hdf5 py2-six
+Requires: py3-numpy hdf5 py3-six
 Requires: py3-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 py3-pytest py3-pytest-cov py2-PyYAML py2-future py3-pylint
+Requires: root py3-pytest py3-pytest-cov py3-PyYAML py3-future py3-pylint
diff --git a/pip/histbook.file b/pip/histbook.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy
+Requires: py3-numpy
diff --git a/pip/histoprint.file b/pip/histoprint.file
@@ -1 +1 @@
-Requires: py3-numpy py2-setuptools-scm py3-toml py3-Click
+Requires: py3-numpy py3-setuptools-scm py3-toml py3-Click
diff --git a/pip/html5lib.file b/pip/html5lib.file
@@ -1 +1 @@
-Requires: py2-six py3-packaging py3-webencodings py3-pyparsing py3-appdirs
+Requires: py3-six py3-packaging py3-webencodings py3-pyparsing py3-appdirs
diff --git a/pip/hyperopt.file b/pip/hyperopt.file
@@ -1,4 +1,4 @@
-Requires: py2-six py3-nose py2-future py3-pymongo py3-scipy py3-tqdm
+Requires: py3-six py3-nose py3-pymongo py3-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-resources.file b/pip/importlib-resources.file
@@ -1,3 +1,3 @@
-Requires: py2-wheel
+Requires: py3-wheel
 Requires: py3-pathlib2 py3-contextlib2 py3-singledispatch py3-typing py3-importlib-metadata py3-zipp
 
diff --git a/pip/iniconfig.file b/pip/iniconfig.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/isort.file b/pip/isort.file
@@ -1,4 +1,2 @@
-Requires:  py2-backports-functools_lru_cache
-
 %define patchsrc sed -i -e '/.*futures.*/d' isort.egg-info/requires.txt setup.py
 %define RelocatePython %{i}/bin/*
diff --git a/pip/jsonpickle.file b/pip/jsonpickle.file
@@ -1,4 +1,4 @@
-Requires: py2-wheel
+Requires: py3-wheel
 Requires: py3-importlib-metadata
 
 
diff --git a/pip/jsonschema.file b/pip/jsonschema.file
@@ -1,4 +1,4 @@
 Requires: py3-repoze-lru py3-argparse py3-pyrsistent
-Requires: py3-attrs py2-six py3-importlib-metadata
+Requires: py3-attrs py3-six py3-importlib-metadata
 %define RelocatePython %{i}/bin/jsonschema
 
diff --git a/pip/keras-applications.file b/pip/keras-applications.file
@@ -1 +1 @@
-Requires: py2-numpy py3-h5py py3-numpy
+Requires: py3-h5py py3-numpy
diff --git a/pip/keras-preprocessing.file b/pip/keras-preprocessing.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy py2-six
+Requires: py3-numpy py3-six
diff --git a/pip/keyring.file b/pip/keyring.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/law.file b/pip/law.file
@@ -1,3 +1,3 @@
-Requires: py2-six py3-luigi py3-scinum
+Requires: py3-six py3-luigi py3-scinum
 
 %define RelocatePython %{i}/bin/*
diff --git a/pip/lazy-object-proxy.file b/pip/lazy-object-proxy.file
@@ -1 +1 @@
-Requires: py2-setuptools-scm
+Requires: py3-setuptools-scm
diff --git a/pip/llvmlite.file b/pip/llvmlite.file
@@ -1,4 +1,4 @@
-Requires: llvm py2-wheel 
+Requires: llvm py3-wheel 
 Patch0: py2-llvmlite-fpic-flag
 Patch1: py2-llvmlite-llvm9
 Patch2: py2-llvmlite-removeduplicate

diff --git a/pip/lockfile.file b/pip/lockfile.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/lz4.file b/pip/lz4.file
@@ -1,4 +1,4 @@
-Requires: lz4 py2-future py3-pkgconfig py2-setuptools-scm
+Requires: lz4 py3-future py3-pkgconfig py3-setuptools-scm
 
 %define PipBuildOptions  --global-option=build_ext --global-option="-L${LZ4_ROOT}/lib"  --global-option="-I${LZ4_ROOT}/include"
 

diff --git a/pip/mock.file b/pip/mock.file
@@ -1 +1 @@
-Requires: py2-six py3-funcsigs py3-pbr
+Requires: py3-six py3-funcsigs py3-pbr
diff --git a/pip/more-itertools.file b/pip/more-itertools.file
@@ -1 +1 @@
-Requires: py2-six py2-wheel
+Requires: py3-six py3-wheel
diff --git a/pip/mpmath.file b/pip/mpmath.file
@@ -1 +1 @@
-BuildRequires: py2-wheel
+BuildRequires: py3-wheel
diff --git a/pip/multidict.file b/pip/multidict.file
@@ -1 +1 @@
-Requires: py2-wheel
+Requires: py3-wheel
diff --git a/pip/numexpr.file b/pip/numexpr.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy
+Requires: py3-numpy
diff --git a/pip/onnx.file b/pip/onnx.file
@@ -1,4 +1,4 @@
-Requires: cmake py2-numpy protobuf py3-protobuf py2-six py3-typing_extensions py3-numpy py3-pytest-runner
+Requires: cmake protobuf py3-protobuf py3-six py3-typing_extensions py3-numpy py3-pytest-runner
 
 %define PipPreBuild export ONNX_ML=1
 %define RelocatePython %{i}/bin/*
diff --git a/pip/packaging.file b/pip/packaging.file
@@ -1 +1 @@
-Requires: py3-pyparsing py2-six py3-attrs
+Requires: py3-pyparsing py3-six py3-attrs
diff --git a/pip/pandas.file b/pip/pandas.file
@@ -1 +1 @@
-Requires: py2-six py3-python-dateutil py3-pytz py2-numpy py3-numpy py3-cython
+Requires: py3-six py3-python-dateutil py3-pytz py3-numpy py3-cython
diff --git a/pip/parsimonious.file b/pip/parsimonious.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/pathlib2.file b/pip/pathlib2.file
@@ -1 +1 @@
-Requires: py2-six py3-scandir
+Requires: py3-six py3-scandir
diff --git a/pip/prompt_toolkit.file b/pip/prompt_toolkit.file
@@ -1 +1 @@
-Requires: py2-six py2-wcwidth
+Requires: py3-six py3-wcwidth py3-wheel
diff --git a/pip/protobuf.file b/pip/protobuf.file
@@ -1 +1 @@
-Requires: py2-six py3-packaging py3-pyparsing py3-appdirs
+Requires: py3-six py3-packaging py3-pyparsing py3-appdirs
diff --git a/pip/py.file b/pip/py.file
@@ -1 +1 @@
-Requires: py2-setuptools-scm
+Requires: py3-setuptools-scm
diff --git a/pip/py2-Jinja2.file b/pip/py2-Jinja2.file
diff --git a/pip/PyYAML.file → pip/py2-PyYAML.file b/pip/PyYAML.file → pip/py2-PyYAML.file
diff --git a/pip/py2-matplotlib.file b/pip/py2-matplotlib.file
diff --git a/pip/prettytable.file → pip/py2-prettytable.file b/pip/prettytable.file → pip/py2-prettytable.file
diff --git a/pip/py2-scipy.file b/pip/py2-scipy.file
diff --git a/pip/setuptools-scm.file → pip/py2-setuptools-scm.file b/pip/setuptools-scm.file → pip/py2-setuptools-scm.file
diff --git a/pip/soupsieve.file → pip/py2-wcwidth.file b/pip/soupsieve.file → pip/py2-wcwidth.file
diff --git a/pip/py3-PyYAML.file b/pip/py3-PyYAML.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/py3-future.file b/pip/py3-future.file
@@ -0,0 +1 @@
+%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/py3-hyperopt.file b/pip/py3-hyperopt.file
@@ -0,0 +1 @@
+Requires: py3-future
diff --git a/pip/py3-numba.file b/pip/py3-numba.file
@@ -1,2 +1,2 @@
-Requires: py3-funcsigs py2-six py3-singledispatch py3-llvmlite py3-numpy python3
+Requires: py3-funcsigs py3-six py3-singledispatch py3-llvmlite py3-numpy python3
 %define RelocatePython %{i}/bin/*
diff --git a/pip/py3-onnxconverter-common.file b/pip/py3-onnxconverter-common.file
@@ -1,2 +1,2 @@
-Requires: py2-numpy py3-numpy py3-onnx py3-protobuf py2-six
+Requires: py3-numpy py3-onnx py3-protobuf py3-six
 %define source0 https://github.com/microsoft/onnxconverter-common/archive/v%{realversion}.tar.gz
diff --git a/pip/py3-prettytable.file b/pip/py3-prettytable.file
@@ -0,0 +1 @@
+Requires: py3-wcwidth
diff --git a/pip/py3-scipy.file b/pip/py3-scipy.file
@@ -1,4 +1,4 @@
-Requires: py3-numpy py3-cython py2-wheel py3-pybind11
+Requires: py3-numpy py3-cython py3-wheel py3-pybind11
 
 %define PipPreBuild\
   if [[ `gcc --version | head -1 | cut -d' ' -f3 | cut -d. -f1,2,3 | tr -d .` -gt 1000 ]] ; then export FFLAGS="${FFLAGS_OPT} -fallow-argument-mismatch -fPIC" ; fi \
diff --git a/pip/py3-setuptools-scm.file b/pip/py3-setuptools-scm.file
@@ -0,0 +1 @@
+Requires: py3-wheel
diff --git a/pip/py3-skl2onnx.file b/pip/py3-skl2onnx.file
@@ -1,2 +1,2 @@
-Requires: py2-six py3-numpy py3-scipy py3-protobuf py3-onnx py3-scikit-learn py3-onnxconverter-common
+Requires: py3-six py3-numpy py3-scipy py3-protobuf py3-onnx py3-scikit-learn py3-onnxconverter-common
 %define source0 https://github.com/onnx/sklearn-onnx/archive/%{realversion}.tar.gz
diff --git a/pip/py3-tables.file b/pip/py3-tables.file
@@ -1,2 +1,2 @@
-Requires: py3-numexpr py2-six hdf5 bz2lib py3-mock py3-numpy
+Requires: py3-numexpr py3-six hdf5 bz2lib py3-mock py3-numpy
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/py3-tensorflow.file b/pip/py3-tensorflow.file
@@ -1,4 +1,4 @@
 Requires: py3-tensorboard py3-opt-einsum py3-tensorflow-estimator py3-wrapt py3-google-pasta py3-scipy
 Requires: tensorflow-sources
-%define PipPreBuildPy3 PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp38-cp38-linux_%{_arch}.whl
+%define PipPreBuildPy3 PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp%{cms_python3_major_minor}-cp%{cms_python3_major_minor}-linux_%{_arch}.whl
 %define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'
diff --git a/pip/py3-wheel.file b/pip/py3-wheel.file
@@ -0,0 +1 @@
+%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/pybind11.file b/pip/pybind11.file
@@ -1,2 +1,2 @@
-Requires: py2-wheel
+Requires: py3-wheel
 %define RelocatePython %{i}/bin/*
diff --git a/pip/pycuda.file b/pip/pycuda.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy cuda py3-pytools py3-pytest py3-decorator py3-appdirs py3-Mako
+Requires: py3-numpy cuda py3-pytools py3-pytest py3-decorator py3-appdirs py3-Mako
diff --git a/pip/pylint.file b/pip/pylint.file
@@ -1 +1 @@
-Requires: py3-astroid py2-six py3-isort py3-mccabe
+Requires: py3-astroid py3-six py3-isort py3-mccabe
diff --git a/pip/pyrsistent.file b/pip/pyrsistent.file
@@ -1 +1 @@
-Requires: py2-six
+Requires: py3-six
diff --git a/pip/pytest-runner.file b/pip/pytest-runner.file
@@ -1 +1 @@
-Requires: py2-setuptools-scm
+Requires: py3-setuptools-scm
diff --git a/pip/pytest.file b/pip/pytest.file
@@ -1,4 +1,4 @@
 Requires: py3-more-itertools py3-atomicwrites py3-attrs py3-funcsigs py3-pathlib2 py3-pluggy py3-py py3-scandir
-Requires: py3-packaging py2-wcwidth
+Requires: py3-packaging py3-wcwidth
 Requires: py3-iniconfig py3-toml
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/python-daemon.file b/pip/python-daemon.file
@@ -1 +1 @@
-Requires: py2-wheel py3-docutils py3-lockfile
+Requires: py3-wheel py3-docutils py3-lockfile
diff --git a/pip/python-dateutil.file b/pip/python-dateutil.file
@@ -1 +1 @@
-Requires: py2-six py2-setuptools-scm
+Requires: py3-six py3-setuptools-scm
diff --git a/pip/pytools.file b/pip/pytools.file
@@ -1 +1 @@
-Requires: py3-decorator py3-appdirs py2-six py2-numpy py3-numpy
+Requires: py3-decorator py3-appdirs py3-six py3-numpy