Merge pull request #7263 from cms-sw/py3-update

Updates python packages to their latest version
cms-sw · Sep 6, 2021 · c0681ef · c0681ef
2 parents 746af71 + aff6168
commit c0681ef
Show file tree

Hide file tree

Showing 121 changed files with 292 additions and 350 deletions.
diff --git 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
@@ -1 +1 @@
-Requires: py3-numpy py3-wheel
+Requires: py3-numpy
diff --git 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
diff --git a/pip/PyJWT.file b/pip/PyJWT.file
diff --git a/pip/PyYAML.file b/pip/PyYAML.file
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-Requires: py3-cffi py3-six py3-wheel
+Requires: py3-cffi py3-six
diff --git 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
@@ -0,0 +1 @@
+Requires: py3-typing-extensions
diff --git a/pip/attrs.file b/pip/attrs.file
diff --git 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
@@ -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
@@ -0,0 +1 @@
+%define pip_name backports.entry-points-selectable
diff --git a/pip/beniget.file b/pip/beniget.file
@@ -0,0 +1 @@
+Requires: py3-gast
diff --git 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
@@ -1 +1 @@
-Requires: py3-numpy py3-typing py3-wheel
+Requires: py3-numpy py3-typing
diff --git a/pip/cachy.file b/pip/cachy.file
diff --git a/pip/chardet.file b/pip/chardet.file
diff --git 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
@@ -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
@@ -1,2 +1 @@
 Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson
-
diff --git a/pip/coverage.file b/pip/coverage.file
diff --git a/pip/docutils.file b/pip/docutils.file
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1 @@
-Requires: py3-wheel
 Requires: py3-importlib-metadata
-
-
diff --git 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
@@ -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 → pip/jupyter-console.file b/pip/jupyter_console.file → pip/jupyter-console.file
diff --git a/pip/jupyter-core.file 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
@@ -0,0 +1 @@
+Requires: py3-packaging py3-deprecation py3-tomlkit
diff --git a/pip/jupyter-server-mathjax.file 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
@@ -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
@@ -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
diff --git a/pip/jupyter_core.file b/pip/jupyter_core.file
diff --git a/pip/jupyterlab-pygments.file b/pip/jupyterlab-pygments.file
@@ -0,0 +1 @@
+Requires: py3-Pygments
diff --git a/pip/jupyterlab-widgets.file b/pip/jupyterlab-widgets.file
@@ -0,0 +1 @@
+Requires: py3-jupyter-packaging
diff --git a/pip/keyring.file b/pip/keyring.file
diff --git 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
diff --git 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
diff --git 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
@@ -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
@@ -0,0 +1 @@
+Requires: py3-traitlets
diff --git 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
@@ -1 +1 @@
-Requires: py3-six py3-wheel
+Requires: py3-six
diff --git 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
diff --git a/pip/multidict.file b/pip/multidict.file
diff --git a/pip/nbclient.file 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/pip/plac.file b/pip/plac.file
diff --git 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
diff --git a/pip/pycodestyle.file b/pip/pycodestyle.file
diff --git 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
@@ -1 +1 @@
-Requires: py3-typing_extensions
+Requires: py3-typing-extensions
diff --git a/pip/pyflakes.file b/pip/pyflakes.file
diff --git 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
@@ -1 +1 @@
-Requires: py3-wheel py3-docutils py3-lockfile
+Requires: py3-docutils py3-lockfile
diff --git a/pip/pythran.file 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
@@ -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
@@ -0,0 +1 @@
+Requires:  py3-requests py3-urllib3
diff --git 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