cms-sw · smuzaffar · Jun 25, 2021 · Jun 25, 2021
diff --git a/cmssw.spec b/cmssw.spec
@@ -1,4 +1,4 @@
-### RPM cms cmssw CMSSW_10_1_0_pre1
+### RPM cms cmssw CMSSW_12_0_0
 
 Requires: cmssw-tool-conf python
 

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

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 py2-onnx zlib libpng py3-pybind11
+Requires: protobuf py3-numpy py2-wheel py3-onnx zlib libpng py3-pybind11
 %if "%{cmsos}" != "slc7_aarch64"
 Requires: cuda cudnn
 %endif

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-PyYAML py2-six py3-Theano
 Requires: py3-h5py py3-keras-applications py3-keras-preprocessing
diff --git a/pip/Theano.file b/pip/Theano.file
@@ -1,4 +1,3 @@
-Requires: py2-scipy py2-six
 Requires: py3-scipy
 %define RelocatePython %{i}/bin/theano-*
 %define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/theano-*
diff --git a/pip/absl-py.file b/pip/absl-py.file
@@ -1 +1 @@
-Requires: py2-enum34 py2-six
+Requires: py2-six
diff --git a/pip/aiohttp.file b/pip/aiohttp.file
@@ -1 +1 @@
-Requires: py2-attrs py3-chardet py3-multidict py3-yarl py3-async-timeout py2-typing_extensions
+Requires: py3-attrs py3-chardet py3-multidict py3-yarl py3-async-timeout py3-typing_extensions
diff --git a/pip/aiosqlite.file b/pip/aiosqlite.file
@@ -1 +1 @@
-Requires: py2-typing_extensions py3-flit-core
+Requires: py3-typing_extensions py3-flit-core
diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file
@@ -1 +1 @@
-Requires: py3-cffi py2-six py2-enum34 py2-wheel
+Requires: py3-cffi py2-six py2-wheel
diff --git a/pip/astroid.file b/pip/astroid.file
@@ -1,2 +1,2 @@
-Requires: py3-lazy-object-proxy py2-six py3-wrapt py2-enum34 py3-singledispatch py2-backports-functools_lru_cache
-Requires: py2-pytest-runner
+Requires: py3-lazy-object-proxy py2-six py3-wrapt py3-singledispatch py2-backports-functools_lru_cache
+Requires: py3-pytest-runner
diff --git a/pip/autopep8.file b/pip/autopep8.file
@@ -1,2 +1,2 @@
-Requires: py3-pycodestyle py2-toml
+Requires: py3-pycodestyle py3-toml
 %define RelocatePython %{i}/bin/*
diff --git a/pip/awkward.file b/pip/awkward.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy py2-pytest-runner
+Requires: py2-numpy py3-numpy py3-pytest-runner
diff --git a/pip/awkward1.file b/pip/awkward1.file
@@ -1,2 +1,2 @@
-Requires: py2-numpy py3-numpy py2-pytest-runner py3-pybind11 cmake
+Requires: py2-numpy 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/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-PyYAML py3-python-dateutil py3-Jinja2 py2-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 py2-typing py2-wheel
+Requires: py3-numpy py3-typing py2-wheel
diff --git a/pip/deprecation.file b/pip/deprecation.file
@@ -1 +1 @@
-Requires: py2-packaging
+Requires: py3-packaging
diff --git a/pip/fire.file b/pip/fire.file
@@ -1 +1 @@
-Requires: py2-six py3-termcolor py2-enum34
+Requires: py2-six py3-termcolor
diff --git a/pip/flake8.file b/pip/flake8.file
@@ -1,2 +1,2 @@
-Requires: py2-backports py2-enum34 py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py2-typing py2-importlib-metadata
+Requires: py2-backports py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-typing py3-importlib-metadata
 %define RelocatePython %{i}/bin/*
diff --git a/pip/flit-core.file b/pip/flit-core.file
@@ -1 +1 @@
-Requires: py3-pytoml py2-toml
+Requires: py3-pytoml py3-toml
diff --git a/pip/fs.file b/pip/fs.file
@@ -1,2 +1,2 @@
-Requires: py2-six py2-typing py2-appdirs py3-pytz py2-backports py2-enum34
+Requires: py2-six py3-typing py3-appdirs py3-pytz py2-backports
 %define RelocatePython %{i}/bin/*
diff --git a/pip/grpcio-tools.file b/pip/grpcio-tools.file
@@ -1 +1 @@
-Requires: py2-protobuf py2-grpcio
+Requires: py3-protobuf py3-grpcio
diff --git a/pip/grpcio.file b/pip/grpcio.file
@@ -1 +1 @@
-Requires: py2-enum34 py2-futures py2-six
+Requires: py2-six
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 py3-pytest py3-pytest-cov py2-PyYAML py2-future py3-pylint
diff --git a/pip/histoprint.file b/pip/histoprint.file
@@ -1 +1 @@
-Requires: py3-numpy py2-setuptools-scm py2-toml py3-Click
+Requires: py3-numpy py2-setuptools-scm py3-toml py3-Click
diff --git a/pip/html5lib.file b/pip/html5lib.file
@@ -1 +1 @@
-Requires: py3-ordereddict py2-six py2-packaging py3-webencodings py2-pyparsing py2-appdirs
+Requires: py2-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 py2-scipy py3-tqdm
+Requires: py2-six py3-nose py2-future 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-metadata.file b/pip/importlib-metadata.file
@@ -1 +1 @@
-Requires: py2-contextlib2 py2-configparser py2-pathlib2 py3-zipp py2-zipp
+Requires: py3-contextlib2 py3-pathlib2 py3-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-importlib-metadata py3-zipp
+Requires: py3-pathlib2 py3-contextlib2 py3-singledispatch py3-typing py3-importlib-metadata py3-zipp
 
diff --git a/pip/isort.file b/pip/isort.file
@@ -1,4 +1,4 @@
-Requires: py2-futures py2-backports-functools_lru_cache
+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 @@
-BuildRequires: py2-wheel
-Requires: py2-importlib-metadata
+Requires: py2-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: py2-attrs py2-six py2-importlib-metadata
+Requires: py3-attrs py2-six py3-importlib-metadata
 %define RelocatePython %{i}/bin/jsonschema
 
diff --git a/pip/llvmlite.file b/pip/llvmlite.file
@@ -1,4 +1,4 @@
-Requires: llvm py2-wheel py2-enum34
+Requires: llvm py2-wheel 
 Patch0: py2-llvmlite-fpic-flag
 Patch1: py2-llvmlite-llvm9
 Patch2: py2-llvmlite-removeduplicate

diff --git a/pip/luigi.file b/pip/luigi.file
@@ -1,4 +1,4 @@
-Requires: py3-tornado py3-python-daemon py3-python-dateutil py2-enum34
+Requires: py3-tornado py3-python-daemon py3-python-dateutil 
 
 %define PipPostBuildPy2 (cd "%{i}/bin" && for f in *; do cp ${f} ${f}2; done)
 %define PipPostBuildPy3 (cd "%{i}/bin" && for f in *; do mv ${f} ${f}3; done)

diff --git a/pip/matplotlib.file b/pip/matplotlib.file
@@ -1,2 +1,2 @@
-Requires: py3-cycler py3-kiwisolver py2-pyparsing py3-python-dateutil py3-certifi
+Requires: py3-cycler py3-kiwisolver py3-pyparsing py3-python-dateutil py3-certifi
 Requires: zlib libpng freetype
diff --git a/pip/mccabe.file b/pip/mccabe.file
@@ -1 +1 @@
-Requires: py2-pytest-runner
+Requires: py3-pytest-runner
diff --git a/pip/mock.file b/pip/mock.file
@@ -1 +1 @@
-Requires: py2-six py2-funcsigs py3-pbr
+Requires: py2-six py3-funcsigs py3-pbr
diff --git a/pip/mplhep.file b/pip/mplhep.file
@@ -1 +1 @@
-Requires: py3-numpy py3-matplotlib py3-scipy py3-requests py2-packaging
+Requires: py3-numpy py3-matplotlib py3-scipy py3-requests py3-packaging
diff --git a/pip/onnx.file b/pip/onnx.file
@@ -1,4 +1,4 @@
-Requires: cmake py2-numpy protobuf py2-protobuf py2-six py2-typing_extensions py3-numpy py2-pytest-runner
+Requires: cmake py2-numpy protobuf py3-protobuf py2-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: py2-pyparsing py2-six py2-attrs
+Requires: py3-pyparsing py2-six py3-attrs
diff --git a/pip/pathlib2.file b/pip/pathlib2.file
@@ -1 +1 @@
-Requires: py2-six py2-scandir
+Requires: py2-six py3-scandir
diff --git a/pip/pickleshare.file b/pip/pickleshare.file
@@ -1 +1 @@
-Requires: py2-pathlib2
+Requires: py3-pathlib2
diff --git a/pip/pluggy.file b/pip/pluggy.file
@@ -1 +1 @@
-Requires: py2-importlib-metadata
+Requires: py3-importlib-metadata
diff --git a/pip/protobuf.file b/pip/protobuf.file
@@ -1 +1 @@
-Requires: py2-six py2-packaging py2-pyparsing py2-appdirs
+Requires: py2-six py3-packaging py3-pyparsing py3-appdirs
diff --git a/pip/py2-scikit-learn.file b/pip/py2-scikit-learn.file
diff --git a/pip/py2-xgboost.file b/pip/py2-xgboost.file
diff --git a/pip/py3-bokeh.file b/pip/py3-bokeh.file
@@ -1,2 +1,2 @@
-Requires: py2-typing_extensions
+Requires: py3-typing_extensions
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/py3-keras2onnx.file b/pip/py3-keras2onnx.file
@@ -1,2 +1,2 @@
-Requires: py3-numpy py2-protobuf py3-requests py2-onnx py3-onnxconverter-common py3-fire
+Requires: py3-numpy py3-protobuf py3-requests py3-onnx py3-onnxconverter-common py3-fire
 %define source0 https://github.com/onnx/keras-onnx/archive/v%{realversion}.tar.gz
diff --git a/pip/py3-numba.file b/pip/py3-numba.file
@@ -1,2 +1,2 @@
-Requires: py2-funcsigs py2-six py3-singledispatch py3-llvmlite py3-numpy python3
+Requires: py3-funcsigs py2-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 py2-onnx py2-protobuf py2-six
+Requires: py2-numpy py3-numpy py3-onnx py3-protobuf py2-six
 %define source0 https://github.com/microsoft/onnxconverter-common/archive/v%{realversion}.tar.gz
diff --git a/pip/py3-onnxmltools.file b/pip/py3-onnxmltools.file
@@ -1,2 +1,2 @@
-Requires: py3-numpy py2-onnx py2-protobuf py3-onnxconverter-common py3-skl2onnx py3-keras2onnx
+Requires: py3-numpy py3-onnx py3-protobuf py3-onnxconverter-common py3-skl2onnx py3-keras2onnx
 %define source0 https://github.com/onnx/onnxmltools/archive/v%{realversion}.tar.gz
diff --git a/pip/py3-onnxruntime.file b/pip/py3-onnxruntime.file
@@ -1,2 +1,2 @@
-Requires: onnxruntime py3-numpy py2-onnx
+Requires: onnxruntime py3-numpy py3-onnx
 %define PipDownloadSourceType none
diff --git a/pip/py3-pylint.file b/pip/py3-pylint.file
@@ -1,2 +1,2 @@
-Requires: py3-astroid py2-toml
+Requires: py3-astroid py3-toml
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3
diff --git a/pip/py3-skl2onnx.file b/pip/py3-skl2onnx.file
@@ -1,2 +1,2 @@
-Requires: py2-six py3-numpy py3-scipy py2-protobuf py2-onnx py3-scikit-learn py3-onnxconverter-common
+Requires: py2-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-tensorboard.file b/pip/py3-tensorboard.file
@@ -1,3 +1,3 @@
-Requires: py3-numpy py2-absl-py py2-grpcio
+Requires: py3-numpy py3-absl-py py3-grpcio
 Requires: py3-google-auth-oauthlib py3-tensorboard-plugin-wit
 %define PipPostBuild mv %{i}/bin/tensorboard %{i}/bin/tensorboard3
diff --git a/pip/pyasn1-modules.file b/pip/pyasn1-modules.file
@@ -1 +1 @@
-Requires: py2-pyasn1
+Requires: py3-pyasn1
diff --git a/pip/pybrain.file b/pip/pybrain.file
@@ -1,2 +1 @@
-Requires: py2-scipy
 %define source0 git+https://github.com/pybrain/pybrain?obj=master/%{realversion}&export=pybrain-%{realversion}&output=/source.tar.gz
diff --git a/pip/pycuda.file b/pip/pycuda.file
@@ -1 +1 @@
-Requires: py2-numpy py3-numpy cuda py3-pytools py2-pytest py3-decorator py2-appdirs py3-Mako
+Requires: py2-numpy py3-numpy cuda py3-pytools py3-pytest py3-decorator py3-appdirs py3-Mako
diff --git a/pip/pydantic.file b/pip/pydantic.file
@@ -1 +1 @@
-Requires: py2-typing_extensions
+Requires: py3-typing_extensions
diff --git a/pip/pydot.file b/pip/pydot.file
@@ -1 +1 @@
-Requires: py2-pyparsing
+Requires: py3-pyparsing
diff --git a/pip/pylint.file b/pip/pylint.file
@@ -1 +1 @@
-Requires: py3-astroid py2-six py3-isort py3-mccabe py2-configparser
+Requires: py3-astroid py2-six py3-isort py3-mccabe
diff --git a/pip/pytest.file b/pip/pytest.file
@@ -1,4 +1,4 @@
-Requires: py2-more-itertools py2-atomicwrites py2-attrs py2-funcsigs py2-pathlib2 py2-pluggy py2-py py2-scandir
-Requires: py2-packaging py2-wcwidth
-Requires: py2-iniconfig py2-toml
+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-iniconfig py3-toml
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/pytools.file b/pip/pytools.file
@@ -1 +1 @@
-Requires: py3-decorator py2-appdirs py2-six py2-numpy py3-numpy
+Requires: py3-decorator py3-appdirs py2-six py2-numpy py3-numpy
diff --git a/pip/requests.file b/pip/requests.file
@@ -1 +1 @@
-Requires: py2-urllib3 py3-chardet py3-idna py3-certifi
+Requires: py3-urllib3 py3-chardet py3-idna py3-certifi