From 9a9d84c9665aba186b8736957ead02c798341419 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 5 Apr 2023 14:36:59 +0200 Subject: [PATCH 1/4] Try to update all python packages --- pip/requirements.txt | 404 +++++++++++++++++++++---------------------- 1 file changed, 202 insertions(+), 202 deletions(-) diff --git a/pip/requirements.txt b/pip/requirements.txt index 7a64fc54d04..d035e8087d9 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -11,11 +11,11 @@ #To customize a package build e.g. providing extra Requirements, build, install #flags or patching, please use package_name.file ############################################################################# -absl-py==1.2.0 -aiohttp==3.8.1 -aiosqlite==0.17.0 -aiosignal==1.2.0 -anyio==3.6.1 +absl-py==1.4.0 +aiohttp==3.8.4 +aiosqlite==0.18.0 +aiosignal==1.3.1 +anyio==3.6.2 appdirs==1.4.4 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 @@ -23,315 +23,315 @@ argparse==1.4.0 arrow==1.2.3 asn1crypto==1.5.1 astor==0.8.1 -astroid==2.12.7 -asttokens==2.0.8 +astroid==2.15.2 +asttokens==2.2.1 astunparse==1.6.3 -async-lru==1.0.3 +async-lru==2.0.2 async-timeout==4.0.2 atomicwrites==1.4.1 -attrs==22.1.0 -autopep8==1.7.0 +attrs==22.2.0 +autopep8==2.0.2 avro==1.11.1 -awkward==1.9.0 +awkward==2.1.1 backcall==0.2.0 -backports-entry-points-selectable==1.1.1 -beautifulsoup4==4.11.1 +backports-entry-points-selectable==1.2.0 +beautifulsoup4==4.12.0 beniget==0.4.1 -bleach==5.0.1 -bokeh==2.4.3 -boost-histogram==1.3.1 -bottle==0.12.23 -Bottleneck==1.3.5 +bleach==6.0.0 +bokeh==3.1.0 +boost-histogram==1.3.2 +bottle==0.12.25 +Bottleneck==1.3.7 cachecontrol==0.12.11 -cachetools==5.2.0 +cachetools==5.3.0 cachy==0.3.0 -charset-normalizer==2.1.1 -cleo==0.8.1 +charset-normalizer==3.1.0 +cleo==2.0.1 clikit==0.6.2 cmsml==0.1.2 -correctionlib==2.1.0 -crashtest==0.4.0 -certifi==2022.9.14 +correctionlib==2.2.2 +crashtest==0.4.1 +certifi==2022.12.7 cffi==1.15.1 -chardet==5.0.0 +chardet==5.1.0 Click==8.1.3 -cloudpickle==2.2.0 -colorama==0.4.5 +cloudpickle==2.2.1 +colorama==0.4.6 commonmark==0.9.1 -conan==1.52.0 +conan==2.0.3 contextlib2==21.6.0 -contextvars==2.4 -coverage==6.4.4 +contextvars==2.4.0 +coverage==7.2.2 cppy==1.2.1 # Newer versions of py3-cryptography require OpenSSL 1.1.0+, see https://github.com/pyca/cryptography/issues/5906 -cryptography==37.0.4 +cryptography==40.0.1 cryptography==3.2.1 ; cmsos_name=='slc7' cx-Oracle==8.3.0 cycler==0.11.0 -cython==0.29.32 +cython==0.29.34 decorator==5.1.1 -debugpy==1.6.3 +debugpy==1.6.6 defusedxml==0.7.1 deprecation==2.1.0 deprecated==1.2.13 -dill==0.3.5.1 +dill==0.3.6 distlib==0.3.6 -distro==1.7.0 +distro==1.8.0 docopt==0.6.2 -docutils==0.19 +docutils==0.19.0 downhill==0.4.0 -dulwich==0.20.46 -editables==0.3 -entrypoints==0.4 -executing==1.1.0 -fasteners==0.17.3 -fastjsonschema==2.16.2 -filelock==3.8.0 -fire==0.4.0 -flit==3.7.1 -flit-core==3.7.1 -flake8==5.0.4 -flatbuffers==2.0.7 +dulwich==0.21.3 +editables==0.3.0 +entrypoints==0.4.0 +executing==1.2.0 +fasteners==0.18.0 +fastjsonschema==2.16.3 +filelock==3.10.7 +fire==0.5.0 +flit==3.8.0 +flit-core==3.8.0 +flake8==6.0.0 +flatbuffers==23.3.3 flawfinder==2.0.19 -fonttools==4.37.3 -frozenlist==1.3.1 +fonttools==4.39.3 +frozenlist==1.3.3 funcsigs==1.0.2 -future==0.18.2 +future==0.18.3 gast==0.5.3 -gitdb==4.0.9 -GitPython==3.1.27 -google-auth==2.11.0 -google-auth-oauthlib==0.5.2 +gitdb==4.0.10 +GitPython==3.1.31 +google-auth==2.17.1 +google-auth-oauthlib==1.0.0 google-pasta==0.2.0 -grpcio==1.48.1 -grpcio-tools==1.48.1 -hatchling==1.8.1 -h5py==3.7.0 -hepdata-lib==0.10.1 +grpcio==1.53.0 +grpcio-tools==1.53.0 +hatchling==1.14.0 +h5py==3.8.0 +hepdata-lib==0.12.0 hepdata-validator==0.3.3 -hep_ml==0.7.1 -hist==2.6.1 +hep_ml==0.7.2 +hist==2.6.3 histbook==1.2.5 histoprint==2.4.0 -histogrammar==1.0.31 -html5lib==1.1 -idna==3.3 -immutables==0.18 -importlib-metadata==4.12.0 -importlib-resources==5.9.0 -iniconfig==1.1.1 +histogrammar==1.0.33 +html5lib==1.1.0 +idna==3.4.0 +immutables==0.19.0 +importlib-metadata==6.1.0 +importlib-resources==5.12.0 +iniconfig==2.0.0 ipaddress==1.0.23 -ipykernel==6.16.0 +ipykernel==6.22.0 ipython_genutils==0.2.0 -ipython==8.5.0 -ipywidgets==8.0.2 -isort==5.10.1 -jaraco-classes==3.2.2 -jedi==0.18.1 +ipython==8.12.0 +ipywidgets==8.0.6 +isort==5.12.0 +jaraco-classes==3.2.3 +jedi==0.18.2 jeepney==0.8.0 Jinja2==3.1.2 jinja2-time==0.2.0 joblib==1.2.0 -jsonpickle==2.2.0 -jsonschema==3.2.0 -jupyter-client==7.3.5 -jupyter-console==6.4.4 -jupyter-core==4.11.1 +jsonpickle==3.0.1 +jsonschema==4.17.3 +jupyter-client==8.1.0 +jupyter-console==6.6.3 +jupyter-core==5.3.0 jupyter-packaging==0.12.3 jupyterlab-pygments==0.2.2 -jupyter-server==1.18.1 +jupyter-server==2.5.0 jupyter-server-mathjax==0.2.6 -jupyterlab-widgets==3.0.3 -keras==2.6.0 +jupyterlab-widgets==3.0.7 +keras==2.12.0 keras-applications==1.0.8 keras-preprocessing==1.1.2 keras2onnx==1.7.0 -keyring==23.9.1 +keyring==23.13.1 kiwisolver==1.4.4 -law==0.1.7 -lazy-object-proxy==1.7.1 +law==0.1.12 +lazy-object-proxy==1.9.0 lizard==1.17.10 -llvmlite==0.38.1 +llvmlite==0.39.1 lockfile==0.12.2 -luigi==3.1.1 -lxml==4.9.1 -lz4==4.0.2 -make==0.1.6.post2 -Mako==1.2.2 -Markdown==3.4.1 -MarkupSafe==2.1.1 -matplotlib==3.5.3 +luigi==3.2.1 +lxml==4.9.2 +lz4==4.3.2 +make==0.1.6 +Mako==1.2.4 +Markdown==3.4.3 +MarkupSafe==2.1.2 +matplotlib==3.7.1 matplotlib-inline==0.1.6 mccabe==0.7.0 -mistune==2.0.4 -mock==4.0.3 -more-itertools==8.14.0 -mpld3==0.5.8 +mistune==2.0.5 +mock==5.0.1 +more-itertools==9.1.0 +mpld3==0.5.9 mplhep==0.3.26 mplhep-data==0.0.3 -mpmath==1.2.1 -msgpack==1.0.4 -multidict==6.0.2 -nbclient==0.6.7 -nbconvert==7.0.0 +mpmath==1.3.0 +msgpack==1.0.5 +multidict==6.0.4 +nbclient==0.7.3 +nbconvert==7.3.0 #nbdime==3.1.0 ; disabled not used by cmssw -nbformat==5.4.0 -nest-asyncio==1.5.5 -networkx==2.8.6 +nbformat==5.8.0 +nest-asyncio==1.5.6 +networkx==3.1.0 neurolab==0.3.5 -node-semver==0.8.1 -notebook==6.4.12 -numba==0.56.2 -numexpr==2.8.3 -numpy==1.22.4 -onnx==1.12.0 -onnxmltools==1.11.1 -onnxconverter-common==1.9.0 -oauthlib==3.2.1 +node-semver==0.9.0 +notebook==6.5.3 +numba==0.56.4 +numexpr==2.8.4 +numpy==1.24.2 +onnx==1.13.1 +onnxmltools==1.11.2 +onnxconverter-common==1.13.0 +oauthlib==3.2.2 opt-einsum==3.3.0 -pkginfo==1.8.3 -packaging==21.3 -pandas==1.4.4 +pkginfo==1.9.6 +packaging==23.0.0 +pandas==2.0.0 pandocfilters==1.5.0 parsimonious==0.10.0 parso==0.8.3 pastel==0.2.1 patch-ng==1.17.4 pathlib2==2.3.7.post1 -pathspec==0.10.1 -pbr==5.10.0 +pathspec==0.11.1 +pbr==5.11.1 pexpect==4.8.0 pickleshare==0.7.5 -pillow==9.2.0 +pillow==9.5.0 pkgconfig==1.5.5 plac==1.3.5 -platformdirs==2.3.0 +platformdirs==3.2.0 pluginbase==1.0.1 pluggy==1.0.0 -ply==3.11 -poetry==1.2.0 -poetry-core==1.1.0 -poetry-plugin-export==1.0.7 -prettytable==3.4.1 -prometheus-client==0.14.1 -prompt_toolkit==3.0.31 -protobuf==4.21.7 +ply==3.11.0 +poetry==1.4.2 +poetry-core==1.5.2 +poetry-plugin-export==1.3.0 +prettytable==3.6.0 +prometheus-client==0.16.0 +prompt_toolkit==3.0.38 +protobuf==4.22.1 prwlock==0.4.1 -psutil==5.9.2 +psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 pyasn1-modules==0.2.8 pyasn1==0.4.8 -pybind11==2.10.0 +pybind11==2.10.4 pybrain==0.3.3 -pycodestyle==2.9.1 -pycparser==2.21 +pycodestyle==2.10.0 +pycparser==2.21.0 pycuda==2022.2.2 -pycurl==7.45.1 +pycurl==7.45.2 pydot==1.4.2 -pyflakes==2.5.0 -Pygments==2.13.0 -PyJWT==2.4.0 -pylint==2.15.0 -pymongo==4.2.0 +pyflakes==3.0.1 +Pygments==2.14.0 +PyJWT==2.6.0 +pylint==2.17.2 +pymongo==4.3.3 pyparsing==3.0.9 -pyrsistent==0.18.1 +pyrsistent==0.19.3 py==1.11.0 -pydantic==1.10.2 -pygithub==1.55 +pydantic==1.10.7 +pygithub==1.58.1 pylev==1.4.0 PyNaCl==1.5.0 pysocks==1.7.1 -pysqlite3==0.4.7 -pytest==7.1.3 -pytest-cov==3.0.0 +pysqlite3==0.5.0 +pytest==7.2.2 +pytest-cov==4.0.0 pytest-runner==6.0.0 -python-daemon==2.3.1 +python-daemon==3.0.1 python-dateutil==2.8.2 -python-ldap==3.4.2 -python-rapidjson==1.8 -pythran==0.11.0 +python-ldap==3.4.3 +python-rapidjson==1.10.0 +pythran==0.12.1 pytoml==0.1.21 -pytools==2022.1.12 -pytz==2022.2.1 -PyYAML==6.0 -pyzmq==24.0.1 -regex==2022.8.17 -repoze-lru==0.7 +pytools==2022.1.14 +pytz==2023.3.0 +PyYAML==6.0.0 +pyzmq==25.0.2 +regex==2023.3.23 +repoze-lru==0.7.0 rep==0.6.6 -requests==2.28.1 -requests-toolbelt==0.9.1 +requests==2.28.2 +requests-toolbelt==0.10.1 requests-oauthlib==1.3.1 requests-unixsocket==0.3.0 -rich==12.5.1 +rich==13.3.3 rootpy==1.0.1 -rsa==4.9 +rsa==4.9.0 scandir==1.10.0 schema==0.7.5 -scikit-build==0.15.0 -scikit-learn==1.1.2 -scinum==1.4.3 -scipy==1.7.1 +scikit-build==0.16.7 +scikit-learn==1.2.2 +scinum==1.4.6 +scipy==1.10.1 secretstorage==3.3.3 semantic-version==2.10.0 threadpoolctl==3.1.0 -scons==4.4.0 -seaborn==0.12.0 +scons==4.5.2 +seaborn==0.12.2 Send2Trash==1.8.0 -setuptools-rust==1.5.1 -setuptools-scm==7.0.5 +setuptools-rust==1.5.2 +setuptools-scm==7.1.0 shellingham==1.5.0 simplegeneric==0.8.1 -singledispatch==3.7.0 +singledispatch==4.0.0 six==1.16.0 -skl2onnx==1.12 +skl2onnx==1.14.0 smmap==5.0.0 sniffio==1.3.0 -soupsieve==2.3.2.post1 -sqlalchemy==1.3.24 -stack-data==0.5.0 -stevedore==4.0.0 +soupsieve==2.4.0 +sqlalchemy==2.0.8 +stack-data==0.6.2 +stevedore==5.0.0 subprocess32==3.5.4 sympy==1.11.1 -tables==3.7.0 -tenacity==8.0.1 +tables==3.8.0 +tenacity==8.2.2 #NO_AUTO_UPDATE:1: Force to use tensorflow 2.6.4; this should match the version in tensorflow-sources.spec tensorflow==2.6.4 -tensorboard==2.10.0 -tensorflow-estimator==2.10.0 -tensorboard-data-server==0.6.1 +tensorboard==2.12.1 +tensorflow-estimator==2.12.0 +tensorboard-data-server==0.7.0 tensorboard-plugin-wit==1.8.1 -termcolor==1.1.0 -terminado==0.15.0 +termcolor==2.2.0 +terminado==0.17.1 testpath==0.6.0 #NO_AUTO_UPDATE: Below is a dummy test package to show how to use custom download command to download a package source. test-download==7.44.1 Theano==1.0.5 -tinycss2==1.1.1 +tinycss2==1.2.1 toml==0.10.2 tomli==2.0.1 tomli-w==1.0.0 -tomlkit==0.11.4 -tornado==6.2 -tqdm==4.64.1 -traitlets==5.3.0 +tomlkit==0.11.7 +tornado==6.2.0 +tqdm==4.65.0 +traitlets==5.9.0 typed-ast==1.5.4 -typing-extensions==4.3.0 -uhi==0.3.1 +typing-extensions==4.5.0 +uhi==0.3.3 uncertainties==3.1.7 -uproot==4.3.5 -urllib3==1.26.12 -vector==0.8.5 +uproot==5.0.5 +urllib3==1.26.15 +vector==1.0.0 virtualenv-clone==0.5.7 -virtualenv==20.16.4 +virtualenv==20.21.0 virtualenvwrapper==4.8.4 -wcwidth==0.2.5 +wcwidth==0.2.6 webencodings==0.5.1 -websocket-client==1.4.1 -Werkzeug==2.2.2 -wheel==0.37.1 -widgetsnbextension==4.0.3 -wrapt==1.14.1 -xgboost==1.6.2 -yarl==1.8.1 -zipp==3.8.1 +websocket-client==1.5.1 +Werkzeug==2.2.3 +wheel==0.40.0 +widgetsnbextension==4.0.7 +wrapt==1.15.0 +xgboost==1.7.5 +yarl==1.8.2 +zipp==3.15.0 From 23c0b5a7381100998de8d5f0b7e9ddb151d80b06 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Thu, 6 Apr 2023 11:54:03 +0200 Subject: [PATCH 2/4] Mass-update Python packages --- .../mxnet-predict.spec | 0 build-with-pip.file | 3 + clhep.spec | 4 +- cmssw-osenv.spec | 4 +- cmssw-tool-conf.spec | 1 - crab-dev.spec | 2 +- crab-prod.spec | 4 +- data/cmsswdata.txt | 8 +- frontier_client.spec | 4 +- geant4-G4EMLOW.spec | 2 +- geant4-G4PARTICLEXS.spec | 2 +- geant4.spec | 9 +- hwloc.spec | 2 +- llvm.spec | 10 +- ninja.spec | 4 +- onnxruntime.spec | 4 +- openloops.spec | 2 +- pgo/cmsdist_packages.py | 2 +- .../compilation_flags_pgo.file | 2 +- pip/async-lru.file | 1 + pip/autopep8.file | 2 +- pip/awkward-cpp.file | 3 + pip/awkward-pandas.file | 2 + pip/awkward.file | 3 +- pip/blosc2.file | 2 + pip/build.file | 2 + pip/cleo.file | 2 +- pip/colorama.file | 1 + pip/comm.file | 2 + pip/contourpy.file | 1 + pip/dask-awkward.file | 2 + pip/dask.file | 2 + pip/exceptiongroup.file | 1 + pip/filelock.file | 1 + pip/flit-core.file | 2 +- pip/flit-scm.file | 1 + pip/hatch-fancy-pypi-readme.file | 1 + pip/hatch-jupyter-builder.file | 1 + pip/hatch-nodejs-version.file | 1 + pip/hatch-vcs.file | 1 + pip/hatchling.file | 2 +- pip/hepdata-validator.file | 2 +- pip/hist.file | 1 + pip/idna.file | 2 + pip/iniconfig.file | 1 + pip/installer.file | 1 + pip/ipykernel.file | 2 +- pip/jsonschema.file | 4 +- pip/jupyter-client.file | 2 +- pip/jupyter-core.file | 2 +- pip/jupyter-events.file | 2 + pip/jupyter-server-terminals.file | 2 + pip/jupyter-server.file | 6 +- pip/llvmlite.file | 5 +- pip/markdown-it-py.file | 2 + pip/matplotlib.file | 3 +- pip/mdurl.file | 1 + pip/meson-python.file | 1 + pip/nbclassic.file | 1 + pip/nbformat.file | 1 + pip/ndindex.file | 1 + pip/notebook-shim.file | 2 + pip/notebook.file | 2 +- pip/onnxmltools.file | 2 +- pip/pandas.file | 2 +- pip/partd.file | 1 + pip/pathspec.file | 1 + pip/platformdirs.file | 1 + pip/poetry-cyclic-deps.patch | 15 +-- pip/poetry.file | 1 + pip/prettytable.file | 1 + pip/pybind11.file | 4 + pip/pyproject-hooks.file | 2 + pip/pyproject-metadata.file | 1 + pip/pytest.file | 1 + pip/pyup.file | 1 + pip/rapidfuzz.file | 1 + pip/requirements.txt | 117 +++++++++++++----- pip/rfc3339-validator.file | 1 + pip/rich.file | 2 +- pip/scikit-build-core.file | 2 + pip/scipy.file | 3 +- pip/skl2onnx.file | 2 +- pip/tables.file | 1 + pip/termcolor.file | 1 + pip/uhi.file | 2 +- pip/uproot.file | 3 +- pip/vector.file | 1 + pip/versioneer.file | 1 + pip/virtualenv.file | 1 + py3-dxr.spec | 2 +- py3-llvmlite-fpic-flag.patch | 13 -- py3-llvmlite-removeMethod.patch | 12 -- py3-llvmlite-version.patch | 13 -- py3-pip.spec | 2 +- py3-setuptools.spec | 5 +- python/setup.py | 2 - python_tools.spec | 4 +- re2c.spec | 4 +- root.spec | 4 +- rust.spec | 49 ++------ scram-project-build.file | 2 +- scram-tools.file/tool-env.file | 4 +- scram-tools.file/tools/geant4/geant4vis.xml | 1 - .../tools/llvm/llvm-ccompiler.xml | 1 + .../tools/llvm/llvm-cxxcompiler.xml | 2 + scram-tools.file/tools/vecgeom/vecgeom.xml | 2 +- sherpa.spec | 5 +- vecgeom.spec | 27 ++-- xgboost-arm-and-ppc.patch | 6 +- xgboost.spec | 2 +- 111 files changed, 263 insertions(+), 221 deletions(-) rename mxnet-predict.spec => archive/mxnet-predict.spec (100%) rename compilation_flags_pgo.file => pgo/compilation_flags_pgo.file (100%) create mode 100644 pip/async-lru.file create mode 100644 pip/awkward-cpp.file create mode 100644 pip/awkward-pandas.file create mode 100644 pip/blosc2.file create mode 100644 pip/build.file create mode 100644 pip/colorama.file create mode 100644 pip/comm.file create mode 100644 pip/contourpy.file create mode 100644 pip/dask-awkward.file create mode 100644 pip/dask.file create mode 100644 pip/exceptiongroup.file create mode 100644 pip/filelock.file create mode 100644 pip/flit-scm.file create mode 100644 pip/hatch-fancy-pypi-readme.file create mode 100644 pip/hatch-jupyter-builder.file create mode 100644 pip/hatch-nodejs-version.file create mode 100644 pip/hatch-vcs.file create mode 100644 pip/idna.file create mode 100644 pip/iniconfig.file create mode 100644 pip/installer.file create mode 100644 pip/jupyter-events.file create mode 100644 pip/jupyter-server-terminals.file create mode 100644 pip/markdown-it-py.file create mode 100644 pip/mdurl.file create mode 100644 pip/meson-python.file create mode 100644 pip/nbclassic.file create mode 100644 pip/ndindex.file create mode 100644 pip/notebook-shim.file create mode 100644 pip/partd.file create mode 100644 pip/pathspec.file create mode 100644 pip/platformdirs.file create mode 100644 pip/pybind11.file create mode 100644 pip/pyproject-hooks.file create mode 100644 pip/pyproject-metadata.file create mode 100644 pip/pyup.file create mode 100644 pip/rapidfuzz.file create mode 100644 pip/rfc3339-validator.file create mode 100644 pip/scikit-build-core.file create mode 100644 pip/termcolor.file create mode 100644 pip/versioneer.file delete mode 100644 py3-llvmlite-fpic-flag.patch delete mode 100644 py3-llvmlite-removeMethod.patch delete mode 100644 py3-llvmlite-version.patch diff --git a/mxnet-predict.spec b/archive/mxnet-predict.spec similarity index 100% rename from mxnet-predict.spec rename to archive/mxnet-predict.spec diff --git a/build-with-pip.file b/build-with-pip.file index 7d5567874eb..9a876a7a0f1 100644 --- a/build-with-pip.file +++ b/build-with-pip.file @@ -12,6 +12,7 @@ #PipDepsMatch Command to find out pypi package dependencies #PipDepsCommand to get package dependencies #PipInstallCommand Command to install the package +#PipNoWheelDep: If set then do not add py3-wheel deps ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} @@ -60,8 +61,10 @@ %define pip pip3&package_dependency=py3-pip Requires: python3 py3-pip py3-setuptools %if "%{n}" != "py3-wheel" +%if "%{?PipNoWheelDep:set}" != "set" BuildRequires: py3-wheel %endif +%endif %if "%{?source0:set}" != "set" %define source0 pip://%{pip_name}/%{realversion}?pip_options=%{PipDownloadOptions}&pip=%{pip}&output=/%{pkgsource} diff --git a/clhep.spec b/clhep.spec index 142a138ec84..b712467baa3 100644 --- a/clhep.spec +++ b/clhep.spec @@ -1,6 +1,6 @@ -### RPM external clhep 2.4.5.1 +### RPM external clhep 2.4.6.0 -%define tag f256fe37039681f7856f0e324ccf9337cdc35b51 +%define tag 06b39fc5f06924728af27f6b0df1ffdac174dff3 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz diff --git a/cmssw-osenv.spec b/cmssw-osenv.spec index 175592c134a..8ce9c213386 100644 --- a/cmssw-osenv.spec +++ b/cmssw-osenv.spec @@ -1,10 +1,10 @@ -### RPM cms cmssw-osenv 221027.0 +### RPM cms cmssw-osenv 230425.0 ## NOCOMPILER ## NO_VERSION_SUFFIX # ***Do not change minor number of the above version. *** -%define commit 85b709c25e613a732ccacc931f99bfe4659873d1 +%define commit 9730bb6cb21bbb6b8a004ba67a2c17963b658d8c %define branch master # We do not use a revision explicitly, because revisioned packages do not get # updated automatically when there are dependencies. diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index fcaf5f086c8..91e2ba1b9e5 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -137,7 +137,6 @@ Requires: gosam Requires: madgraph5amcatnlo Requires: python_tools Requires: dasgoclient -Requires: mxnet-predict Requires: dablooms # Only for Linux platform. diff --git a/crab-dev.spec b/crab-dev.spec index 19d46ca2821..52ba067e721 100644 --- a/crab-dev.spec +++ b/crab-dev.spec @@ -3,7 +3,7 @@ #For any other change, increment version_suffix ########################################## %define version_suffix 00 -%define crabclient_version v3.230404 +%define crabclient_version v3.230417 ### RPM cms crab-dev %{crabclient_version}.%{version_suffix} %define crabserver_version v3.230329 %define dbs_version 3.16.0 diff --git a/crab-prod.spec b/crab-prod.spec index 3a33a59d48f..6d8af2c1a13 100644 --- a/crab-prod.spec +++ b/crab-prod.spec @@ -3,9 +3,9 @@ #For any other change, increment version_suffix ########################################## %define version_suffix 00 -%define crabclient_version v3.230227 +%define crabclient_version v3.230417 ### RPM cms crab-prod %{crabclient_version}.%{version_suffix} -%define crabserver_version v3.230221 +%define crabserver_version v3.230329 %define dbs_version 3.16.0 ## IMPORT crab-build diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt index 9273bbbfebc..273e1ca3321 100644 --- a/data/cmsswdata.txt +++ b/data/cmsswdata.txt @@ -3,7 +3,10 @@ #Once a non-default section is empty then cleanup that section and remove its cmsdist/${PACKAGE_TYPE}.file #If there is no customization for the packae then remove its .spec and .file [default] -RecoBTag-Combined=V01-15-00 +DQM-EcalMonitorClient=V00-03-00 +Configuration-Generator=V01-05-00 +RecoMuon-TrackerSeedGenerator=V00-05-00 +RecoBTag-Combined=V01-16-00 CondTools-Hcal=V00-01-00 RecoEgamma-EgammaPhotonProducers=V00-03-00 Geometry-TestReference=V00-11-00 @@ -31,9 +34,7 @@ RecoMET-METPUSubtraction=V01-02-00 MagneticField-Interpolation=V01-02-00 L1Trigger-TrackTrigger=V00-02-00 L1TriggerConfig-L1TConfigProducers=V00-01-00 -RecoMuon-TrackerSeedGenerator=V00-04-00 RecoMuon-MuonIdentification=V01-14-00 -DQM-EcalMonitorClient=V00-02-00 CondTools-SiStrip=V00-02-00 L1Trigger-L1THGCal=V01-07-00 RecoParticleFlow-PFProducer=V16-02-00 @@ -59,7 +60,6 @@ L1Trigger-L1TCalorimeter=V01-01-00 SimTransport-PPSProtonTransport=V00-02-00 DQM-SiStripMonitorClient=V01-01-00 RecoMTD-TimingIDTools=V00-01-00 -Configuration-Generator=V01-02-00 MagneticField-Engine=V00-01-00 SimTracker-SiStripDigitizer=V01-01-00 SimPPS-PPSPixelDigiProducer=V00-00-02 diff --git a/frontier_client.spec b/frontier_client.spec index 568801b6c28..6abc1694fc5 100644 --- a/frontier_client.spec +++ b/frontier_client.spec @@ -1,7 +1,7 @@ -### RPM external frontier_client 2.9.1 +### RPM external frontier_client 2.10.1 ## INITENV +PATH PYTHON3PATH %{i}/python/lib -%define tag 9a63575736ae2da49b51e630796a3b3a65e9bd37 +%define tag a8ea14344c937daf926813cf32a689f545be4af0 %define branch cms/%{realversion} %define github_user cms-externals Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz diff --git a/geant4-G4EMLOW.spec b/geant4-G4EMLOW.spec index c77884a2fe5..cce98cd813e 100644 --- a/geant4-G4EMLOW.spec +++ b/geant4-G4EMLOW.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4EMLOW 7.13 +### RPM external geant4-G4EMLOW 8.2 %define G4RunTime G4LEDATA %define source0 https://geant4-data.web.cern.ch/datasets/G4EMLOW.%{realversion}.tar.gz diff --git a/geant4-G4PARTICLEXS.spec b/geant4-G4PARTICLEXS.spec index c7400273470..98a78194d98 100644 --- a/geant4-G4PARTICLEXS.spec +++ b/geant4-G4PARTICLEXS.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4PARTICLEXS 3.1.1 +### RPM external geant4-G4PARTICLEXS 4.0 %define G4RunTime G4PARTICLEXSDATA %define source0 https://geant4-data.web.cern.ch/datasets/G4PARTICLEXS.%{realversion}.tar.gz diff --git a/geant4.spec b/geant4.spec index 82111a4f692..6ff7039f254 100644 --- a/geant4.spec +++ b/geant4.spec @@ -1,11 +1,11 @@ -### RPM external geant4 10.7.2 +### RPM external geant4 11.1.1 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto %define use_vecgeom 1 -%define tag 0aeb9c66fceb9ae0f66b91721783fd35a8dffa52 +%define tag 35f304cde19a3e2dfe3bb941d4fc76c2fe45fa26 %define branch cms/v%{realversion} %define github_user cms-externals -Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz +Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz BuildRequires: cmake gmake @@ -45,12 +45,13 @@ cmake ../%{n}.%{realversion} \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_BUILD_TYPE=Release \ -DGEANT4_USE_GDML=ON \ - -DGEANT4_BUILD_CXXSTD:STRING="17" \ -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \ -DGEANT4_ENABLE_TESTING=OFF \ -DGEANT4_BUILD_VERBOSE_CODE=OFF \ + -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \ %if %{use_vecgeom} -DGEANT4_USE_USOLIDS="all" \ %endif diff --git a/hwloc.spec b/hwloc.spec index 633d34a7847..814428a6265 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,4 +1,4 @@ -### RPM external hwloc 2.9.0 +### RPM external hwloc 2.9.1 Source: https://download.open-mpi.org/release/%{n}/v2.9/%{n}-%{realversion}.tar.bz2 BuildRequires: autotools diff --git a/llvm.spec b/llvm.spec index 1769d0ad3de..7d89ae2fc97 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,4 @@ -### RPM external llvm 12.0.1 +### RPM external llvm 14.0.6 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python%{cms_python3_major_minor_version}/site-packages @@ -7,10 +7,10 @@ Requires: gcc zlib python3 Requires: cuda AutoReq: no -%define llvmCommit 9f4ab770e61b68d2037cc7cda1f868a8ba52da85 -%define llvmBranch cms/release/12.x/fed4134 -%define iwyuCommit 5db414ac448004fe019871c977905cb7c2cff23f -%define iwyuBranch clang_11 +%define llvmCommit d88fe2a1cafb6621210a7a0ae968c1e8e797d2bb +%define llvmBranch cms/release/14.x/f28c006 +%define iwyuCommit d888efc52646dcf3e4e3a56af13aa23dd26abde0 +%define iwyuBranch master Source0: git+https://github.com/cms-externals/llvm-project.git?obj=%{llvmBranch}/%{llvmCommit}&export=llvm-%{realversion}-%{llvmCommit}&module=llvm-%{realversion}-%{llvmCommit}&output=/llvm-%{realversion}-%{llvmCommit}.tgz Source1: git+https://github.com/include-what-you-use/include-what-you-use.git?obj=%{iwyuBranch}/%{iwyuCommit}&export=iwyu-%{realversion}-%{iwyuCommit}&module=iwyu-%{realversion}-%{iwyuCommit}&output=/iwyu-%{realversion}-%{iwyuCommit}.tgz diff --git a/ninja.spec b/ninja.spec index 7aa8cb43f1a..105d20d299a 100644 --- a/ninja.spec +++ b/ninja.spec @@ -1,4 +1,4 @@ -### RPM external ninja 1.10.0 +### RPM external ninja 1.11.1 Source0: git://github.com/ninja-build/ninja.git?obj=release/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: python3 re2c @@ -7,7 +7,7 @@ BuildRequires: python3 re2c %setup -T -b 0 -n %{n}-%{realversion} %build -python3 ./bootstrap.py +python3 ./configure.py --bootstrap %install mkdir -p %{i}/bin diff --git a/onnxruntime.spec b/onnxruntime.spec index 03d5a72d706..79f4cb6cba3 100644 --- a/onnxruntime.spec +++ b/onnxruntime.spec @@ -1,9 +1,9 @@ -### RPM external onnxruntime 1.10.0 +### RPM external onnxruntime 1.14.1 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} ## INCLUDE cuda-flags %define github_user cms-externals %define branch cms/v%{realversion} -%define tag 7a6355a2780cd18ed0cb3f4a1ceb664391a0bf0c +%define tag e4c6aa2984c7c71409f4c6d0db865117afa66932 Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz BuildRequires: cmake ninja diff --git a/openloops.spec b/openloops.spec index 643004b9e4e..378adcdb67c 100644 --- a/openloops.spec +++ b/openloops.spec @@ -1,7 +1,7 @@ ## INCLUDE openloops-common ### RPM external openloops %{openloop_version} -BuildRequires: py3-scons openloops-process +BuildRequires: openloops-process %define keep_archives true %define runpath_opts -m proclib diff --git a/pgo/cmsdist_packages.py b/pgo/cmsdist_packages.py index 2e29c220833..81f03e0ccab 100644 --- a/pgo/cmsdist_packages.py +++ b/pgo/cmsdist_packages.py @@ -11,7 +11,7 @@ def packages(virtual_packages, *args): spec = " echo '%%define pgo_path_prefix %s'" % ('@LOCALTOP@' if pkg in ["cmssw-tool-conf"] else '%{_builddir}') spec += "; echo '%%define pgo_package_name %s'" % ('cmssw' if pkg in ["cmssw-tool-conf"] else pkg) spec += "; echo '%%define %s 1'" % ('pgo_generate' if opts.PGOGenerate else 'pgo_use') - spec += "; echo '## INCLUDE compilation_flags_pgo'" + spec += "; echo '## INCLUDE pgo/compilation_flags_pgo'" spec += "; cat %s/%s.spec" % (opts.cmsdist, pkg) virtual_packages[pkg] = spec return diff --git a/compilation_flags_pgo.file b/pgo/compilation_flags_pgo.file similarity index 100% rename from compilation_flags_pgo.file rename to pgo/compilation_flags_pgo.file index 05a26c5a52f..3c9fcc45a7a 100644 --- a/compilation_flags_pgo.file +++ b/pgo/compilation_flags_pgo.file @@ -10,9 +10,9 @@ # pgo_generate: Set if package is build in pgo generate mode # pgo_use: Set if package is build in pgo use mode -%define cmsdist_package_initenv export CMSSW_PGO_DIRECTORY=%{cmsroot}/%{tempprefix} %define pgo_common -fprofile-prefix-path=%{pgo_path_prefix} -fprofile-update=prefer-atomic -fprofile-correction %if "%{?pgo_generate:set}" == "set" +%define cmsdist_package_initenv export CMSSW_PGO_DIRECTORY=%{cmsroot}/%{tempprefix} %define pgo_build_flags %{pgo_common} -fprofile-generate -fprofile-dir=%%q{CMSSW_PGO_DIRECTORY}/pgo/%%p/%{pgo_package_name} %endif %if "%{?pgo_use:set}" == "set" diff --git a/pip/async-lru.file b/pip/async-lru.file new file mode 100644 index 00000000000..005b7c73656 --- /dev/null +++ b/pip/async-lru.file @@ -0,0 +1 @@ +Requires: py3-typing-extensions diff --git a/pip/autopep8.file b/pip/autopep8.file index 9c8c78fd0e2..edac2bac9f8 100644 --- a/pip/autopep8.file +++ b/pip/autopep8.file @@ -1 +1 @@ -Requires: py3-pycodestyle py3-toml +Requires: py3-pycodestyle py3-tomli diff --git a/pip/awkward-cpp.file b/pip/awkward-cpp.file new file mode 100644 index 00000000000..db971368f82 --- /dev/null +++ b/pip/awkward-cpp.file @@ -0,0 +1,3 @@ +BuildRequires: py3-hatchling py3-hatch-fancy-pypi-readme py3-scikit-build-core py3-pyproject-metadata cmake +Requires: py3-pybind11 py3-numpy +%define PipPreBuild export CMAKE_PREFIX_PATH=%{cmake_prefix_path} diff --git a/pip/awkward-pandas.file b/pip/awkward-pandas.file new file mode 100644 index 00000000000..5694f2bb160 --- /dev/null +++ b/pip/awkward-pandas.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling py3-hatch-vcs +Requires: py3-awkward py3-pandas diff --git a/pip/awkward.file b/pip/awkward.file index 3949a52d0ae..d561e197173 100644 --- a/pip/awkward.file +++ b/pip/awkward.file @@ -1,2 +1,3 @@ -Requires: py3-numpy py3-pytest-runner py3-pybind11 py3-PyYAML cmake +Requires: py3-numpy py3-pytest-runner py3-pybind11 py3-PyYAML cmake py3-awkward-cpp +BuildRequires: py3-hatchling py3-hatch-fancy-pypi-readme %define source0 git+https://github.com/scikit-hep/awkward?obj=main/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/source.tar.gz diff --git a/pip/blosc2.file b/pip/blosc2.file new file mode 100644 index 00000000000..9ba16ea095a --- /dev/null +++ b/pip/blosc2.file @@ -0,0 +1,2 @@ +Requires: py3-scikit-build py3-cython py3-numpy py3-msgpack py3-ndindex py3-py-cpuinfo py3-rich +BuildRequires: cmake ninja diff --git a/pip/build.file b/pip/build.file new file mode 100644 index 00000000000..8bcd213f8b3 --- /dev/null +++ b/pip/build.file @@ -0,0 +1,2 @@ +BuildRequires: py3-flit-core py3-pyproject-hooks +Requires: py3-packaging py3-tomli diff --git a/pip/cleo.file b/pip/cleo.file index b736f919fcc..55672a80f82 100644 --- a/pip/cleo.file +++ b/pip/cleo.file @@ -1 +1 @@ -Requires: py3-poetry-core py3-clikit +Requires: py3-poetry-core py3-clikit py3-rapidfuzz diff --git a/pip/colorama.file b/pip/colorama.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/colorama.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/comm.file b/pip/comm.file new file mode 100644 index 00000000000..c6d3c58ba0d --- /dev/null +++ b/pip/comm.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling +Requires: py3-traitlets diff --git a/pip/contourpy.file b/pip/contourpy.file new file mode 100644 index 00000000000..fd1acbb5e66 --- /dev/null +++ b/pip/contourpy.file @@ -0,0 +1 @@ +Requires: py3-pybind11 py3-numpy diff --git a/pip/dask-awkward.file b/pip/dask-awkward.file new file mode 100644 index 00000000000..29eca091fca --- /dev/null +++ b/pip/dask-awkward.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling py3-hatch-vcs +Requires: py3-dask py3-awkward diff --git a/pip/dask.file b/pip/dask.file new file mode 100644 index 00000000000..5b7a5445ff2 --- /dev/null +++ b/pip/dask.file @@ -0,0 +1,2 @@ +BuildRequires: py3-versioneer +Requires: py3-click py3-cloudpickle py3-fsspec py3-packaging py3-partd py3-PyYAML py3-toolz py3-importlib-metadata py3-numpy diff --git a/pip/exceptiongroup.file b/pip/exceptiongroup.file new file mode 100644 index 00000000000..9027b987176 --- /dev/null +++ b/pip/exceptiongroup.file @@ -0,0 +1 @@ +BuildRequires: py3-flit-scm diff --git a/pip/filelock.file b/pip/filelock.file new file mode 100644 index 00000000000..ec0e0493a68 --- /dev/null +++ b/pip/filelock.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/flit-core.file b/pip/flit-core.file index 40b63929177..5f510f621ea 100644 --- a/pip/flit-core.file +++ b/pip/flit-core.file @@ -1 +1 @@ -Requires: py3-pytoml py3-toml +%define PipNoWheelDep 1 diff --git a/pip/flit-scm.file b/pip/flit-scm.file new file mode 100644 index 00000000000..2f0a6d5f5ad --- /dev/null +++ b/pip/flit-scm.file @@ -0,0 +1 @@ +Requires: py3-flit-core py3-setuptools-scm py3-tomli diff --git a/pip/hatch-fancy-pypi-readme.file b/pip/hatch-fancy-pypi-readme.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/hatch-fancy-pypi-readme.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/hatch-jupyter-builder.file b/pip/hatch-jupyter-builder.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/hatch-jupyter-builder.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/hatch-nodejs-version.file b/pip/hatch-nodejs-version.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/hatch-nodejs-version.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/hatch-vcs.file b/pip/hatch-vcs.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/hatch-vcs.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/hatchling.file b/pip/hatchling.file index fbf77b242a7..6456eb83191 100644 --- a/pip/hatchling.file +++ b/pip/hatchling.file @@ -1 +1 @@ -Requires: py3-pathspec py3-tomli py3-pluggy py3-editables +Requires: py3-pathspec py3-tomli py3-pluggy py3-editables py3-trove-classifiers py3-calver diff --git a/pip/hepdata-validator.file b/pip/hepdata-validator.file index ded841ff22a..e6ba272faab 100644 --- a/pip/hepdata-validator.file +++ b/pip/hepdata-validator.file @@ -1 +1 @@ -Requires: py3-jsonschema py3-PyYAML py3-Click py3-requests +Requires: py3-jsonschema py3-PyYAML py3-Click py3-requests py3-packaging diff --git a/pip/hist.file b/pip/hist.file index add69683a38..ae59bcca719 100644 --- a/pip/hist.file +++ b/pip/hist.file @@ -1 +1,2 @@ Requires: py3-numpy py3-boost-histogram py3-histoprint +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/idna.file b/pip/idna.file new file mode 100644 index 00000000000..71bf393efe8 --- /dev/null +++ b/pip/idna.file @@ -0,0 +1,2 @@ +BuildRequires: py3-flit-core + diff --git a/pip/iniconfig.file b/pip/iniconfig.file new file mode 100644 index 00000000000..ec0e0493a68 --- /dev/null +++ b/pip/iniconfig.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/installer.file b/pip/installer.file new file mode 100644 index 00000000000..ab14bb3db25 --- /dev/null +++ b/pip/installer.file @@ -0,0 +1 @@ +BuildRequires: py3-flit-core diff --git a/pip/ipykernel.file b/pip/ipykernel.file index dbba94a9901..18a7647b038 100644 --- a/pip/ipykernel.file +++ b/pip/ipykernel.file @@ -1,2 +1,2 @@ Requires: py3-ipython py3-jupyter-client py3-debugpy py3-psutil -Requires: py3-ipython py3-jupyter-client py3-jedi py3-backcall +Requires: py3-jedi py3-backcall py3-comm py3-nest-asyncio diff --git a/pip/jsonschema.file b/pip/jsonschema.file index 14cd3949f93..296a3741801 100644 --- a/pip/jsonschema.file +++ b/pip/jsonschema.file @@ -1,2 +1,2 @@ -Requires: py3-repoze-lru py3-argparse py3-pyrsistent -Requires: py3-attrs py3-six py3-importlib-metadata +Requires: py3-attrs py3-pyrsistent py3-rfc3339-validator py3-rfc3986-validator +BuildRequires: py3-hatchling py3-hatch-fancy-pypi-readme py3-hatch-vcs diff --git a/pip/jupyter-client.file b/pip/jupyter-client.file index 6e886ed7552..ea35e676f50 100644 --- a/pip/jupyter-client.file +++ b/pip/jupyter-client.file @@ -1,2 +1,2 @@ Requires: py3-jupyter-core py3-python-dateutil py3-pyzmq -Requires: py3-tornado py3-entrypoints py3-nest-asyncio +Requires: py3-tornado py3-traitlets diff --git a/pip/jupyter-core.file b/pip/jupyter-core.file index 7e43474d371..fc586e04a72 100644 --- a/pip/jupyter-core.file +++ b/pip/jupyter-core.file @@ -1,2 +1,2 @@ -Requires: py3-traitlets +Requires: py3-traitlets py3-platformdirs %define PipPostBuild rm %{i}/lib/*/site-packages/jupyter.py* diff --git a/pip/jupyter-events.file b/pip/jupyter-events.file new file mode 100644 index 00000000000..718ab1072b1 --- /dev/null +++ b/pip/jupyter-events.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling +Requires: py3-jsonschema py3-python-json-logger py3-PyYAML py3-traitlets diff --git a/pip/jupyter-server-terminals.file b/pip/jupyter-server-terminals.file new file mode 100644 index 00000000000..f502ef86dab --- /dev/null +++ b/pip/jupyter-server-terminals.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling +Requires: py3-terminado diff --git a/pip/jupyter-server.file b/pip/jupyter-server.file index 03b8adfbe9d..c5ff4069983 100644 --- a/pip/jupyter-server.file +++ b/pip/jupyter-server.file @@ -1,2 +1,4 @@ -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 +Requires: py3-anyio py3-argon2-cffi py3-Jinja2 py3-jupyter-client py3-jupyter-core py3-jupyter-server-terminals py3-nbconvert py3-nbformat +Requires: py3-packaging py3-prometheus-client py3-pyzmq py3-Send2Trash py3-terminado py3-tornado py3-traitlets py3-websocket-client +Requires: py3-jupyter-events +BuildRequires: py3-hatch-jupyter-builder py3-jupyter-packaging diff --git a/pip/llvmlite.file b/pip/llvmlite.file index 4491e0ac3b2..329a9d73e75 100644 --- a/pip/llvmlite.file +++ b/pip/llvmlite.file @@ -1,7 +1,4 @@ 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 source0 git+https://github.com/numba/llvmlite?obj=main/%{realversion}&export=llvmlite-%{realversion}&output=/source.tar.gz %define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config diff --git a/pip/markdown-it-py.file b/pip/markdown-it-py.file new file mode 100644 index 00000000000..940e56eb06c --- /dev/null +++ b/pip/markdown-it-py.file @@ -0,0 +1,2 @@ +BuildRequires: py3-flit-core +Requires: py3-mdurl diff --git a/pip/matplotlib.file b/pip/matplotlib.file index 7db2018e683..853ac2e537a 100644 --- a/pip/matplotlib.file +++ b/pip/matplotlib.file @@ -1,8 +1,9 @@ -Requires: py3-numpy py3-pillow +Requires: py3-numpy py3-pillow py3-pybind11 %define PipPreBuild \ export CFLAGS="-I${FREETYPE_ROOT}/include/freetype2 -I${LIBPNG_ROOT}/include/libpng16" \ 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: py3-contourpy py3-importlib-resources Requires: zlib libpng freetype diff --git a/pip/mdurl.file b/pip/mdurl.file new file mode 100644 index 00000000000..ab14bb3db25 --- /dev/null +++ b/pip/mdurl.file @@ -0,0 +1 @@ +BuildRequires: py3-flit-core diff --git a/pip/meson-python.file b/pip/meson-python.file new file mode 100644 index 00000000000..b31161f7727 --- /dev/null +++ b/pip/meson-python.file @@ -0,0 +1 @@ +Requires: py3-meson py3-pyproject-metadata py3-tomli py3-typing-extensions ninja diff --git a/pip/nbclassic.file b/pip/nbclassic.file new file mode 100644 index 00000000000..ee3fb5b1a7e --- /dev/null +++ b/pip/nbclassic.file @@ -0,0 +1 @@ +Requires: py3-ipykernel py3-notebook-shim py3-jupyter-packaging py3-jupyter-server py3-babel diff --git a/pip/nbformat.file b/pip/nbformat.file index 12f10a8100c..f2185b47a1f 100644 --- a/pip/nbformat.file +++ b/pip/nbformat.file @@ -1 +1,2 @@ Requires: py3-traitlets py3-jsonschema py3-jupyter-core py3-fastjsonschema +BuildRequires: py3-hatchling py3-hatch-nodejs-version diff --git a/pip/ndindex.file b/pip/ndindex.file new file mode 100644 index 00000000000..c1e143964e4 --- /dev/null +++ b/pip/ndindex.file @@ -0,0 +1 @@ +Requires: py3-cython py3-numpy diff --git a/pip/notebook-shim.file b/pip/notebook-shim.file new file mode 100644 index 00000000000..eed47263f8d --- /dev/null +++ b/pip/notebook-shim.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling +Requires: py3-jupyter-server diff --git a/pip/notebook.file b/pip/notebook.file index a37f4e339de..10d5c5e566f 100644 --- a/pip/notebook.file +++ b/pip/notebook.file @@ -1,3 +1,3 @@ -Requires: py3-ipykernel +Requires: py3-ipykernel py3-nbclassic Requires: py3-terminado py3-nbconvert py3-ipykernel py3-Send2Trash py3-ipaddress py3-prometheus-client py3-argon2-cffi diff --git a/pip/onnxmltools.file b/pip/onnxmltools.file index 509ad0d2ff8..3aff9fa468c 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/%{realversion}.tar.gz +%define source0 https://github.com/onnx/onnxmltools/archive/refs/tags/v%{realversion}.tar.gz diff --git a/pip/pandas.file b/pip/pandas.file index ad82c2350fc..bdd8946be6c 100644 --- a/pip/pandas.file +++ b/pip/pandas.file @@ -1 +1 @@ -Requires: py3-six py3-python-dateutil py3-pytz py3-numpy py3-cython +Requires: py3-six py3-python-dateutil py3-pytz py3-numpy py3-cython py3-versioneer py3-tzdata diff --git a/pip/partd.file b/pip/partd.file new file mode 100644 index 00000000000..9284dc8a702 --- /dev/null +++ b/pip/partd.file @@ -0,0 +1 @@ +Requires: py3-locket py3-toolz diff --git a/pip/pathspec.file b/pip/pathspec.file new file mode 100644 index 00000000000..ab14bb3db25 --- /dev/null +++ b/pip/pathspec.file @@ -0,0 +1 @@ +BuildRequires: py3-flit-core diff --git a/pip/platformdirs.file b/pip/platformdirs.file new file mode 100644 index 00000000000..ec0e0493a68 --- /dev/null +++ b/pip/platformdirs.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/poetry-cyclic-deps.patch b/pip/poetry-cyclic-deps.patch index d8e4ec13265..83a24f208a0 100644 --- a/pip/poetry-cyclic-deps.patch +++ b/pip/poetry-cyclic-deps.patch @@ -4,18 +4,7 @@ [tool.poetry.dependencies] python = "^3.7" --poetry = "^1.2.0" - poetry-core = "^1.1.0" +-poetry = "^1.3.0" + poetry-core = "^1.3.0" [tool.poetry.dev-dependencies] ---- poetry-plugin-export-1.0.7/setup.py.orig 2022-10-10 17:50:42.686063618 +0200 -+++ poetry-plugin-export-1.0.7/setup.py 2022-10-10 17:50:52.395982438 +0200 -@@ -11,7 +11,7 @@ - {'': ['*']} - - install_requires = \ --['poetry-core>=1.1.0,<2.0.0', 'poetry>=1.2.0,<2.0.0'] -+['poetry-core>=1.1.0,<2.0.0'] - - entry_points = \ - {'poetry.application.plugin': ['export = ' diff --git a/pip/poetry.file b/pip/poetry.file index 1e5edd277b8..393f8408737 100644 --- a/pip/poetry.file +++ b/pip/poetry.file @@ -1,3 +1,4 @@ Requires: py3-cachecontrol py3-cachy py3-cleo py3-html5lib py3-keyring py3-pexpect py3-pkginfo py3-virtualenv Requires: py3-requests-toolbelt py3-shellingham py3-tomlkit Requires: py3-dulwich py3-jsonschema py3-poetry-plugin-export +BuildRequires: py3-build py3-installer py3-lockfile py3-pyproject-hooks py3-trove-classifiers diff --git a/pip/prettytable.file b/pip/prettytable.file index a9a7eba33ae..cacf1d29b4c 100644 --- a/pip/prettytable.file +++ b/pip/prettytable.file @@ -1 +1,2 @@ Requires: py3-wcwidth +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/pybind11.file b/pip/pybind11.file new file mode 100644 index 00000000000..3ac4da3912c --- /dev/null +++ b/pip/pybind11.file @@ -0,0 +1,4 @@ +%define PipPostInstall \ + ln -s ${PYTHON3_LIB_SITE_PACKAGES}/pybind11/share %{i}/share; \ + ln -s ${PYTHON3_LIB_SITE_PACKAGES}/pybind11/include %{i}/include +%define PipPostPost %{relocateConfig}/share/cmake/pybind11/*.cmake diff --git a/pip/pyproject-hooks.file b/pip/pyproject-hooks.file new file mode 100644 index 00000000000..71bf393efe8 --- /dev/null +++ b/pip/pyproject-hooks.file @@ -0,0 +1,2 @@ +BuildRequires: py3-flit-core + diff --git a/pip/pyproject-metadata.file b/pip/pyproject-metadata.file new file mode 100644 index 00000000000..574d9bf2749 --- /dev/null +++ b/pip/pyproject-metadata.file @@ -0,0 +1 @@ +Requires: py3-flit-core py3-packaging diff --git a/pip/pytest.file b/pip/pytest.file index 01033587c63..fdd9a45d249 100644 --- a/pip/pytest.file +++ b/pip/pytest.file @@ -1,3 +1,4 @@ Requires: py3-more-itertools py3-atomicwrites py3-attrs py3-funcsigs py3-pathlib2 py3-pluggy py3-py py3-scandir Requires: py3-packaging py3-wcwidth Requires: py3-iniconfig py3-toml +Requires: py3-exceptiongroup diff --git a/pip/pyup.file b/pip/pyup.file new file mode 100644 index 00000000000..9d36659d859 --- /dev/null +++ b/pip/pyup.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling diff --git a/pip/rapidfuzz.file b/pip/rapidfuzz.file new file mode 100644 index 00000000000..16744280f4a --- /dev/null +++ b/pip/rapidfuzz.file @@ -0,0 +1 @@ +Requires: py3-numpy py3-packaging py3-scikit-build diff --git a/pip/requirements.txt b/pip/requirements.txt index d035e8087d9..039cb535ec0 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -33,22 +33,31 @@ attrs==22.2.0 autopep8==2.0.2 avro==1.11.1 awkward==2.1.1 +awkward-cpp==13 +# No 'release' versions exist +awkward-pandas==2022.12a1 +babel==2.12.1 backcall==0.2.0 backports-entry-points-selectable==1.2.0 -beautifulsoup4==4.12.0 +beautifulsoup4==4.12.1 beniget==0.4.1 bleach==6.0.0 +blosc2==2.2.0 bokeh==3.1.0 boost-histogram==1.3.2 bottle==0.12.25 Bottleneck==1.3.7 +build==0.10.0 cachecontrol==0.12.11 cachetools==5.3.0 cachy==0.3.0 +calver==2022.6.26 charset-normalizer==3.1.0 cleo==2.0.1 +click==8.1.3 clikit==0.6.2 cmsml==0.1.2 +contourpy==1.0.7 correctionlib==2.2.2 crashtest==0.4.1 certifi==2022.12.7 @@ -57,20 +66,23 @@ chardet==5.1.0 Click==8.1.3 cloudpickle==2.2.1 colorama==0.4.6 +comm==0.1.3 commonmark==0.9.1 conan==2.0.3 contextlib2==21.6.0 -contextvars==2.4.0 +contextvars==2.4 coverage==7.2.2 cppy==1.2.1 # Newer versions of py3-cryptography require OpenSSL 1.1.0+, see https://github.com/pyca/cryptography/issues/5906 -cryptography==40.0.1 +cryptography==40.0.2 cryptography==3.2.1 ; cmsos_name=='slc7' cx-Oracle==8.3.0 cycler==0.11.0 cython==0.29.34 +dask==2023.4.0 +dask-awkward==2023.4.1 decorator==5.1.1 -debugpy==1.6.6 +debugpy==1.6.7 defusedxml==0.7.1 deprecation==2.1.0 deprecated==1.2.13 @@ -78,33 +90,40 @@ dill==0.3.6 distlib==0.3.6 distro==1.8.0 docopt==0.6.2 -docutils==0.19.0 +docutils==0.19 downhill==0.4.0 dulwich==0.21.3 -editables==0.3.0 -entrypoints==0.4.0 +editables==0.3 +entrypoints==0.4 executing==1.2.0 -fasteners==0.18.0 +exceptiongroup==1.1.1 +fasteners==0.18 fastjsonschema==2.16.3 filelock==3.10.7 fire==0.5.0 flit==3.8.0 flit-core==3.8.0 +flit-scm==1.7.0 flake8==6.0.0 flatbuffers==23.3.3 flawfinder==2.0.19 fonttools==4.39.3 frozenlist==1.3.3 +fsspec==2023.4.0 funcsigs==1.0.2 future==0.18.3 gast==0.5.3 gitdb==4.0.10 GitPython==3.1.31 -google-auth==2.17.1 +google-auth==2.17.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 grpcio==1.53.0 grpcio-tools==1.53.0 +hatch-fancy-pypi-readme==22.8.0 +hatch-jupyter-builder==0.8.2 +hatch-nodejs-version==0.3.1 +hatch-vcs==0.3.0 hatchling==1.14.0 h5py==3.8.0 hepdata-lib==0.12.0 @@ -114,12 +133,13 @@ hist==2.6.3 histbook==1.2.5 histoprint==2.4.0 histogrammar==1.0.33 -html5lib==1.1.0 -idna==3.4.0 -immutables==0.19.0 +html5lib==1.1 +idna==3.4 +immutables==0.19 importlib-metadata==6.1.0 importlib-resources==5.12.0 iniconfig==2.0.0 +installer==0.7.0 ipaddress==1.0.23 ipykernel==6.22.0 ipython_genutils==0.2.0 @@ -137,12 +157,15 @@ jsonschema==4.17.3 jupyter-client==8.1.0 jupyter-console==6.6.3 jupyter-core==5.3.0 +jupyter-events==0.6.3 jupyter-packaging==0.12.3 jupyterlab-pygments==0.2.2 jupyter-server==2.5.0 jupyter-server-mathjax==0.2.6 +jupyter-server-terminals==0.4.4 jupyterlab-widgets==3.0.7 -keras==2.12.0 +#NO_AUTO_UPDATE: needs newer TF +keras==2.6.0 keras-applications==1.0.8 keras-preprocessing==1.1.2 keras2onnx==1.7.0 @@ -151,18 +174,23 @@ kiwisolver==1.4.4 law==0.1.12 lazy-object-proxy==1.9.0 lizard==1.17.10 -llvmlite==0.39.1 +#llvmlite==v0.41.0dev0 +locket==1.0.0 lockfile==0.12.2 luigi==3.2.1 lxml==4.9.2 lz4==4.3.2 -make==0.1.6 +make==0.1.6.post2 Mako==1.2.4 Markdown==3.4.3 +markdown-it-py==2.2.0 MarkupSafe==2.1.2 matplotlib==3.7.1 matplotlib-inline==0.1.6 mccabe==0.7.0 +mdurl==0.1.2 +meson==1.1.0 +meson-python==0.12.1 mistune==2.0.5 mock==5.0.1 more-itertools==9.1.0 @@ -172,29 +200,36 @@ mplhep-data==0.0.3 mpmath==1.3.0 msgpack==1.0.5 multidict==6.0.4 +nbclassic==0.5.5 nbclient==0.7.3 nbconvert==7.3.0 #nbdime==3.1.0 ; disabled not used by cmssw nbformat==5.8.0 +ndindex==1.6 nest-asyncio==1.5.6 -networkx==3.1.0 +networkx==3.1 neurolab==0.3.5 node-semver==0.9.0 notebook==6.5.3 -numba==0.56.4 +notebook-shim==0.2.2 +# numba==0.56.4 numexpr==2.8.4 -numpy==1.24.2 -onnx==1.13.1 +# setuptools version <64 is needed by numpy: https://github.com/pypa/setuptools/issues/3549 +# NO_AUTO_UPDATE: update together with tensorflow +numpy==1.23.5 +# NO_AUTO_UPDATE:1 +onnx==1.12.0 onnxmltools==1.11.2 onnxconverter-common==1.13.0 oauthlib==3.2.2 opt-einsum==3.3.0 pkginfo==1.9.6 -packaging==23.0.0 +packaging==23.0 pandas==2.0.0 pandocfilters==1.5.0 parsimonious==0.10.0 parso==0.8.3 +partd==1.4.0 pastel==0.2.1 patch-ng==1.17.4 pathlib2==2.3.7.post1 @@ -208,24 +243,26 @@ plac==1.3.5 platformdirs==3.2.0 pluginbase==1.0.1 pluggy==1.0.0 -ply==3.11.0 +ply==3.11 poetry==1.4.2 poetry-core==1.5.2 poetry-plugin-export==1.3.0 prettytable==3.6.0 prometheus-client==0.16.0 prompt_toolkit==3.0.38 -protobuf==4.22.1 +#NO_AUTO_UPDATE:1: Update together with Tensorflow +protobuf==4.21.7 prwlock==0.4.1 psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 +py-cpuinfo==9.0.0 pyasn1-modules==0.2.8 pyasn1==0.4.8 pybind11==2.10.4 pybrain==0.3.3 pycodestyle==2.10.0 -pycparser==2.21.0 +pycparser==2.21 pycuda==2022.2.2 pycurl==7.45.2 pydot==1.4.2 @@ -235,6 +272,8 @@ PyJWT==2.6.0 pylint==2.17.2 pymongo==4.3.3 pyparsing==3.0.9 +pyproject-hooks==1.0.0 +pyproject-metadata==0.7.1 pyrsistent==0.19.3 py==1.11.0 pydantic==1.10.7 @@ -248,34 +287,38 @@ pytest-cov==4.0.0 pytest-runner==6.0.0 python-daemon==3.0.1 python-dateutil==2.8.2 +python-json-logger==2.0.7 python-ldap==3.4.3 -python-rapidjson==1.10.0 +python-rapidjson==1.10 pythran==0.12.1 pytoml==0.1.21 pytools==2022.1.14 -pytz==2023.3.0 -PyYAML==6.0.0 +pytz==2023.3 +PyYAML==6.0 pyzmq==25.0.2 +rapidfuzz==2.15.1 regex==2023.3.23 -repoze-lru==0.7.0 +repoze-lru==0.7 rep==0.6.6 requests==2.28.2 requests-toolbelt==0.10.1 requests-oauthlib==1.3.1 requests-unixsocket==0.3.0 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rich==13.3.3 rootpy==1.0.1 -rsa==4.9.0 +rsa==4.9 scandir==1.10.0 schema==0.7.5 scikit-build==0.16.7 +scikit-build-core==0.3.0 scikit-learn==1.2.2 scinum==1.4.6 scipy==1.10.1 secretstorage==3.3.3 semantic-version==2.10.0 threadpoolctl==3.1.0 -scons==4.5.2 seaborn==0.12.2 Send2Trash==1.8.0 setuptools-rust==1.5.2 @@ -284,11 +327,12 @@ shellingham==1.5.0 simplegeneric==0.8.1 singledispatch==4.0.0 six==1.16.0 -skl2onnx==1.14.0 +skl2onnx==1.14 smmap==5.0.0 sniffio==1.3.0 -soupsieve==2.4.0 -sqlalchemy==2.0.8 +soupsieve==2.4 +#NO_AUTO_UPDATE:1: Need to update our patches, hold for now +sqlalchemy==1.3.24 stack-data==0.6.2 stevedore==5.0.0 subprocess32==3.5.4 @@ -312,16 +356,20 @@ toml==0.10.2 tomli==2.0.1 tomli-w==1.0.0 tomlkit==0.11.7 -tornado==6.2.0 +toolz==0.7.1 +tornado==6.2 tqdm==4.65.0 traitlets==5.9.0 +trove-classifiers==2023.3.9 typed-ast==1.5.4 typing-extensions==4.5.0 +tzdata==2023.3 uhi==0.3.3 uncertainties==3.1.7 -uproot==5.0.5 +uproot==5.0.7 urllib3==1.26.15 vector==1.0.0 +versioneer==0.28 virtualenv-clone==0.5.7 virtualenv==20.21.0 virtualenvwrapper==4.8.4 @@ -329,6 +377,7 @@ wcwidth==0.2.6 webencodings==0.5.1 websocket-client==1.5.1 Werkzeug==2.2.3 +#NO_AUTO_UPDATE:1: you need wheel to build wheel wheel==0.40.0 widgetsnbextension==4.0.7 wrapt==1.15.0 diff --git a/pip/rfc3339-validator.file b/pip/rfc3339-validator.file new file mode 100644 index 00000000000..7c962a18c6b --- /dev/null +++ b/pip/rfc3339-validator.file @@ -0,0 +1 @@ +Requires: py3-six diff --git a/pip/rich.file b/pip/rich.file index 553f5ace38a..40e1d569857 100644 --- a/pip/rich.file +++ b/pip/rich.file @@ -1,2 +1,2 @@ BuildRequires: py3-poetry -Requires: py3-colorama py3-commonmark py3-Pygments +Requires: py3-colorama py3-commonmark py3-Pygments py3-markdown-it-py diff --git a/pip/scikit-build-core.file b/pip/scikit-build-core.file new file mode 100644 index 00000000000..61b13f32f28 --- /dev/null +++ b/pip/scikit-build-core.file @@ -0,0 +1,2 @@ +BuildRequires: py3-hatchling py3-hatch-vcs +Requires: py3-exceptiongroup diff --git a/pip/scipy.file b/pip/scipy.file index 0d8db181083..7d1d6137afc 100644 --- a/pip/scipy.file +++ b/pip/scipy.file @@ -1,4 +1,5 @@ -Requires: py3-numpy py3-cython py3-pybind11 py3-pythran +Requires: py3-numpy py3-cython py3-pybind11 py3-pythran py3-meson-python OpenBLAS +BuildRequires: cmake AutoProv: no %define PipPreBuild\ diff --git a/pip/skl2onnx.file b/pip/skl2onnx.file index bbba08909cf..950639df0a5 100644 --- a/pip/skl2onnx.file +++ b/pip/skl2onnx.file @@ -1,2 +1,2 @@ Requires: py3-six py3-numpy py3-scipy py3-protobuf py3-onnx py3-scikit-learn py3-onnxconverter-common -%define source0 https://github.com/onnx/sklearn-onnx/archive/%{realversion}.tar.gz +%define source0 https://github.com/onnx/sklearn-onnx/archive/refs/tags/%{realversion}.tar.gz diff --git a/pip/tables.file b/pip/tables.file index ec116616b3d..e66bb4ca5e1 100644 --- a/pip/tables.file +++ b/pip/tables.file @@ -1,5 +1,6 @@ Requires: py3-numexpr py3-six hdf5 bz2lib py3-mock py3-numpy Requires: py3-numexpr py3-six py3-numpy hdf5 bz2lib py3-mock +Requires: py3-blosc2 Requires: openmpi %define PipPreBuild export CFLAGS="-pthread"; export HDF5_DIR=${HDF5_ROOT} CC="mpicc"; export DISABLE_AVX2=true %define PipBuildOptions --global-option="--hdf5=${HDF5_ROOT}" --global-option="--bzip2=${BZ2LIB_ROOT}" diff --git a/pip/termcolor.file b/pip/termcolor.file new file mode 100644 index 00000000000..ec0e0493a68 --- /dev/null +++ b/pip/termcolor.file @@ -0,0 +1 @@ +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/uhi.file b/pip/uhi.file index 17486f8d625..9b3269d8e60 100644 --- a/pip/uhi.file +++ b/pip/uhi.file @@ -1,2 +1,2 @@ -BuildRequires: py3-poetry +BuildRequires: py3-hatchling py3-hatch-vcs Requires: py3-numpy diff --git a/pip/uproot.file b/pip/uproot.file index 6b1bca08c1f..c7ba8c86577 100644 --- a/pip/uproot.file +++ b/pip/uproot.file @@ -1 +1,2 @@ -Requires: py3-awkward py3-pandas py3-boost-histogram py3-hist +BuildRequires: py3-hatchling +Requires: py3-awkward py3-pandas py3-boost-histogram py3-hist py3-dask py3-dask-awkward py3-awkward-pandas diff --git a/pip/vector.file b/pip/vector.file index 782324d1cda..cefa18313b9 100644 --- a/pip/vector.file +++ b/pip/vector.file @@ -1 +1,2 @@ Requires: py3-numpy py3-packaging +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/pip/versioneer.file b/pip/versioneer.file new file mode 100644 index 00000000000..6e226f01585 --- /dev/null +++ b/pip/versioneer.file @@ -0,0 +1 @@ +Requires: py3-tomli diff --git a/pip/virtualenv.file b/pip/virtualenv.file index 193065698d2..a6158d16075 100644 --- a/pip/virtualenv.file +++ b/pip/virtualenv.file @@ -1,2 +1,3 @@ Requires: py3-appdirs py3-distlib py3-filelock py3-six py3-importlib-metadata py3-importlib-resources Requires: py3-backports-entry-points-selectable py3-platformdirs +BuildRequires: py3-hatchling py3-hatch-vcs diff --git a/py3-dxr.spec b/py3-dxr.spec index b95a6edf1b7..c276e728ba4 100644 --- a/py3-dxr.spec +++ b/py3-dxr.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES} Requires: zlib llvm sqlite Requires: py3-Jinja2 py3-parsimonious py3-pysqlite3 py3-Pygments -%define dxrCommit de41946bc5601d100efb44780f11db71dafaeb1e +%define dxrCommit e79425eded8ca0ae882b4ccceaf27ae1aab446d3 %define branch cms/6ea764102a/py3 Source0: git+https://github.com/cms-externals/dxr.git?obj=%{branch}/%{dxrCommit}&export=dxr-%{dxrCommit}&module=dxr-%dxrCommit&output=/dxr-%{dxrCommit}.tgz diff --git a/py3-llvmlite-fpic-flag.patch b/py3-llvmlite-fpic-flag.patch deleted file mode 100644 index 8c012689d41..00000000000 --- a/py3-llvmlite-fpic-flag.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ffi/Makefile.linux b/ffi/Makefile.linux -index fcfda4e..2d875cf 100644 ---- a/ffi/Makefile.linux -+++ b/ffi/Makefile.linux -@@ -5,7 +5,7 @@ CXX ?= g++ - CXX_FLTO_FLAGS ?= -flto - LD_FLTO_FLAGS ?= -flto -Wl,--exclude-libs=ALL - --CXXFLAGS := $(CPPFLAGS) $(CXXFLAGS) $(LLVM_CXXFLAGS) $(CXX_FLTO_FLAGS) -+CXXFLAGS := $(CPPFLAGS) $(CXXFLAGS) $(LLVM_CXXFLAGS) $(CXX_FLTO_FLAGS) -fPIC - LDFLAGS := $(LDFLAGS) $(LLVM_LDFLAGS) $(LD_FLTO_FLAGS) - LIBS = $(LLVM_LIBS) - INCLUDE = core.h diff --git a/py3-llvmlite-removeMethod.patch b/py3-llvmlite-removeMethod.patch deleted file mode 100644 index 7cfffbbe359..00000000000 --- a/py3-llvmlite-removeMethod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ffi/targets.cpp b/ffi/targets.cpp -index 3b5abf5..49cef60 100644 ---- a/ffi/targets.cpp -+++ b/ffi/targets.cpp -@@ -204,7 +204,6 @@ LLVMPY_CreateTargetMachine(LLVMTargetRef T, const char *Triple, const char *CPU, - rm = Reloc::DynamicNoPIC; - - TargetOptions opt; -- opt.PrintMachineCode = PrintMC; - opt.MCOptions.ABIName = ABIName; - - bool jit = JIT; diff --git a/py3-llvmlite-version.patch b/py3-llvmlite-version.patch deleted file mode 100644 index a3c369650f5..00000000000 --- a/py3-llvmlite-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/py3-pip.spec b/py3-pip.spec index 9db97f215bb..94c7fdcb6c1 100644 --- a/py3-pip.spec +++ b/py3-pip.spec @@ -1,4 +1,4 @@ -### RPM external py3-pip 22.2.2 +### RPM external py3-pip 23.1.1 ## INITENV +PATH PATH %{i}/bin ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} diff --git a/py3-setuptools.spec b/py3-setuptools.spec index a653a83fad2..76e0a08de31 100644 --- a/py3-setuptools.spec +++ b/py3-setuptools.spec @@ -1,3 +1,4 @@ +# setuptools version <64 is needed by numpy: https://github.com/pypa/setuptools/issues/3549 ### RPM external py3-setuptools 63.4.3 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} @@ -14,7 +15,3 @@ python3 setup.py egg_info %install python3 setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i} -sed -i 's|#!.*python.*|#!/usr/bin/env python3|' \ - %{i}/${PYTHON3_LIB_SITE_PACKAGES}/setuptools/command/easy_install.py \ - %{i}/${PYTHON3_LIB_SITE_PACKAGES}/pkg_resources/_vendor/appdirs.py - diff --git a/python/setup.py b/python/setup.py index 990e396f2da..b9cac9d2947 100644 --- a/python/setup.py +++ b/python/setup.py @@ -67,7 +67,6 @@ 'jupyter_core==4.3.0', 'jupyter==1.0.0', 'Keras==2.0.5', - 'llvmlite==0.18.0', 'MarkupSafe==1.0', 'matplotlib==1.5.2', 'mistune==0.7.4', @@ -79,7 +78,6 @@ 'nose==1.3.7', 'notebook==4.3.1', 'numpy==1.12.1', - 'numba==0.33.0', 'numexpr==2.6.2', 'ordereddict==1.1', 'packaging==16.8', diff --git a/python_tools.spec b/python_tools.spec index 8d61b0cfc68..abcf40382dd 100644 --- a/python_tools.spec +++ b/python_tools.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} Source: none -Requires: root curl python3 xrootd llvm hdf5 mxnet-predict yoda opencv +Requires: root curl python3 xrootd llvm hdf5 yoda opencv Requires: professor2 rivet frontier_client onnxruntime openldap pacparser Requires: py3-anyio @@ -24,8 +24,6 @@ Requires: py3-pandas Requires: py3-Bottleneck Requires: py3-downhill Requires: py3-xgboost -Requires: py3-llvmlite -Requires: py3-numba Requires: py3-hep_ml Requires: py3-uncertainties Requires: py3-seaborn diff --git a/re2c.spec b/re2c.spec index a8d2006f823..c7bc7e1ab93 100644 --- a/re2c.spec +++ b/re2c.spec @@ -1,5 +1,5 @@ -### RPM external re2c 0.13.5 -Source0: http://heanet.dl.sourceforge.net/project/%{n}/%{n}/%{realversion}/%{n}-%{realversion}.tar.gz +### RPM external re2c 1.0.1 +Source0: https://deac-ams.dl.sourceforge.net/project/%{n}/%{realversion}/%{n}-%{realversion}.tar.gz %prep %setup -T -b 0 -n %{n}-%{realversion} diff --git a/root.spec b/root.spec index 226eb3b500e..1f45eb3cf16 100644 --- a/root.spec +++ b/root.spec @@ -2,8 +2,8 @@ ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} ## INCLUDE compilation_flags -%define tag 923d539022258ae2934d67e8e792043c11922412 -%define branch cms/v6-26-00-patches/35e0f6eb27 +%define tag d5e337f1490da36eaf109910706ce388b3923cb4 +%define branch cms/v6-26-00-patches/38994b6a72 %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz diff --git a/rust.spec b/rust.spec index 2ecd91ae389..e3a46a615c4 100644 --- a/rust.spec +++ b/rust.spec @@ -1,48 +1,25 @@ -### RPM external rust 1.57.0 +### RPM external rust 1.69.0 %ifarch ppc64le %define build_arch powerpc64le-unknown-linux-gnu %else %define build_arch %{_arch}-unknown-linux-gnu %endif -%define github_user rust-lang -%define branch master -%define tag %{realversion} -Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz -BuildRequires: python3 -Requires: llvm +Source: https://static.rust-lang.org/dist/%{n}-%{realversion}-%{build_arch}.tar.gz +Requires: zlib %prep -%setup -n %{n}-%{realversion} +%setup -n %{n}-%{realversion}-%{build_arch} %build -cat << EOF > config.toml -[llvm] -link-shared = true -[build] -docs = false -build = "%{build_arch}" -extended = true - -[install] -prefix = "%i" -sysconfdir = "etc" - -[rust] -channel = "stable" -rpath = false -codegen-tests = false - -[target.%{build_arch}] -llvm-config = "${LLVM_ROOT}/bin/llvm-config" -EOF +%install +./install.sh --verbose --prefix=%{i} \ + --disable-ldconfig \ + --without=rust-docs \ + --components=rustc,cargo,rust-std-%{build_arch} -mkdir -p %{_tmppath}/cargo_home -export CARGO_HOME=%{_tmppath}/cargo_home -python3 ./x.py build -vv --exclude src/tools/miri %{makeprocesses} +#set *.so permission so that rpmbuild can properly find the Provides +chmod 0755 %{i}/lib/*.so -%install -export CARGO_HOME=%{_tmppath}/cargo_home -export RUSTUP_HOME=%{i} -python3 ./x.py install -vv --exclude src/tools/miri %{makeprocesses} -chmod 0755 %i/lib//librustc_driver*.so +#Remove doc/man +rm -rf %{i}/share diff --git a/scram-project-build.file b/scram-project-build.file index 85491fadc9e..7b48261d19d 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -55,7 +55,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V08-00-00 +%define configtag V09-00-00 %endif %if "%{?buildarch:set}" != "set" diff --git a/scram-tools.file/tool-env.file b/scram-tools.file/tool-env.file index 4ca112723d6..8ca788ff031 100644 --- a/scram-tools.file/tool-env.file +++ b/scram-tools.file/tool-env.file @@ -3,8 +3,8 @@ ## INCLUDE cuda-flags export ROOT_CXXMODULES="0" -export PKG_VECTORIZATION=%{?package_vectorization} -export CMSDIST_DIR=%{cmsdist_directory} +export PKG_VECTORIZATION="%{?package_vectorization}" +export CMSDIST_DIR="%{cmsdist_directory}" %ifarch x86_64 export COMPILER_CXXFLAGS="$(%{cmsdist_directory}/vectorization/cmsdist_packages.py)" diff --git a/scram-tools.file/tools/geant4/geant4vis.xml b/scram-tools.file/tools/geant4/geant4vis.xml index c53baa6bd1d..85b945a1024 100644 --- a/scram-tools.file/tools/geant4/geant4vis.xml +++ b/scram-tools.file/tools/geant4/geant4vis.xml @@ -5,7 +5,6 @@ - diff --git a/scram-tools.file/tools/llvm/llvm-ccompiler.xml b/scram-tools.file/tools/llvm/llvm-ccompiler.xml index 0ac59e88363..ebb0e43273c 100644 --- a/scram-tools.file/tools/llvm/llvm-ccompiler.xml +++ b/scram-tools.file/tools/llvm/llvm-ccompiler.xml @@ -4,4 +4,5 @@ + diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml index 52f3911e71c..99148b216c7 100644 --- a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml +++ b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml @@ -19,6 +19,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/scram-tools.file/tools/vecgeom/vecgeom.xml b/scram-tools.file/tools/vecgeom/vecgeom.xml index d66a3f63229..ecae7d0d7c1 100644 --- a/scram-tools.file/tools/vecgeom/vecgeom.xml +++ b/scram-tools.file/tools/vecgeom/vecgeom.xml @@ -3,7 +3,7 @@ - + diff --git a/sherpa.spec b/sherpa.spec index 233458598c9..31ad30dad9b 100644 --- a/sherpa.spec +++ b/sherpa.spec @@ -1,7 +1,4 @@ -### RPM external sherpa 2.2.12 -%define tag 600078cc741021be898f15563235cf6c809ca5ff -%define branch cms/v%realversion -%define github_user cms-externals +### RPM external sherpa 2.2.15 Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi BuildRequires: mcfm swig autotools diff --git a/vecgeom.spec b/vecgeom.spec index c58fdf37d6e..2c6e037bb25 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,11 +1,11 @@ -### RPM external vecgeom v1.1.17 +### RPM external vecgeom v1.2.1 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto -%define tag ed9a40412c354652262ec80af449f5531206e52c +%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633 Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: cmake gmake %define keep_archives true - +%define vecgeom_backend Scalar Patch0: vecgeom-fix-vector %define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags} @@ -22,23 +22,26 @@ cd ../build cmake ../%{n}-%{realversion} \ -DCMAKE_INSTALL_PREFIX=%{i} \ - -DCMAKE_INSTALL_LIBDIR=%{i}/lib \ - -DROOT=OFF \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_BUILD_TYPE=Release \ - -DNO_SPECIALIZATION=ON \ - -DBACKEND=Scalar \ -%ifarch x86_64 - -DVECGEOM_VECTOR=sse3 \ -%endif + -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="%{build_flags}" \ -DCMAKE_STATIC_LIBRARY_C_FLAGS="%{build_flags}" \ -DCMAKE_CXX_FLAGS="%{build_flags}" \ -DCMAKE_C_FLAGS="%{build_flags}" \ - -DGEANT4=OFF +%ifarch x86_64 +%if "%{vecgeom_backend}" == "Vc" + -DVECGEOM_VECTOR=sse3 \ +%endif +%endif + -DVECGEOM_NO_SPECIALIZATION=ON \ + -DVECGEOM_BUILTIN_VECCORE=ON \ + -DVECGEOM_BACKEND=%{vecgeom_backend} \ + -DVECGEOM_GEANT4=OFF \ + -DVECGEOM_ROOT=OFF make %{makeprocesses} VERBOSE=1 diff --git a/xgboost-arm-and-ppc.patch b/xgboost-arm-and-ppc.patch index ce1eb67c761..d2da738e558 100644 --- a/xgboost-arm-and-ppc.patch +++ b/xgboost-arm-and-ppc.patch @@ -1,10 +1,8 @@ -diff --git a/src/common/hist_util.cc b/src/common/hist_util.cc -index c14da59..d95649a 100644 --- a/src/common/hist_util.cc +++ b/src/common/hist_util.cc -@@ -17,14 +17,7 @@ +@@ -12,14 +12,7 @@ + #include "column_matrix.h" #include "quantile.h" - #include "../data/gradient_index.h" -#if defined(XGBOOST_MM_PREFETCH_PRESENT) - #include diff --git a/xgboost.spec b/xgboost.spec index 52e01fbce3f..80901bf86a9 100644 --- a/xgboost.spec +++ b/xgboost.spec @@ -1,4 +1,4 @@ -### RPM external xgboost 1.6.2 +### RPM external xgboost 1.7.5 BuildRequires: cmake Source: git+https://github.com/dmlc/xgboost.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz From 7afcd396f335cb32be8e37d2775104be8a79810f Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Sat, 29 Apr 2023 11:06:22 +0200 Subject: [PATCH 3/4] fix wheel/flit-core dep; patch py-xgboost as new pip does not support install-option --- pip/wheel.file | 1 + pip/xgboost.file | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 pip/wheel.file diff --git a/pip/wheel.file b/pip/wheel.file new file mode 100644 index 00000000000..eb3d7b377e3 --- /dev/null +++ b/pip/wheel.file @@ -0,0 +1 @@ +Requires: py3-flit-core diff --git a/pip/xgboost.file b/pip/xgboost.file index f3d784df50c..efb5816568f 100644 --- a/pip/xgboost.file +++ b/pip/xgboost.file @@ -1,6 +1,8 @@ Requires: py3-scipy xgboost -%define patchsrc sed -i -e 's|^ outfiles = super().install()| return super().install()|' setup.py -%define PipBuildOptions --install-option="--use-system-libxgboost" +%define patchsrc \ + sed -i -e 's|^\\( *\\)outfiles *= *super().install()|\\1return super().install()|' setup.py ;\ + sed -i -e "s|^\\(.*'use-system-libxgboost':.*\\)0[)]|\\11)|" setup.py + %define PipPostInstall \ mkdir -p "%{i}/${PYTHON3_LIB_SITE_PACKAGES}/xgboost/lib" && \ ( cd "%{i}/${PYTHON3_LIB_SITE_PACKAGES}/xgboost/lib" && \ From 00dadd66d66febdea11a0485f00107e676b744d0 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Mon, 1 May 2023 22:48:14 +0200 Subject: [PATCH 4/4] Fix relocation errors --- geant4.spec | 1 + madgraph5amcatnlo.spec | 1 + pip/blosc2.file | 3 +++ pip/scipy.file | 4 +++- pip/tensorflow.file | 4 ++++ xrootd.spec | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/geant4.spec b/geant4.spec index 6ff7039f254..e049c8f11f5 100644 --- a/geant4.spec +++ b/geant4.spec @@ -86,3 +86,4 @@ sed -ire 's| +(-fprofile-[^ ]+ )+||' %{i}/lib64/Geant4-*/Geant4Config.cmake %{i} %{relocateConfig}bin/geant4-config %{relocateConfig}bin/geant4.* %{relocateConfig}share/Geant4*/geant4make/geant4make.* +%{relocateConfig}lib64/pkgconfig/G4ptl.pc \ No newline at end of file diff --git a/madgraph5amcatnlo.spec b/madgraph5amcatnlo.spec index d80ec39c561..fbe8dd65c26 100644 --- a/madgraph5amcatnlo.spec +++ b/madgraph5amcatnlo.spec @@ -58,6 +58,7 @@ sed -ideleteme 's|#!.*/bin/python|#!/usr/bin/env python|' \ find %{i} -name '*deleteme' -delete rm -rf %{i}/HEPTools/collier/COLLIER-*/build rm -f %{i}/HEPTools/collier/collier_install.log +rm -f %{i}/Source/StdHEP/log.* %post %relocateConfigAll . py.py diff --git a/pip/blosc2.file b/pip/blosc2.file index 9ba16ea095a..08a9425f105 100644 --- a/pip/blosc2.file +++ b/pip/blosc2.file @@ -1,2 +1,5 @@ Requires: py3-scikit-build py3-cython py3-numpy py3-msgpack py3-ndindex py3-py-cpuinfo py3-rich BuildRequires: cmake ninja + +%define PipPostPost \ + %{relocateConfig}lib64/pkgconfig/blosc2.pc \ No newline at end of file diff --git a/pip/scipy.file b/pip/scipy.file index 7d1d6137afc..e6814cc39a7 100644 --- a/pip/scipy.file +++ b/pip/scipy.file @@ -11,4 +11,6 @@ Provides: python3dist(scipy) = %{realversion} %define __find_provides true %endif -%define PipPostPost %{relocateConfig}lib/python*/site-packages/scipy/__config__.py +%define PipPostPost \ + %{relocateConfig}lib/python*/site-packages/scipy/__config__.py ; \ + %{relocateConfig}lib/python*/site-packages/scipy/special/*.pyx diff --git a/pip/tensorflow.file b/pip/tensorflow.file index 1a33c799b12..a2dded283dd 100644 --- a/pip/tensorflow.file +++ b/pip/tensorflow.file @@ -8,3 +8,7 @@ Requires: py3-grpcio py3-astunparse py3-keras Requires: llvm %define source0 none %define source_file none + +%define PipPostPost \ + %{relocateConfig}lib/python*/site-packages/tensorflow/include/external/local_config_cuda/cuda/cuda/cuda_config.h ; \ + %{relocateConfig}lib/python*/site-packages/tensorflow/python/platform/build_info.py diff --git a/xrootd.spec b/xrootd.spec index 31ba8a37deb..bf30e009128 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -58,3 +58,4 @@ make install %post %{relocateConfig}bin/xrootd-config +%{relocateConfig}${PYTHON3_LIB_SITE_PACKAGES}/xrootd-%{realvesion}-*.egg/EGG-INFO/SOURCES.txt