diff --git a/build-with-pip.file b/build-with-pip.file
index edaeeb20fd8..b27a27cfa9e 100644
--- a/build-with-pip.file
+++ b/build-with-pip.file
@@ -43,6 +43,9 @@
 
 %define pip pip3&package_dependency=py3-pip
 Requires: python3 py3-pip py3-setuptools
+%if "%{n}" != "py3-wheel"
+BuildRequires: py3-wheel
+%endif
 
 %if "%{?source0:set}" != "set"
 %define source0 pip://%{pip_name}/%{realversion}?pip_options=%{PipDownloadOptions}&pip=%{pip}&output=/%{pkgsource}
@@ -101,7 +104,7 @@ if [ $(cat files.list | wc -l) -eq 1 ] ; then
    pip3 install --no-clean --no-deps --no-index --no-build-isolation --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} $PIPFILE
    PKG_NAME=$(pip3 show %{pip_name} --disable-pip-version-check | grep '^Name:' | sed 's|^Name: *||;s| ||g')
    [ "${PKG_NAME}" = "" ] && exit 1
-   DEPS=$(pip3 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py2-|' %{PipDepsPost} | tr '\n' ' ')
+   DEPS=$(pip3 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py3-|' %{PipDepsPost} | tr '\n' ' ')
    if [ "$DEPS" != "" ] ; then
       echo "ERROR: Missing dependencies for %n (python3) found: $DEPS"
       exit 1
@@ -121,15 +124,20 @@ if [ -d %{i}/bin ] ; then
   done
 fi
 %{?PipPostBuild:%PipPostBuild}
-%{?RelocatePython:perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python3|" %RelocatePython}
+if [ -d %{i}/bin ] ; then
+  for s in $(grep -IRHl '^#!.*' %{i}/bin) ; do
+    perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python3|;s| %{cmsroot}/.*python3 | python3 |" $s
+  done
+fi
+%{?RelocatePython:perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python3|;s| %{cmsroot}/.*python3 | python3 |" %RelocatePython}
 
 #Install Section
 %install
 %{?PipPreInstall:%PipPreInstall}
 %{?PipPostInstall:%PipPostInstall}
+[ ! -d %{i}/bin/__pycache__ ] || rm -rf %{i}/bin/__pycache__
 chmod -R a+r %{i}
 find %{i} -type d -print | xargs chmod 0755
-echo "OK Install"
 
 #post Section
 %post
diff --git a/pip/Bottleneck.file b/pip/Bottleneck.file
index a0bf955f35a..a8ba8bf59d7 100644
--- a/pip/Bottleneck.file
+++ b/pip/Bottleneck.file
@@ -1 +1 @@
-Requires: py3-numpy py3-wheel
+Requires: py3-numpy
diff --git a/pip/Mako.file b/pip/Mako.file
index b57f91ecf00..bf8d6782675 100644
--- a/pip/Mako.file
+++ b/pip/Mako.file
@@ -1,2 +1 @@
 Requires: py3-MarkupSafe
-%define RelocatePython %{i}/bin/*
diff --git a/pip/Markdown.file b/pip/Markdown.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/Markdown.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/PyJWT.file b/pip/PyJWT.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/PyJWT.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/PyYAML.file b/pip/PyYAML.file
deleted file mode 100644
index 502a45007d0..00000000000
--- a/pip/PyYAML.file
+++ /dev/null
@@ -1 +0,0 @@
-BuildRequires: py3-wheel
diff --git a/pip/Theano.file b/pip/Theano.file
index 129cd4c45a2..d0e1c7be8d1 100644
--- a/pip/Theano.file
+++ b/pip/Theano.file
@@ -1,3 +1 @@
 Requires: py3-scipy
-%define RelocatePython %{i}/bin/theano-*
-%define PipPostBuildPy sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/theano-*
diff --git a/pip/aiohttp.file b/pip/aiohttp.file
index d9a892bd760..6d8f9992541 100644
--- a/pip/aiohttp.file
+++ b/pip/aiohttp.file
@@ -1 +1 @@
-Requires: py3-attrs py3-chardet py3-multidict py3-yarl py3-async-timeout py3-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
index 95ab71f45bc..36c8518b6e1 100644
--- a/pip/aiosqlite.file
+++ b/pip/aiosqlite.file
@@ -1 +1 @@
-Requires: py3-typing_extensions py3-flit-core
+Requires: py3-typing-extensions py3-flit-core
diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file
index 7ac4d6540ae..8614c21b21f 100644
--- a/pip/argon2-cffi.file
+++ b/pip/argon2-cffi.file
@@ -1 +1 @@
-Requires: py3-cffi py3-six py3-wheel
+Requires: py3-cffi py3-six
diff --git a/pip/astunparse.file b/pip/astunparse.file
index 5ceb2c35895..7c962a18c6b 100644
--- a/pip/astunparse.file
+++ b/pip/astunparse.file
@@ -1 +1 @@
-Requires: py3-wheel py3-six
+Requires: py3-six
diff --git a/pip/async-timeout.file b/pip/async-timeout.file
new file mode 100644
index 00000000000..005b7c73656
--- /dev/null
+++ b/pip/async-timeout.file
@@ -0,0 +1 @@
+Requires: py3-typing-extensions
diff --git a/pip/attrs.file b/pip/attrs.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/attrs.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/autopep8.file b/pip/autopep8.file
index 7aac6c9ca8b..9c8c78fd0e2 100644
--- a/pip/autopep8.file
+++ b/pip/autopep8.file
@@ -1,2 +1 @@
 Requires: py3-pycodestyle py3-toml
-%define RelocatePython %{i}/bin/*
diff --git a/pip/avro.file b/pip/avro.file
index 53c70f99c74..f227d56598f 100644
--- a/pip/avro.file
+++ b/pip/avro.file
@@ -1,2 +1 @@
 Requires: py3-pycodestyle py3-isort
-%define RelocatePython %{i}/bin/*
diff --git a/pip/backports-entry-points-selectable.file b/pip/backports-entry-points-selectable.file
new file mode 100644
index 00000000000..676aba2d571
--- /dev/null
+++ b/pip/backports-entry-points-selectable.file
@@ -0,0 +1 @@
+%define pip_name backports.entry-points-selectable
diff --git a/pip/beniget.file b/pip/beniget.file
new file mode 100644
index 00000000000..216c7223981
--- /dev/null
+++ b/pip/beniget.file
@@ -0,0 +1 @@
+Requires: py3-gast
diff --git a/pip/bokeh.file b/pip/bokeh.file
index 6ccf1968b59..185df9d69c7 100644
--- a/pip/bokeh.file
+++ b/pip/bokeh.file
@@ -1,5 +1,3 @@
-Requires: py3-typing_extensions
-%define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
+Requires: py3-typing-extensions
 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
index dd83073f89d..fe5e9151f57 100644
--- a/pip/boost-histogram.file
+++ b/pip/boost-histogram.file
@@ -1 +1 @@
-Requires: py3-numpy py3-typing py3-wheel
+Requires: py3-numpy py3-typing
diff --git a/pip/cachy.file b/pip/cachy.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/cachy.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/chardet.file b/pip/chardet.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/chardet.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/cmsml.file b/pip/cmsml.file
index 17666ed5936..7c962a18c6b 100644
--- a/pip/cmsml.file
+++ b/pip/cmsml.file
@@ -1,3 +1 @@
 Requires: py3-six
-
-%define RelocatePython %{i}/bin/*
diff --git a/pip/conan.file b/pip/conan.file
index a745604a1ac..6011ad3f7ad 100644
--- a/pip/conan.file
+++ b/pip/conan.file
@@ -1,3 +1,2 @@
 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 PipPostBuildPy sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/conan*
diff --git a/pip/correctionlib.file b/pip/correctionlib.file
index fec91980b80..6c0ae4616e3 100644
--- a/pip/correctionlib.file
+++ b/pip/correctionlib.file
@@ -1,2 +1 @@
 Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson
-
diff --git a/pip/coverage.file b/pip/coverage.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/coverage.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/docutils.file b/pip/docutils.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/docutils.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/flake8.file b/pip/flake8.file
index 4817c52ded1..f68f7272c37 100644
--- a/pip/flake8.file
+++ b/pip/flake8.file
@@ -1,2 +1 @@
 Requires: py3-mccabe py3-pycodestyle py3-pyflakes py3-entrypoints py3-typing py3-importlib-metadata
-%define RelocatePython %{i}/bin/*
diff --git a/pip/flawfinder.file b/pip/flawfinder.file
index 70bcca50643..aff83eca96e 100644
--- a/pip/flawfinder.file
+++ b/pip/flawfinder.file
@@ -1,3 +1 @@
 %define PipDownloadSourceType none
-%define pip_name flawfinder
-%define RelocatePython %{i}/bin/flawfinder
diff --git a/pip/fs.file b/pip/fs.file
index 2cf5095121e..9a93cf5293a 100644
--- a/pip/fs.file
+++ b/pip/fs.file
@@ -1,2 +1 @@
 Requires: py3-six py3-typing py3-appdirs py3-pytz
-%define RelocatePython %{i}/bin/*
diff --git a/pip/future.file b/pip/future.file
index 94c9e6bd1ae..ff826ed969e 100644
--- a/pip/future.file
+++ b/pip/future.file
@@ -1,2 +1 @@
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
-%define RelocatePython %{i}/bin/*
diff --git a/pip/histogrammar.file b/pip/histogrammar.file
index 7e8e847c5d7..78028d3106d 100644
--- a/pip/histogrammar.file
+++ b/pip/histogrammar.file
@@ -1,2 +1,3 @@
+Requires: py3-joblib py3-numpy py3-tqdm
 %define PipDownloadSourceType none
 %define PipPostBuild ls %{i}/bin/* | xargs -i mv '{}' '{}3'
diff --git a/pip/histoprint.file b/pip/histoprint.file
index 5e0cc7d5f59..ac315fc7c93 100644
--- a/pip/histoprint.file
+++ b/pip/histoprint.file
@@ -1 +1 @@
-Requires: py3-numpy py3-setuptools-scm py3-toml py3-Click
+Requires: py3-numpy py3-setuptools-scm py3-toml py3-Click py3-uhi
diff --git a/pip/hyperopt.file b/pip/hyperopt.file
index 7a9a94750fe..42e7a09fda7 100644
--- a/pip/hyperopt.file
+++ b/pip/hyperopt.file
@@ -2,4 +2,3 @@ Requires: py3-future
 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
index 97d4d10af44..b7f384e8c38 100644
--- a/pip/importlib-resources.file
+++ b/pip/importlib-resources.file
@@ -1,3 +1,2 @@
-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
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/iniconfig.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/ipykernel.file b/pip/ipykernel.file
index 2860abe0f32..795549bbe81 100644
--- a/pip/ipykernel.file
+++ b/pip/ipykernel.file
@@ -1,2 +1,2 @@
-Requires: py3-ipython py3-jupyter_client
-Requires: py3-ipython py3-jupyter_client py3-jedi py3-backcall
+Requires: py3-ipython py3-jupyter-client py3-debugpy
+Requires: py3-ipython py3-jupyter-client py3-jedi py3-backcall
diff --git a/pip/ipython.file b/pip/ipython.file
index 8beaec1295b..d6d52ef72c3 100644
--- a/pip/ipython.file
+++ b/pip/ipython.file
@@ -1,3 +1,3 @@
-Requires: py3-jedi py3-prompt_toolkit py3-backcall
-%define PipPostBuildPy rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3
+Requires: py3-jedi py3-prompt_toolkit py3-backcall py3-matplotlib-inline
+%define PipPostBuildPy rm -f %{i}/bin/iptest %{i}/bin/ipython
 Requires: py3-traitlets py3-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py3-simplegeneric
diff --git a/pip/ipywidgets.file b/pip/ipywidgets.file
index 03d55d846e8..ecd31505bd3 100644
--- a/pip/ipywidgets.file
+++ b/pip/ipywidgets.file
@@ -1,2 +1 @@
-Requires: py3-widgetsnbextension 
-#needed for py3 upgrade py2-jupyterlab-widgets 
+Requires: py3-widgetsnbextension py3-jupyterlab-widgets
diff --git a/pip/isort.file b/pip/isort.file
index 73c7ddc9b45..989004ce2a1 100644
--- a/pip/isort.file
+++ b/pip/isort.file
@@ -1,2 +1 @@
-%define patchsrc sed -i -e '/.*futures.*/d' isort.egg-info/requires.txt setup.py
-%define RelocatePython %{i}/bin/*
+Requires: py3-poetry
diff --git a/pip/jsonpickle.file b/pip/jsonpickle.file
index 92fe627b3e1..635de973658 100644
--- a/pip/jsonpickle.file
+++ b/pip/jsonpickle.file
@@ -1,4 +1 @@
-Requires: py3-wheel
 Requires: py3-importlib-metadata
-
-
diff --git a/pip/jsonschema.file b/pip/jsonschema.file
index eb91aa816fd..bf2ba975c1e 100644
--- a/pip/jsonschema.file
+++ b/pip/jsonschema.file
@@ -1,4 +1,3 @@
 Requires: py3-repoze-lru py3-argparse py3-pyrsistent
 Requires: py3-attrs py3-six py3-importlib-metadata
-%define RelocatePython %{i}/bin/jsonschema
 
diff --git a/pip/jupyter-client.file b/pip/jupyter-client.file
new file mode 100644
index 00000000000..f43e7ed100f
--- /dev/null
+++ b/pip/jupyter-client.file
@@ -0,0 +1,3 @@
+Requires: py3-jupyter-core py3-python-dateutil py3-pyzmq
+Requires: py3-tornado py3-entrypoints py3-nest-asyncio
+%define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/jupyter_console.file b/pip/jupyter-console.file
similarity index 100%
rename from pip/jupyter_console.file
rename to pip/jupyter-console.file
diff --git a/pip/jupyter-core.file b/pip/jupyter-core.file
new file mode 100644
index 00000000000..7e43474d371
--- /dev/null
+++ b/pip/jupyter-core.file
@@ -0,0 +1,2 @@
+Requires: py3-traitlets
+%define PipPostBuild  rm %{i}/lib/*/site-packages/jupyter.py*
diff --git a/pip/jupyter-packaging.file b/pip/jupyter-packaging.file
new file mode 100644
index 00000000000..9ee31636a72
--- /dev/null
+++ b/pip/jupyter-packaging.file
@@ -0,0 +1 @@
+Requires: py3-packaging py3-deprecation py3-tomlkit
diff --git a/pip/jupyter-server-mathjax.file b/pip/jupyter-server-mathjax.file
new file mode 100644
index 00000000000..9cd9cb8c1e0
--- /dev/null
+++ b/pip/jupyter-server-mathjax.file
@@ -0,0 +1 @@
+Requires: py3-jupyter-server
diff --git a/pip/jupyter-server.file b/pip/jupyter-server.file
new file mode 100644
index 00000000000..03b8adfbe9d
--- /dev/null
+++ b/pip/jupyter-server.file
@@ -0,0 +1,2 @@
+Requires: py3-jupyter-packaging py3-jupyter-client py3-nbconvert
+Requires: py3-anyio py3-argon2-cffi py3-prometheus-client py3-requests-unixsocket py3-Send2Trash py3-terminado py3-websocket-client
diff --git a/pip/jupyter.file b/pip/jupyter.file
index 6611d6f473f..ece2a383bd6 100644
--- a/pip/jupyter.file
+++ b/pip/jupyter.file
@@ -1 +1 @@
-Requires: py3-notebook py3-qtconsole py3-jupyter_console py3-nbconvert py3-ipykernel py3-ipywidgets
+Requires: py3-notebook py3-qtconsole py3-jupyter-console py3-nbconvert py3-ipykernel py3-ipywidgets
diff --git a/pip/jupyter_client.file b/pip/jupyter_client.file
deleted file mode 100644
index 73732d94303..00000000000
--- a/pip/jupyter_client.file
+++ /dev/null
@@ -1,4 +0,0 @@
-Requires: py3-jupyter_core py3-python-dateutil py3-pyzmq
-Requires: py3-tornado
-%define RelocatePython %{i}/bin/*
-%define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/jupyter_core.file b/pip/jupyter_core.file
deleted file mode 100644
index 4afb905ce65..00000000000
--- a/pip/jupyter_core.file
+++ /dev/null
@@ -1,3 +0,0 @@
-Requires: py3-traitlets
-%define PipPostBuild  rm %{i}/lib/*/site-packages/jupyter.py*
-%define RelocatePython %{i}/bin/jupyter-migrate %{i}/bin/jupyter-troubleshoot %{i}/bin/jupyter
diff --git a/pip/jupyterlab-pygments.file b/pip/jupyterlab-pygments.file
new file mode 100644
index 00000000000..ff0329842a0
--- /dev/null
+++ b/pip/jupyterlab-pygments.file
@@ -0,0 +1 @@
+Requires: py3-Pygments
diff --git a/pip/jupyterlab-widgets.file b/pip/jupyterlab-widgets.file
new file mode 100644
index 00000000000..0cec7c5007e
--- /dev/null
+++ b/pip/jupyterlab-widgets.file
@@ -0,0 +1 @@
+Requires: py3-jupyter-packaging
diff --git a/pip/keyring.file b/pip/keyring.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/keyring.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/law.file b/pip/law.file
index 00545fcc7d8..18925688fdc 100644
--- a/pip/law.file
+++ b/pip/law.file
@@ -1,3 +1 @@
 Requires: py3-six py3-luigi py3-scinum
-
-%define RelocatePython %{i}/bin/*
diff --git a/pip/lizard.file b/pip/lizard.file
deleted file mode 100644
index 18a1f54b576..00000000000
--- a/pip/lizard.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/lizard
diff --git a/pip/llvmlite.file b/pip/llvmlite.file
index 554091d3052..4491e0ac3b2 100644
--- a/pip/llvmlite.file
+++ b/pip/llvmlite.file
@@ -1,8 +1,7 @@
-Requires: llvm py3-wheel 
-Patch0: py2-llvmlite-fpic-flag
-Patch1: py2-llvmlite-llvm9
-Patch2: py2-llvmlite-removeduplicate
-Patch3: py2-llvmlite-removeMethod
+Requires: llvm
+Patch0: py3-llvmlite-fpic-flag
+Patch1: py3-llvmlite-version
+Patch3: py3-llvmlite-removeMethod
 
 %define source0 git+https://github.com/numba/llvmlite?obj=release0.35/v%{realversion}&export=llvmlite-%{realversion}&output=/source.tar.gz
 %define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config
diff --git a/pip/lockfile.file b/pip/lockfile.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/lockfile.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/luigi.file b/pip/luigi.file
index 723f44d0f7a..cb02db4fe10 100644
--- a/pip/luigi.file
+++ b/pip/luigi.file
@@ -1,4 +1,2 @@
-Requires: py3-tornado py3-python-daemon py3-python-dateutil 
-
+Requires: py3-tornado py3-python-daemon py3-python-dateutil py3-tenacity
 %define PipPostBuildPy (cd "%{i}/bin" && for f in *; do mv ${f} ${f}3; done)
-%define RelocatePython %{i}/bin/*
diff --git a/pip/lz4.file b/pip/lz4.file
index b9893f91ecd..289b72318ca 100644
--- a/pip/lz4.file
+++ b/pip/lz4.file
@@ -1,5 +1,2 @@
 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"
-
-%define RelocatePython %{i}/bin/*
diff --git a/pip/matplotlib-inline.file b/pip/matplotlib-inline.file
new file mode 100644
index 00000000000..d8788e0e89a
--- /dev/null
+++ b/pip/matplotlib-inline.file
@@ -0,0 +1 @@
+Requires: py3-traitlets
diff --git a/pip/matplotlib.file b/pip/matplotlib.file
index 113a84d137c..7db2018e683 100644
--- a/pip/matplotlib.file
+++ b/pip/matplotlib.file
@@ -4,4 +4,5 @@ Requires: py3-numpy py3-pillow
   export LDFLAGS="-L${FREETYPE_ROOT}/lib -L${LIBPNG_ROOT}/lib" \
   export PKG_CONFIG=false
 Requires: py3-cycler py3-kiwisolver py3-pyparsing py3-python-dateutil py3-certifi
+Requires: py3-fonttools py3-packaging
 Requires: zlib libpng freetype
diff --git a/pip/more-itertools.file b/pip/more-itertools.file
index 184b3b552fb..7c962a18c6b 100644
--- a/pip/more-itertools.file
+++ b/pip/more-itertools.file
@@ -1 +1 @@
-Requires: py3-six py3-wheel
+Requires: py3-six
diff --git a/pip/mplhep.file b/pip/mplhep.file
index 04a6562a55a..62ab6733913 100644
--- a/pip/mplhep.file
+++ b/pip/mplhep.file
@@ -1 +1,2 @@
 Requires: py3-numpy py3-matplotlib py3-scipy py3-requests py3-packaging
+Requires: py3-mplhep-data py3-uhi
diff --git a/pip/mpmath.file b/pip/mpmath.file
deleted file mode 100644
index 502a45007d0..00000000000
--- a/pip/mpmath.file
+++ /dev/null
@@ -1 +0,0 @@
-BuildRequires: py3-wheel
diff --git a/pip/multidict.file b/pip/multidict.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/multidict.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/nbclient.file b/pip/nbclient.file
new file mode 100644
index 00000000000..7350fdf4dbe
--- /dev/null
+++ b/pip/nbclient.file
@@ -0,0 +1 @@
+Requires: py3-jupyter-client py3-nbformat py3-nest-asyncio py3-traitlets
diff --git a/pip/nbconvert.file b/pip/nbconvert.file
index f90c2faf4e6..fe50f93c1a1 100644
--- a/pip/nbconvert.file
+++ b/pip/nbconvert.file
@@ -1,3 +1,2 @@
 Requires: py3-Jinja2 py3-Pygments py3-bleach py3-defusedxml py3-entrypoints py3-mistune py3-pandocfilters py3-nbformat
-Requires: py3-testpath
-%define RelocatePython %{i}/bin/jupyter-nbconvert
+Requires: py3-testpath py3-jupyterlab-pygments py3-nbclient
diff --git a/pip/nbdime.file b/pip/nbdime.file
index 4408a54b849..b78c03d889d 100644
--- a/pip/nbdime.file
+++ b/pip/nbdime.file
@@ -1,5 +1,3 @@
 Requires: py3-GitPython py3-requests py3-colorama
 Requires: py3-notebook py3-GitPython
-%define RelocatePython %{i}/bin/*
-
-
+Requires: py3-jupyter-server py3-jupyter-server-mathjax
diff --git a/pip/nbformat.file b/pip/nbformat.file
index 77003a0885b..f0776898011 100644
--- a/pip/nbformat.file
+++ b/pip/nbformat.file
@@ -1,3 +1,2 @@
-Requires: py3-traitlets py3-jsonschema py3-jupyter_core
-%define RelocatePython %{i}/bin/jupyter-trust
+Requires: py3-traitlets py3-jsonschema py3-jupyter-core
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/nose.file b/pip/nose.file
deleted file mode 100644
index 318518fdd2d..00000000000
--- a/pip/nose.file
+++ /dev/null
@@ -1,2 +0,0 @@
-%define RelocatePython %{i}/bin/nosetests %{i}/bin/nosetests-2.7
-%define RelocatePython %{i}/bin/*3*
diff --git a/pip/notebook.file b/pip/notebook.file
index 619443f7def..8ce12f8eee9 100644
--- a/pip/notebook.file
+++ b/pip/notebook.file
@@ -1,3 +1,3 @@
 Requires: py3-ipykernel
-Requires: py3-terminado py3-nbconvert py3-ipykernel py3-Send2Trash py3-ipaddress py3-prometheus_client py3-argon2-cffi
+Requires: py3-terminado py3-nbconvert py3-ipykernel py3-Send2Trash py3-ipaddress py3-prometheus-client py3-argon2-cffi
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/numba.file b/pip/numba.file
index 5335a1ef7e2..1a8eee35b84 100644
--- a/pip/numba.file
+++ b/pip/numba.file
@@ -1,2 +1 @@
 Requires: py3-funcsigs py3-six py3-singledispatch py3-llvmlite py3-numpy python3
-%define RelocatePython %{i}/bin/*
diff --git a/pip/numpy.file b/pip/numpy.file
index 9c2fb07700a..c74ac8c8402 100644
--- a/pip/numpy.file
+++ b/pip/numpy.file
@@ -1,6 +1,4 @@
 Requires: py3-cython
-BuildRequires: py3-wheel
-
 Requires: zlib OpenBLAS
 
 %define patchsrc \
diff --git a/pip/onnx.file b/pip/onnx.file
index 536a7faf197..a6231f615d3 100644
--- a/pip/onnx.file
+++ b/pip/onnx.file
@@ -1,4 +1,2 @@
-Requires: cmake protobuf py3-protobuf py3-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/onnxmltools.file b/pip/onnxmltools.file
index 1553020b411..da100e2ba81 100644
--- a/pip/onnxmltools.file
+++ b/pip/onnxmltools.file
@@ -1,2 +1,2 @@
 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
+#define source0 https://github.com/onnx/onnxmltools/archive/v%{realversion}.tar.gz
diff --git a/pip/pbr.file b/pip/pbr.file
deleted file mode 100644
index e702a2a9fa9..00000000000
--- a/pip/pbr.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/pbr
diff --git a/pip/plac.file b/pip/plac.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/plac.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/prompt_toolkit.file b/pip/prompt_toolkit.file
index 3cc2e2809fd..9dd25d1666e 100644
--- a/pip/prompt_toolkit.file
+++ b/pip/prompt_toolkit.file
@@ -1 +1 @@
-Requires: py3-six py3-wcwidth py3-wheel
+Requires: py3-six py3-wcwidth
diff --git a/pip/pybind11.file b/pip/pybind11.file
deleted file mode 100644
index 80ea59e4a14..00000000000
--- a/pip/pybind11.file
+++ /dev/null
@@ -1,2 +0,0 @@
-Requires: py3-wheel
-%define RelocatePython %{i}/bin/*
diff --git a/pip/pycodestyle.file b/pip/pycodestyle.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/pycodestyle.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/pycurl.file b/pip/pycurl.file
index e9a0cb6b729..9ac4f6e0f66 100644
--- a/pip/pycurl.file
+++ b/pip/pycurl.file
@@ -1,4 +1,2 @@
-%define pip_name pycurl
 %define PipPreBuild export PYCURL_SSL_LIBRARY=openssl
-
 Requires: curl
diff --git a/pip/pydantic.file b/pip/pydantic.file
index f57d9bc8ff9..005b7c73656 100644
--- a/pip/pydantic.file
+++ b/pip/pydantic.file
@@ -1 +1 @@
-Requires: py3-typing_extensions
+Requires: py3-typing-extensions
diff --git a/pip/pyflakes.file b/pip/pyflakes.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/pyflakes.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/pylint.file b/pip/pylint.file
index 841b7a4e1ec..cfcdd66a88a 100644
--- a/pip/pylint.file
+++ b/pip/pylint.file
@@ -1,3 +1,3 @@
 Requires: py3-astroid py3-toml
-%define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3
+%define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
 Requires: py3-astroid py3-six py3-isort py3-mccabe
diff --git a/pip/python-daemon.file b/pip/python-daemon.file
index 18d2e192eb6..180c29cdc2d 100644
--- a/pip/python-daemon.file
+++ b/pip/python-daemon.file
@@ -1 +1 @@
-Requires: py3-wheel py3-docutils py3-lockfile
+Requires: py3-docutils py3-lockfile
diff --git a/pip/pythran.file b/pip/pythran.file
new file mode 100644
index 00000000000..caeb07d6df9
--- /dev/null
+++ b/pip/pythran.file
@@ -0,0 +1 @@
+Requires: py3-beniget py3-gast py3-numpy py3-ply
diff --git a/pip/qtconsole.file b/pip/qtconsole.file
index de2a2c34098..c1fe7874d66 100644
--- a/pip/qtconsole.file
+++ b/pip/qtconsole.file
@@ -1,2 +1 @@
 Requires: py3-ipykernel py3-QtPy
-%define RelocatePython %{i}/bin/jupyter-qtconsole
diff --git a/pip/requests-unixsocket.file b/pip/requests-unixsocket.file
new file mode 100644
index 00000000000..ca6be18a23d
--- /dev/null
+++ b/pip/requests-unixsocket.file
@@ -0,0 +1 @@
+Requires:  py3-requests py3-urllib3
diff --git a/pip/requests.file b/pip/requests.file
index 733b148e7f7..643f54a38c2 100644
--- a/pip/requests.file
+++ b/pip/requests.file
@@ -1 +1 @@
-Requires: py3-urllib3 py3-chardet py3-idna py3-certifi
+Requires: py3-urllib3 py3-chardet py3-idna py3-certifi py3-charset-normalizer
diff --git a/pip/requirements.txt b/pip/requirements.txt
index f5217a7a6b2..2a79fb71a37 100644
--- a/pip/requirements.txt
+++ b/pip/requirements.txt
@@ -11,249 +11,268 @@
 #To customize a package build e.g. providing extra Requirements, build, install
 #flags or patching, please use package_name.file
 #############################################################################
-absl-py==0.11.0
-aiohttp==3.7.4
+absl-py==0.13.0
+aiohttp==3.7.4.post0
 aiosqlite==0.17.0
+anyio==3.3.0
 appdirs==1.4.4
-argon2-cffi==20.1.0
+argon2-cffi==21.1.0
 argparse==1.4.0
 asn1crypto==1.4.0
 astor==0.8.1
-astroid==2.5.1
+astroid==2.7.3
 astunparse==1.6.3
 async-lru==1.0.2
 async-timeout==3.0.1
 atomicwrites==1.4.0
-attrs==20.3.0
-autopep8==1.5.5
-avro==1.10.1
+attrs==21.2.0
+autopep8==1.5.7
+avro==1.10.2
 awkward==0.14.0
 awkward1==0.4.4
 backcall==0.2.0
+backports-entry-points-selectable==1.1.0
 beautifulsoup4==4.9.3
-bleach==3.3.0
-bokeh==2.3.0
-boost-histogram==0.13
+beniget==0.4.1
+bleach==4.1.0
+bokeh==2.3.3
+boost-histogram==1.1.0
 bottle==0.12.19
 Bottleneck==1.3.2
 cachecontrol==0.12.6
-cachetools==4.2.1
+cachetools==4.2.2
 cachy==0.3.0
+charset-normalizer==2.0.4
 cleo==0.8.1
 clikit==0.6.2
-cmsml==0.1.1
+cmsml==0.1.2
 correctionlib==1.1.0
 crashtest==0.3.1
-certifi==2020.12.5
-cffi==1.14.5
-chardet==3.0.4
-Click==7.1.2
+certifi==2021.5.30
+cffi==1.14.6
+chardet==4.0.0
+Click==8.0.1
 climate==0.4.6
-cloudpickle==1.3.0
+cloudpickle==1.6.0
 colorama==0.4.4
 conan==1.39.0
-contextlib2==0.6.0.post1
+contextlib2==21.6.0
 contextvars==2.4
 coverage==5.5
-cx-Oracle==7.3.0
+cx-Oracle==8.2.1
 cycler==0.10.0
-cython==0.29.23
-decorator==4.4.2
-defusedxml==0.6.0
+cython==0.29.24
+decorator==5.0.9
+debugpy==1.4.1
+defusedxml==0.7.1
 deprecation==2.1.0
-distlib==0.3.1
-distro==1.5.0
+distlib==0.3.2
+distro==1.6.0
 docopt==0.6.2
-docutils==0.16
+docutils==0.17.1
 downhill==0.4.0
 entrypoints==0.3
-fasteners==0.16
+fasteners==0.16.3
 filelock==3.0.12
 fire==0.4.0
-flit==3.1.0
-flit-core==3.1.0
-flake8==3.8.4
-flatbuffers==1.12.0
-flawfinder==2.0.15
-fs==2.4.12
+flit==3.3.0
+flit-core==3.3.0
+flake8==3.9.2
+flatbuffers==2.0
+flawfinder==2.0.19
+fonttools==4.26.2
+fs==2.4.13
 funcsigs==1.0.2
 future==0.18.2
-gast==0.4.0
-gitdb==4.0.5
-GitPython==3.1.14
-google-auth==1.27.0
-google-auth-oauthlib==0.4.2
+gast==0.5.2
+gitdb==4.0.7
+GitPython==3.1.18
+google-auth==2.0.2
+google-auth-oauthlib==0.4.6
 google-pasta==0.2.0
-grpcio==1.36.0
-grpcio-tools==1.36.0
+grpcio==1.39.0
+grpcio-tools==1.39.0
 #1.0.1 doesn't download (wheel only?)
 h5py-cache==1.0
-h5py==2.10.0
-hepdata-lib==0.4.1
+h5py==3.4.0
+hepdata-lib==0.8.1
 hep_ml==0.6.2
-hist==2.0.1
+hist==2.4.0
 histbook==1.2.5
-histoprint==1.6.0
-histogrammar==1.0.10
+histoprint==2.2.0
+histogrammar==1.0.25
 html5lib==1.1
 hyperas==0.4.1
 hyperopt==0.2.5
-idna==2.10
-immutables==0.15
-importlib-metadata==2.1.1
-importlib-resources==3.3.1
+idna==3.2
+immutables==0.16
+importlib-metadata==4.8.1
+importlib-resources==5.2.2
 iniconfig==1.1.1
 ipaddress==1.0.23
-ipykernel==5.5.0
+ipykernel==6.3.1
 ipython_genutils==0.2.0
-ipython==7.22.0
-ipywidgets==7.5.1
-isort==4.3.21
-jedi==0.17.2
-Jinja2==2.11.3
+ipython==7.27.0
+ipywidgets==7.6.4
+isort==5.9.3
+jedi==0.18.0
+Jinja2==3.0.1
 joblib==1.0.1
-jsonpickle==1.4.2
+jsonpickle==2.0.0
 jsonschema==3.2.0
-jupyter_client==6.1.11
-jupyter_console==6.2.0
-jupyter_core==4.6.3
+jupyter-client==7.0.2
+jupyter-console==6.4.0
+jupyter-core==4.7.1
+jupyter-packaging==0.10.4
 jupyter==1.0.0
-jupyterlab-widgets==1.0.0
+jupyterlab-pygments==0.1.2
+jupyter-server==1.10.2
+jupyter-server-mathjax==0.2.3
+jupyterlab-widgets==1.0.1
 keras==2.6.0
 keras-applications==1.0.8
 keras-preprocessing==1.1.2
 keras2onnx==1.7.0
-keyring==22.3.0
-kiwisolver==1.1.0
-law==0.1.3
-lazy-object-proxy==1.4.3
-lizard==1.17.7
-llvmlite==0.35.0
+keyring==23.1.0
+kiwisolver==1.3.2
+law==0.1.5
+lazy-object-proxy==1.6.0
+lizard==1.17.9
+llvmlite==0.37.0
 lockfile==0.12.2
-luigi==3.0.2
+luigi==3.0.3
 lxml==4.6.3
 lz4==3.1.3
-Mako==1.1.4
-Markdown==3.1.1
-MarkupSafe==1.1.1
-matplotlib==3.3.4
+Mako==1.1.5
+Markdown==3.3.4
+MarkupSafe==2.0.1
+matplotlib==3.4.3
+matplotlib-inline==0.1.2
 mccabe==0.6.1
 mistune==0.8.4
-mock==3.0.5
-more-itertools==8.7.0
-mpld3==0.5.2
-mplhep==0.2.16
+mock==4.0.3
+more-itertools==8.9.0
+mpld3==0.5.5
+mplhep==0.3.12
+mplhep-data==0.0.3
 mpmath==1.2.1
 multidict==5.1.0
-nbconvert==5.6.1
-nbdime==1.1.0
-nbformat==5.1.2
-networkx==2.5
+nbclient==0.5.4
+nbconvert==6.1.0
+nbdime==3.1.0
+nbformat==5.1.3
+nest-asyncio==1.5.1
+networkx==2.6.2
 neurolab==0.3.5
 nose-parameterized==0.6.0
 nose==1.3.7
 node-semver==0.8.0
 notebook==6.4.3
-numba==0.53.0
-numexpr==2.7.2
-numpy==1.19.5
-onnx==1.8.1
-onnxmltools==1.7.0
-onnxconverter-common==1.7.0
-oauthlib==3.1.0
+numba==0.54.0
+numexpr==2.7.3
+numpy==1.21.2
+onnx==1.10.1
+onnxmltools==1.9.1
+onnxconverter-common==1.8.1
+oauthlib==3.1.1
 opt-einsum==3.3.0
-pkginfo==1.7.0
-packaging==20.9
+pkginfo==1.7.1
+packaging==21.0
 pandas==1.2.2
 pandocfilters==1.4.3
 parsimonious==0.8.1
-parso==0.7.1
+parso==0.8.2
 pastel==0.2.1
 patch-ng==1.17.4
-pathlib2==2.3.5
-pbr==5.5.1
+pathlib2==2.3.6
+pbr==5.6.0
 pexpect==4.8.0
 pickleshare==0.7.5
-pillow==8.2.0
-pkgconfig==1.5.2
-plac==1.3.2
-pluginbase==1.0.0
-pluggy==0.13.1
+pillow==8.3.2
+pkgconfig==1.5.5
+plac==1.3.3
+platformdirs==2.3.0
+pluginbase==1.0.1
+pluggy==1.0.0
 ply==3.11
-poetry==1.1.4
-poetry-core==1.0.2
-prettytable==1.0.1
-prometheus_client==0.9.0
-prompt_toolkit==3.0.16
-protobuf==3.15.1
+poetry==1.1.8
+poetry-core==1.0.4
+prettytable==2.2.0
+prometheus-client==0.11.0
+prompt_toolkit==3.0.20
+protobuf==3.17.3
 prwlock==0.4.1
 psutil==5.8.0
 ptyprocess==0.7.0
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
-pybind11==2.6.2
+pybind11==2.7.1
 pybrain==0.3.3
-pycodestyle==2.6.0
+pycodestyle==2.7.0
 pycparser==2.20
-pycuda==2019.1.2
-pycurl==7.43.0.5
+pycuda==2021.1
+pycurl==7.44.1
 pydot==1.4.2
-pyflakes==2.2.0
-Pygments==2.8.1
-PyJWT==2.0.1
-pylint==2.7.2
-pymongo==3.11.3
+pyflakes==2.3.1
+Pygments==2.10.0
+PyJWT==2.1.0
+pylint==2.10.2
+pymongo==3.12.0
 pyparsing==2.4.7
-pyrsistent==0.17.3
+pyrsistent==0.18.0
 py==1.10.0
 pydantic==1.8.2
 pygithub==1.55
-pylev==1.3.0
+pylev==1.4.0
 pysqlite3==0.4.6
-pytest==6.2.2
-pytest-cov==2.11.1
-pytest-runner==5.2
+pytest==6.2.5
+pytest-cov==2.12.1
+pytest-runner==5.3.1
 python-daemon==2.3.0
-python-dateutil==2.8.1
+python-dateutil==2.8.2
 python-ldap==3.3.1
-python-rapidjson==1.0
+python-rapidjson==1.4
+pythran==0.9.12.post1
 pytoml==0.1.21
-pytools==2020.3
+pytools==2021.2.8
 pytz==2021.1
 PyYAML==5.4.1
-pyzmq==19.0.2
-qtconsole==4.7.7
-QtPy==1.9.0
+pyzmq==22.2.1
+qtconsole==5.1.1
+QtPy==1.11.0
 repoze-lru==0.7
 rep==0.6.6
-requests==2.25.1
+requests==2.26.0
 requests-toolbelt==0.9.1
 requests-oauthlib==1.3.0
+requests-unixsocket==0.2.0
 rootpy==1.0.1
 rsa==4.7.2
 scandir==1.10.0
 schema==0.7.4
-scikit-learn==0.24.1
-scinum==1.1.3
-scipy==1.6.1
-threadpoolctl==2.0.0
-scons==4.1.0.post1
-seaborn==0.9.1
-Send2Trash==1.5.0
-setuptools-scm==3.5.0
+scikit-build==0.12.0
+scikit-learn==0.24.2
+scinum==1.2.0
+scipy==1.7.1
+threadpoolctl==2.2.0
+scons==4.2.0
+seaborn==0.11.2
+Send2Trash==1.8.0
+setuptools-scm==6.3.1
 shellingham==1.4.0
 simplegeneric==0.8.1
-singledispatch==3.6.1
-six==1.15.0
-skl2onnx==1.7.1
-smmap==3.0.4
+singledispatch==3.7.0
+six==1.16.0
+skl2onnx==1.9.2
+smmap==4.0.0
 smmap2==3.0.1
-soupsieve==1.9.6
-sqlalchemy==1.3.11
-stevedore==1.32.0
+soupsieve==2.2.1
+sqlalchemy==1.3.24
+stevedore==3.4.0
 subprocess32==3.5.4
-sympy==1.7.1
+sympy==1.8
 tables==3.6.1
+tenacity==8.0.1
 #NO_AUTO_UPDATE:3: Force to use tensorflow 2.6.0; this should match the version in tensorflow-sources.spec
 tensorboard==2.6.0
 tensorflow==2.6.0
@@ -261,34 +280,37 @@ tensorflow-estimator==2.6.0
 tensorboard-data-server==0.6.1
 tensorboard-plugin-wit==1.8.0
 termcolor==1.1.0
-terminado==0.8.3
-testpath==0.4.4
+terminado==0.11.1
+testpath==0.5.0
 theanets==0.7.3
 Theano==1.0.5
 toml==0.10.2
-tomlkit==0.7.0
+tomli==1.2.1
+tomlkit==0.7.2
 tornado==6.1
-tqdm==4.51.0
-traitlets==4.3.3
-typed-ast==1.4.2
-typing_extensions==3.7.4.3
+tqdm==4.62.2
+traitlets==5.1.0
+typed-ast==1.4.3
+typing-extensions==3.10.0.2
 typing==3.7.4.3
-uncertainties==3.1.5
+uhi==0.3.0
+uncertainties==3.1.6
 uproot==3.13.0
-uproot-methods==0.8.0
+uproot-methods==0.9.2
 uproot4==0.1.2
-urllib3==1.26.5
-virtualenv-clone==0.5.4
-virtualenv==20.4.2
+urllib3==1.26.6
+virtualenv-clone==0.5.6
+virtualenv==20.7.2
 virtualenvwrapper==4.8.4
 wcwidth==0.2.5
 webencodings==0.5.1
-Werkzeug==1.0.1
-wheel==0.36.2
+websocket-client==1.2.1
+Werkzeug==2.0.1
+wheel==0.37.0
 widgetsnbextension==3.5.1
 wrapt==1.12.1
 xgboost==1.3.3
 #bumping this pulls in xrootd - which looks like it needs some understanding
 xrootdpyfs==0.2.1
 yarl==1.6.3
-zipp==3.4.0
+zipp==3.5.0
diff --git a/pip/rootpy.file b/pip/rootpy.file
index 1df6932aa69..27ce6b8cca3 100644
--- a/pip/rootpy.file
+++ b/pip/rootpy.file
@@ -1,2 +1 @@
 Requires: root py3-matplotlib
-%define PipPostBuild perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python|" %{i}/bin/*
diff --git a/pip/schema.file b/pip/schema.file
index 66b3af9f894..9cd14d41533 100644
--- a/pip/schema.file
+++ b/pip/schema.file
@@ -1 +1 @@
-Requires: py3-contextlib2 py3-wheel
+Requires: py3-contextlib2
diff --git a/pip/scikit-build.file b/pip/scikit-build.file
new file mode 100644
index 00000000000..7c3169aaf7a
--- /dev/null
+++ b/pip/scikit-build.file
@@ -0,0 +1 @@
+Requires: py3-distro py3-packaging
diff --git a/pip/scipy.file b/pip/scipy.file
index 98bc4ddadd5..485c581b519 100644
--- a/pip/scipy.file
+++ b/pip/scipy.file
@@ -1,4 +1,4 @@
-Requires: py3-numpy py3-cython py3-wheel py3-pybind11
+Requires: py3-numpy py3-cython py3-pybind11 py3-pythran
 
 %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/setuptools-scm.file b/pip/setuptools-scm.file
index 586e9952e8e..befa7f6b2dd 100644
--- a/pip/setuptools-scm.file
+++ b/pip/setuptools-scm.file
@@ -1 +1 @@
-Requires: py3-wheel
+Requires: py3-tomli py3-packaging
diff --git a/pip/shellingham.file b/pip/shellingham.file
deleted file mode 100644
index 586e9952e8e..00000000000
--- a/pip/shellingham.file
+++ /dev/null
@@ -1 +0,0 @@
-Requires: py3-wheel
diff --git a/pip/singledispatch.file b/pip/singledispatch.file
index 184b3b552fb..7c962a18c6b 100644
--- a/pip/singledispatch.file
+++ b/pip/singledispatch.file
@@ -1 +1 @@
-Requires: py3-six py3-wheel
+Requires: py3-six
diff --git a/pip/sqlalchemy.file b/pip/sqlalchemy.file
index d61a253d045..d4c4ba18ea9 100644
--- a/pip/sqlalchemy.file
+++ b/pip/sqlalchemy.file
@@ -1,3 +1,3 @@
-Patch0: py2-sqlalchemy-1.3.4-add-frontier-dialect
-Patch1: py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp
-Patch2: py2-sqlalchemy-1.3.10-server_version_info
+Patch0: py3-sqlalchemy-1.3.24-add-frontier-dialect
+Patch1: py3-sqlalchemy-1.3.24-fix-sqlite-dialect-timestamp
+Patch2: py3-sqlalchemy-1.3.24-server_version_info
diff --git a/pip/sympy.file b/pip/sympy.file
index 5f7040fd9df..4597744c34d 100644
--- a/pip/sympy.file
+++ b/pip/sympy.file
@@ -1,3 +1,2 @@
-%define RelocatePython %{i}/bin/isympy
 Requires: py3-mpmath 
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/tensorboard-data-server.file b/pip/tensorboard-data-server.file
index c8f91d51c4f..23039f93f4e 100644
--- a/pip/tensorboard-data-server.file
+++ b/pip/tensorboard-data-server.file
@@ -3,4 +3,3 @@
                    mkdir data-server ; mv tensorboard-data-server-v%{realversion}/tensorboard/data/server/pip_package/* data-server/ ; \
                    rm -rf tensorboard-data-server-v%{realversion} ; mv data-server tensorboard-data-server-v%{realversion}; \
                  popd
-BuildRequires: py3-wheel
diff --git a/pip/tensorboard.file b/pip/tensorboard.file
index 8c44da0b2f6..c3ff359a8b9 100644
--- a/pip/tensorboard.file
+++ b/pip/tensorboard.file
@@ -1,6 +1,6 @@
 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
-Requires: py3-Markdown py3-Werkzeug py3-protobuf py3-html5lib py3-six py3-wheel py3-bleach
+Requires: py3-Markdown py3-Werkzeug py3-protobuf py3-html5lib py3-six py3-bleach
 Requires: py3-tensorboard-data-server
 %define PipDownloadSourceType none
diff --git a/pip/tomli.file b/pip/tomli.file
new file mode 100644
index 00000000000..eb3d7b377e3
--- /dev/null
+++ b/pip/tomli.file
@@ -0,0 +1 @@
+Requires: py3-flit-core
diff --git a/pip/tqdm.file b/pip/tqdm.file
deleted file mode 100644
index e12c41439ba..00000000000
--- a/pip/tqdm.file
+++ /dev/null
@@ -1 +0,0 @@
-%define RelocatePython %{i}/bin/*
diff --git a/pip/traitlets.file b/pip/traitlets.file
index b65a26414e1..1220a4dd5dd 100644
--- a/pip/traitlets.file
+++ b/pip/traitlets.file
@@ -1 +1 @@
-Requires: py3-ipython_genutils py3-six py3-decorator 
+Requires: py3-ipython_genutils py3-six py3-decorator
diff --git a/pip/typing_extensions.file b/pip/typing-extensions.file
similarity index 100%
rename from pip/typing_extensions.file
rename to pip/typing-extensions.file
diff --git a/pip/uhi.file b/pip/uhi.file
new file mode 100644
index 00000000000..17486f8d625
--- /dev/null
+++ b/pip/uhi.file
@@ -0,0 +1,2 @@
+BuildRequires: py3-poetry
+Requires: py3-numpy
diff --git a/pip/virtualenv-clone.file b/pip/virtualenv-clone.file
index f1e085af13d..34782a998bc 100644
--- a/pip/virtualenv-clone.file
+++ b/pip/virtualenv-clone.file
@@ -1,3 +1,2 @@
 %define PipDownloadSourceType none
 %define DownloadOptionsExtra pkg_filename=virtualenv_clone
-%define RelocatePython %{i}/bin/*
diff --git a/pip/virtualenv.file b/pip/virtualenv.file
index 817904d8e05..193065698d2 100644
--- a/pip/virtualenv.file
+++ b/pip/virtualenv.file
@@ -1,2 +1,2 @@
 Requires: py3-appdirs py3-distlib py3-filelock py3-six py3-importlib-metadata py3-importlib-resources
-%define RelocatePython %{i}/bin/*
+Requires: py3-backports-entry-points-selectable py3-platformdirs
diff --git a/pip/wheel.file b/pip/wheel.file
index 94c9e6bd1ae..ff826ed969e 100644
--- a/pip/wheel.file
+++ b/pip/wheel.file
@@ -1,2 +1 @@
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
-%define RelocatePython %{i}/bin/*
diff --git a/pip/widgetsnbextension.file b/pip/widgetsnbextension.file
index b60145de3f2..9fc6742041d 100644
--- a/pip/widgetsnbextension.file
+++ b/pip/widgetsnbextension.file
@@ -1 +1 @@
-Requires: py3-notebook
+Requires: py3-notebook py3-jupyter-packaging
diff --git a/py2-llvmlite-llvm9.patch b/py2-llvmlite-llvm9.patch
deleted file mode 100644
index 34536a56251..00000000000
--- a/py2-llvmlite-llvm9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ffi/build.py b/ffi/build.py
-index add3945..9bf6a3a 100755
---- a/ffi/build.py
-+++ b/ffi/build.py
-@@ -134,7 +134,7 @@ def main_posix(kind, library_ext):
-         print(warning + '\n')
-     else:
- 
--        if not (out.startswith('10.0.') or out.startswith('9.0')):
-+        if not (out.startswith('12.0.') or out.startswith('9.0')):
-             msg = ("Building llvmlite requires LLVM 10.0.x or 9.0.x, got "
-                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
-                    "path.\nRead the documentation at "
diff --git a/py2-llvmlite-removeduplicate.patch b/py2-llvmlite-removeduplicate.patch
deleted file mode 100644
index f71a754819b..00000000000
--- a/py2-llvmlite-removeduplicate.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/ffi/transforms.cpp b/ffi/transforms.cpp
-index 23bfd72..2eac2e9 100644
---- a/ffi/transforms.cpp
-+++ b/ffi/transforms.cpp
-@@ -6,6 +6,7 @@
- 
- extern "C" {
- 
-+  /*
- namespace llvm {
-     inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
-         return reinterpret_cast<PassManagerBuilder*>(P);
-@@ -15,7 +16,7 @@ namespace llvm {
-         return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
-     }
- }
--
-+  */
- 
- API_EXPORT(LLVMPassManagerBuilderRef)
- LLVMPY_PassManagerBuilderCreate()
-diff --git a/ffi/custom_passes.cpp b/ffi/custom_passes.cpp
-index 860df2d..000d12a 100644
---- a/ffi/custom_passes.cpp
-+++ b/ffi/custom_passes.cpp
-@@ -400,7 +400,7 @@ struct RefPrunePass : public FunctionPass {
-                 // LLVM 9 postdomtree.dominates takes basic blocks
-                 if ( domtree.dominates(incref, decref)
-                         && postdomtree.dominates(decref->getParent(), incref->getParent()) ){
--#elif LLVM_VERSION_MAJOR == 10
-+#elif LLVM_VERSION_MAJOR == 12
-                 // LLVM 10 postdomtree.dominates can handle instructions
-                 if ( domtree.dominates(incref, decref)
-                         && postdomtree.dominates(decref, incref) ){
diff --git a/py2-llvmlite-fpic-flag.patch b/py3-llvmlite-fpic-flag.patch
similarity index 93%
rename from py2-llvmlite-fpic-flag.patch
rename to py3-llvmlite-fpic-flag.patch
index 2668ce010ba..8c012689d41 100644
--- a/py2-llvmlite-fpic-flag.patch
+++ b/py3-llvmlite-fpic-flag.patch
@@ -1,5 +1,5 @@
 diff --git a/ffi/Makefile.linux b/ffi/Makefile.linux
-index 334e9ff..9501d2c 100644
+index fcfda4e..2d875cf 100644
 --- a/ffi/Makefile.linux
 +++ b/ffi/Makefile.linux
 @@ -5,7 +5,7 @@ CXX ?= g++
diff --git a/py2-llvmlite-removeMethod.patch b/py3-llvmlite-removeMethod.patch
similarity index 100%
rename from py2-llvmlite-removeMethod.patch
rename to py3-llvmlite-removeMethod.patch
diff --git a/py3-llvmlite-version.patch b/py3-llvmlite-version.patch
new file mode 100644
index 00000000000..a3c369650f5
--- /dev/null
+++ b/py3-llvmlite-version.patch
@@ -0,0 +1,13 @@
+diff --git a/ffi/build.py b/ffi/build.py
+index 6408bf5..22f3b3c 100755
+--- a/ffi/build.py
++++ b/ffi/build.py
+@@ -163,7 +163,7 @@ def main_posix(kind, library_ext):
+         print(warning + '\n')
+     else:
+ 
+-        if not out.startswith('11'):
++        if int(out.split(".")[0])<11:
+             msg = ("Building llvmlite requires LLVM 11.x.x, got "
+                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
+                    "path.\nRead the documentation at "
diff --git a/py2-sqlalchemy-1.3.4-add-frontier-dialect.patch b/py3-sqlalchemy-1.3.24-add-frontier-dialect.patch
similarity index 98%
rename from py2-sqlalchemy-1.3.4-add-frontier-dialect.patch
rename to py3-sqlalchemy-1.3.24-add-frontier-dialect.patch
index 0d963b43485..3a6d046c82e 100644
--- a/py2-sqlalchemy-1.3.4-add-frontier-dialect.patch
+++ b/py3-sqlalchemy-1.3.24-add-frontier-dialect.patch
@@ -1,6 +1,6 @@
 diff --git a/lib/sqlalchemy/connectors/frontier.py b/lib/sqlalchemy/connectors/frontier.py
 new file mode 100644
-index 0000000..5cbb3d7
+index 0000000..8d00404
 --- /dev/null
 +++ b/lib/sqlalchemy/connectors/frontier.py
 @@ -0,0 +1,26 @@
@@ -31,7 +31,7 @@ index 0000000..5cbb3d7
 +    def do_rollback(self, dbapi_connection):
 +        pass
 diff --git a/lib/sqlalchemy/dialects/oracle/__init__.py b/lib/sqlalchemy/dialects/oracle/__init__.py
-index 9f1e15b..d06e3e9 100644
+index 75eb95f..8c126b3 100644
 --- a/lib/sqlalchemy/dialects/oracle/__init__.py
 +++ b/lib/sqlalchemy/dialects/oracle/__init__.py
 @@ -8,6 +8,7 @@
diff --git a/py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp.patch b/py3-sqlalchemy-1.3.24-fix-sqlite-dialect-timestamp.patch
similarity index 67%
rename from py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp.patch
rename to py3-sqlalchemy-1.3.24-fix-sqlite-dialect-timestamp.patch
index 5ffea1017b8..c62025fee67 100644
--- a/py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp.patch
+++ b/py3-sqlalchemy-1.3.24-fix-sqlite-dialect-timestamp.patch
@@ -1,8 +1,8 @@
 diff --git a/lib/sqlalchemy/processors.py b/lib/sqlalchemy/processors.py
-index 62fc6e9..38a63a4 100644
+index c090548..faa2475 100644
 --- a/lib/sqlalchemy/processors.py
 +++ b/lib/sqlalchemy/processors.py
-@@ -30,12 +30,15 @@ def str_to_datetime_processor_factory(regexp, type_):
+@@ -30,13 +30,16 @@ def str_to_datetime_processor_factory(regexp, type_):
          if value is None:
              return None
          else:
@@ -11,16 +11,17 @@ index 62fc6e9..38a63a4 100644
 +                return datetime.datetime.fromtimestamp( float(value)/1000000000. ).strftime("%Y-%m-%d %H:%M:%S.%f")
              try:
                  m = rmatch(value)
-             except TypeError:
-                 raise ValueError(
-                     "Couldn't parse %s string '%r' "
--                    "- value is not a string." % (type_.__name__, value)
-+                    "- value is not a string but %s." % (type_.__name__, value, type(value))
+             except TypeError as err:
+                 util.raise_(
+                     ValueError(
+                         "Couldn't parse %s string '%r' "
+-                        "- value is not a string." % (type_.__name__, value)
++                        "- value is not a string but %s." % (type_.__name__, value, type(value))
+                     ),
+                     from_=err,
                  )
-             if m is None:
-                 raise ValueError(
 diff --git a/setup.py b/setup.py
-index aaba737..b30d7b3 100644
+index 1fdc91f..1654110 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -21,10 +21,10 @@ if sys.version_info < (2, 7):
diff --git a/py2-sqlalchemy-1.3.10-server_version_info.patch b/py3-sqlalchemy-1.3.24-server_version_info.patch
similarity index 85%
rename from py2-sqlalchemy-1.3.10-server_version_info.patch
rename to py3-sqlalchemy-1.3.24-server_version_info.patch
index 776115d4076..f647e2f7807 100644
--- a/py2-sqlalchemy-1.3.10-server_version_info.patch
+++ b/py3-sqlalchemy-1.3.24-server_version_info.patch
@@ -1,8 +1,8 @@
 diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
-index 2353f15..77b2613 100644
+index c621165..65bad1e 100644
 --- a/lib/sqlalchemy/dialects/oracle/base.py
 +++ b/lib/sqlalchemy/dialects/oracle/base.py
-@@ -1247,7 +1247,7 @@ class OracleDialect(default.DefaultDialect):
+@@ -1346,7 +1346,7 @@ class OracleDialect(default.DefaultDialect):
          super(OracleDialect, self).initialize(connection)
  
          self.implicit_returning = self.__dict__.get(
@@ -11,7 +11,7 @@ index 2353f15..77b2613 100644
          )
  
          if self._is_oracle_8:
-@@ -1259,7 +1259,7 @@ class OracleDialect(default.DefaultDialect):
+@@ -1358,7 +1358,7 @@ class OracleDialect(default.DefaultDialect):
          # dialect does not need compat levels below 12.2, so don't query
          # in those cases
  
@@ -20,7 +20,7 @@ index 2353f15..77b2613 100644
              return self.server_version_info
          try:
              compat = connection.execute(
-@@ -1272,9 +1272,9 @@ class OracleDialect(default.DefaultDialect):
+@@ -1371,9 +1371,9 @@ class OracleDialect(default.DefaultDialect):
              try:
                  return tuple(int(x) for x in compat.split("."))
              except:
diff --git a/python_tools.spec b/python_tools.spec
index 27fd568bc92..8a79ca66821 100644
--- a/python_tools.spec
+++ b/python_tools.spec
@@ -60,9 +60,9 @@ Requires: py3-ipython_genutils
 Requires: py3-ipywidgets
 Requires: py3-jsonschema
 Requires: py3-jupyter
-Requires: py3-jupyter_client
-Requires: py3-jupyter_console
-Requires: py3-jupyter_core
+Requires: py3-jupyter-client
+Requires: py3-jupyter-console
+Requires: py3-jupyter-core
 Requires: py3-mistune
 Requires: py3-nbconvert
 Requires: py3-nbformat
@@ -156,13 +156,12 @@ Requires: py3-ipaddress
 Requires: py3-mccabe
 Requires: py3-more-itertools
 Requires: py3-pluggy
-Requires: py3-prometheus_client
 Requires: py3-pyasn1-modules
 Requires: py3-pyasn1
 Requires: py3-pyflakes
 Requires: py3-smmap2
 Requires: py3-stevedore
-Requires: py3-typing_extensions
+Requires: py3-typing-extensions
 Requires: py3-virtualenv-clone
 Requires: py3-asn1crypto
 Requires: py3-backcall
diff --git a/scram-tool-conf.file b/scram-tool-conf.file
index 1a1ddadc004..acee1b2d095 100644
--- a/scram-tool-conf.file
+++ b/scram-tool-conf.file
@@ -111,7 +111,7 @@ for pkg in  $(echo %{allpkgreqs} | tr ' ' '\n' | grep '/py[23]-') ; do
   fi
   echo "</tool>" >> %{i}/tools/selected/${pk_name}.xml
 done
-DUP_BIN=$(echo "${ALL_PY_BIN}" | tr ' ' '\n' | sort | uniq -c | sed 's|^\s*||' | grep -v '^1 ' | sed 's|^.* ||')
+DUP_BIN=$(echo "${ALL_PY_BIN}" | tr ' ' '\n' | grep -v '__pycache__' | sort | uniq -c | sed 's|^\s*||' | grep -v '^1 ' | sed 's|^.* ||')
 
 set +x
 if [ "${DUP_BIN}" != "" ] ; then
diff --git a/tensorflow-requires.file b/tensorflow-requires.file
index 66ab99f4bc1..86cca9d8870 100644
--- a/tensorflow-requires.file
+++ b/tensorflow-requires.file
@@ -1,5 +1,6 @@
-Requires: python3 py3-numpy py3-mock py3-wheel py3-typing py3-typing_extensions
+Requires: python3 py3-numpy py3-mock py3-typing py3-typing-extensions
 Requires: py3-keras-applications py3-keras-preprocessing py3-future py3-wrapt py3-gast py3-setuptools
 Requires: py3-cython py3-protobuf py3-astor py3-six py3-termcolor py3-absl-py
 Requires: py3-opt-einsum py3-flatbuffers
 Requires: eigen protobuf zlib libpng libjpeg-turbo curl giflib sqlite grpc flatbuffers py3-pybind11
+BuildRequires: py3-wheel