updated dependencies for new versions

cms-sw · Sep 2, 2021 · 11821ed · 11821ed
1 parent c6ec2c3
commit 11821ed
Show file tree

Hide file tree

Showing 74 changed files with 154 additions and 117 deletions.
diff --git a/pip/Markdown.file b/pip/Markdown.file
@@ -1 +1,2 @@
+BuildRequires: py3-wheel
 %define RelocatePython %{i}/bin/*
diff --git a/pip/Send2Trash.file b/pip/Send2Trash.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/anyio.file b/pip/anyio.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/backports-entry-points-selectable.file b/pip/backports-entry-points-selectable.file
@@ -0,0 +1,2 @@
+%define pip_name backports.entry-points-selectable
+BuildRequires: py3-wheel
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,3 +1,4 @@
+BuildRequires: py3-wheel
 Requires: py3-typing_extensions
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
 Requires: py3-PyYAML py3-python-dateutil py3-Jinja2 py3-numpy py3-packaging

diff --git a/pip/cachetools.file b/pip/cachetools.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
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/cx-Oracle.file b/pip/cx-Oracle.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/debugpy.file b/pip/debugpy.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/defusedxml.file b/pip/defusedxml.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
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,2 @@
-Requires: py3-numpy py3-setuptools-scm py3-toml py3-Click
+Requires: py3-numpy py3-setuptools-scm py3-toml py3-Click py3-uhi
+BuildRequires: py3-wheel
diff --git a/pip/immutables.file b/pip/immutables.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
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
+Requires: py3-jedi py3-prompt_toolkit py3-backcall py3-matplotlib-inline
 %define PipPostBuildPy rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3
 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,3 @@
-%define patchsrc sed -i -e '/.*futures.*/d' isort.egg-info/requires.txt setup.py
+#define patchsrc sed -i -e '/.*futures.*/d' isort.egg-info/requires.txt setup.py
+Requires: py3-poetry
 %define RelocatePython %{i}/bin/*
diff --git a/pip/jupyter-client.file b/pip/jupyter-client.file
@@ -0,0 +1,4 @@
+Requires: py3-jupyter-core py3-python-dateutil py3-pyzmq
+Requires: py3-tornado py3-entrypoints py3-nest-asyncio
+%define RelocatePython %{i}/bin/*
+%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 → pip/jupyter-core.file b/pip/jupyter_core.file → pip/jupyter-core.file
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/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/kiwisolver.file b/pip/kiwisolver.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/lazy-object-proxy.file b/pip/lazy-object-proxy.file
@@ -1 +1,2 @@
 Requires: py3-setuptools-scm
+BuildRequires: py3-wheel
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
+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/luigi.file b/pip/luigi.file
@@ -1,4 +1,4 @@
-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/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/mplhep-data.file b/pip/mplhep-data.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
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/nbclient.file b/pip/nbclient.file
@@ -0,0 +1,2 @@
+BuildRequires: py3-wheel
+Requires: py3-jupyter-client py3-nbformat py3-nest-asyncio py3-traitlets
diff --git a/pip/nbconvert.file b/pip/nbconvert.file
@@ -1,3 +1,3 @@
 Requires: py3-Jinja2 py3-Pygments py3-bleach py3-defusedxml py3-entrypoints py3-mistune py3-pandocfilters py3-nbformat
-Requires: py3-testpath
+Requires: py3-testpath py3-jupyterlab-pygments py3-nbclient
 %define RelocatePython %{i}/bin/jupyter-nbconvert
diff --git a/pip/nbdime.file b/pip/nbdime.file
@@ -1,5 +1,6 @@
 Requires: py3-GitPython py3-requests py3-colorama
 Requires: py3-notebook py3-GitPython
+Requires: py3-jupyter-server py3-jupyter-server-mathjax
 %define RelocatePython %{i}/bin/*
 
 
diff --git a/pip/nbformat.file b/pip/nbformat.file
@@ -1,3 +1,3 @@
-Requires: py3-traitlets py3-jsonschema py3-jupyter_core
+Requires: py3-traitlets py3-jsonschema py3-jupyter-core
 %define RelocatePython %{i}/bin/jupyter-trust
 %define PipPostBuildPy for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
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/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/pandas.file b/pip/pandas.file
@@ -1 +1,2 @@
 Requires: py3-six py3-python-dateutil py3-pytz py3-numpy py3-cython
+BuildRequires: py3-wheel
diff --git a/pip/platformdirs.file b/pip/platformdirs.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/pylev.file b/pip/pylev.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/pyrsistent.file b/pip/pyrsistent.file
@@ -1 +1,2 @@
 Requires: py3-six
+BuildRequires: py3-wheel
diff --git a/pip/pytest-runner.file b/pip/pytest-runner.file
@@ -1 +1,2 @@
 Requires: py3-setuptools-scm
+BuildRequires: py3-wheel
diff --git a/pip/python-dateutil.file b/pip/python-dateutil.file
@@ -1 +1,2 @@
 Requires: py3-six py3-setuptools-scm
+BuildRequires: py3-wheel
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/pyzmq.file b/pip/pyzmq.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
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
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -14,6 +14,7 @@
 absl-py==0.13.0
 aiohttp==3.7.4.post0
 aiosqlite==0.17.0
+anyio==3.3.0
 appdirs==1.4.4
 argon2-cffi==21.1.0
 argparse==1.4.0
@@ -27,28 +28,31 @@ atomicwrites==1.4.0
 attrs==21.2.0
 autopep8==1.5.7
 avro==1.10.2
-awkward==1.4.0
-awkward1==1.0.0
+awkward==0.14.0
+awkward1==0.4.4
 backcall==0.2.0
+backports-entry-points-selectable==1.1.0
 beautifulsoup4==4.9.3
+beniget==0.4.1
 bleach==4.1.0
-bokeh==2.4.0.dev6
+bokeh==2.3.0
 boost-histogram==1.1.0
 bottle==0.12.19
 Bottleneck==1.3.2
 cachecontrol==0.12.6
 cachetools==4.2.2
 cachy==0.3.0
+charset-normalizer==2.0.4
 cleo==1.0.0a4
 clikit==0.6.2
 cmsml==0.1.1
-correctionlib==2.0.0
+correctionlib==1.1.0
 crashtest==0.3.1
 certifi==2021.5.30
 cffi==1.14.6
 chardet==4.0.0
 Click==8.0.1
-climate==0.1.0
+climate==0.4.6
 cloudpickle==1.6.0
 colorama==0.4.4
 conan==1.39.0
@@ -57,8 +61,9 @@ contextvars==2.4
 coverage==6.0b1
 cx-Oracle==8.2.1
 cycler==0.10.0
-cython==3.0.0a9
+cython==0.29.24
 decorator==5.0.9
+debugpy==1.4.1
 defusedxml==0.7.1
 deprecation==2.1.0
 distlib==0.3.2
@@ -75,6 +80,7 @@ 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
@@ -114,10 +120,15 @@ Jinja2==3.0.1
 joblib==1.0.1
 jsonpickle==2.0.0
 jsonschema==4.0.0a6
-jupyter_client==7.0.2
-jupyter_console==6.4.0
-jupyter_core==4.8.0rc0
+jupyter-client==7.0.2
+jupyter-console==6.4.0
+jupyter-core==4.7.1
+jupyter-client==7.0.2
+jupyter-packaging==0.10.4
 jupyter==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.4.3
 keras-applications==1.0.8
@@ -137,17 +148,21 @@ Mako==1.1.5
 Markdown==3.3.4
 MarkupSafe==2.0.1
 matplotlib==3.5.0b1
+matplotlib-inline==0.1.2
 mccabe==0.6.1
 mistune==2.0.0rc1
 mock==4.0.3
 more-itertools==8.8.0
 mpld3==0.5.5
 mplhep==0.3.12
+mplhep-data==0.0.3
 mpmath==1.2.1
 multidict==5.1.0
+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
@@ -159,12 +174,12 @@ numexpr==2.7.3
 numpy==1.21.2
 onnx==1.10.1
 onnxmltools==1.9.1
-onnxconverter-common==1.8.0
+onnxconverter-common==1.8.1
 oauthlib==3.1.1
 opt-einsum==3.3.0
 pkginfo==1.7.1
 packaging==21.0
-pandas==1.3.2
+pandas==1.2.2
 pandocfilters==1.4.3
 parsimonious==0.8.1
 parso==0.8.2
@@ -177,13 +192,14 @@ pickleshare==0.7.5
 pillow==8.3.1
 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.8
 poetry-core==1.0.4
 prettytable==2.2.0
-prometheus_client==0.11.0
+prometheus-client==0.11.0
 prompt_toolkit==3.0.20
 protobuf==3.18.0rc2
 prwlock==0.4.1
@@ -217,6 +233,7 @@ python-daemon==2.3.0
 python-dateutil==2.8.2
 python-ldap==3.3.1
 python-rapidjson==1.4
+pythran==0.9.12.post1
 pytoml==0.1.21
 pytools==2021.2.8
 pytz==2021.1
@@ -229,10 +246,12 @@ rep==0.6.6
 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-build==0.12.0
 scikit-learn==0.24.2
 scinum==1.1.4
 scipy==1.7.1
@@ -254,6 +273,7 @@ stevedore==3.4.0
 subprocess32==3.5.4
 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
@@ -266,23 +286,26 @@ testpath==0.5.0
 theanets==0.7.3
 Theano==1.0.5
 toml==0.10.2
+tomli==1.2.1
 tomlkit==0.7.2
 tornado==6.1
 tqdm==4.62.2
 traitlets==5.1.0
 typed-ast==1.4.3
 typing_extensions==3.10.0.2
 typing==3.7.4.3
+uhi==0.3.0
 uncertainties==3.1.6
-uproot==4.1.1
+uproot==3.13.0
 uproot-methods==0.9.2
-uproot4==4.0.0
+uproot4==0.1.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
+websocket-client==1.2.1
 Werkzeug==2.0.1
 wheel==0.37.0
 widgetsnbextension==4.0.0a4

diff --git a/pip/scikit-build.file b/pip/scikit-build.file
@@ -0,0 +1 @@
+Requires: py3-distro py3-packaging py3-wheel
diff --git 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-wheel 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
@@ -1 +1,2 @@
-Requires: py3-wheel
+BuildRequires: py3-wheel
+Requires: py3-tomli
diff --git a/pip/soupsieve.file b/pip/soupsieve.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git 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.4.23-add-frontier-dialect
+Patch1: py3-sqlalchemy-1.4.23-fix-sqlite-dialect-timestamp
+Patch2: py3-sqlalchemy-1.4.23-server_version_info
diff --git a/pip/tenacity.file b/pip/tenacity.file
@@ -0,0 +1 @@
+BuildRequires: py3-wheel
diff --git a/pip/tomli.file b/pip/tomli.file
@@ -0,0 +1 @@
+Requires: py3-flit-core
diff --git a/pip/tqdm.file b/pip/tqdm.file
@@ -1 +1,2 @@
+BuildRequires: py3-wheel
 %define RelocatePython %{i}/bin/*
diff --git a/pip/traitlets.file b/pip/traitlets.file
@@ -1 +1,2 @@
-Requires: py3-ipython_genutils py3-six py3-decorator 
+Requires: py3-ipython_genutils py3-six py3-decorator
+BuildRequires: py3-wheel
diff --git a/pip/uhi.file b/pip/uhi.file
@@ -0,0 +1,2 @@
+BuildRequires: py3-poetry
+Requires: py3-numpy