Merge IB/CMSSW_13_1_X/master into IB/CMSSW_13_1_X/rootmaster.

cms-sw · May 1, 2023 · d69ebdf · d69ebdf
2 parents 7cf9981 + 1ed931f
commit d69ebdf
Show file tree

Hide file tree

Showing 84 changed files with 360 additions and 237 deletions.
diff --git 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/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
diff --git 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/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/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/pip/async-lru.file b/pip/async-lru.file
@@ -0,0 +1 @@
+Requires: py3-typing-extensions
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +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
diff --git a/pip/build.file 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
@@ -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
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling
diff --git a/pip/comm.file b/pip/comm.file
@@ -0,0 +1,2 @@
+BuildRequires: py3-hatchling
+Requires: py3-traitlets
diff --git a/pip/contourpy.file b/pip/contourpy.file
@@ -0,0 +1 @@
+Requires: py3-pybind11 py3-numpy
diff --git a/pip/dask-awkward.file 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
@@ -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
@@ -0,0 +1 @@
+BuildRequires: py3-flit-scm
diff --git a/pip/filelock.file 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
@@ -1 +1 @@
-Requires: py3-pytoml py3-toml
+%define PipNoWheelDep 1
diff --git a/pip/flit-scm.file 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
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling
diff --git a/pip/hatch-jupyter-builder.file 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
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling
diff --git a/pip/hatch-vcs.file b/pip/hatch-vcs.file
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+BuildRequires: py3-flit-core
+
diff --git a/pip/iniconfig.file b/pip/iniconfig.file
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling py3-hatch-vcs
diff --git a/pip/installer.file b/pip/installer.file
@@ -0,0 +1 @@
+BuildRequires: py3-flit-core
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+BuildRequires: py3-hatchling
+Requires: py3-terminado
diff --git 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/markdown-it-py.file 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
@@ -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
@@ -0,0 +1 @@
+BuildRequires: py3-flit-core
diff --git a/pip/meson-python.file 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+Requires: py3-cython py3-numpy
diff --git a/pip/notebook-shim.file 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+Requires: py3-locket py3-toolz
diff --git a/pip/pathspec.file b/pip/pathspec.file
@@ -0,0 +1 @@
+BuildRequires: py3-flit-core
diff --git a/pip/platformdirs.file 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
@@ -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
@@ -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
@@ -1 +1,2 @@
 Requires: py3-wcwidth
+BuildRequires: py3-hatchling py3-hatch-vcs
diff --git a/pip/pybind11.file 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
@@ -0,0 +1,2 @@
+BuildRequires: py3-flit-core
+
diff --git a/pip/pyproject-metadata.file b/pip/pyproject-metadata.file
@@ -0,0 +1 @@
+Requires: py3-flit-core py3-packaging
diff --git 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
@@ -0,0 +1 @@
+BuildRequires: py3-hatchling
diff --git a/pip/rapidfuzz.file b/pip/rapidfuzz.file
@@ -0,0 +1 @@
+Requires: py3-numpy py3-packaging py3-scikit-build
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-pycodestyle py3-toml
		Requires: py3-pycodestyle py3-tomli
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BuildRequires: py3-hatchling py3-hatch-vcs
		Requires: py3-awkward py3-pandas
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BuildRequires: py3-flit-core py3-pyproject-hooks
		Requires: py3-packaging py3-tomli
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-poetry-core py3-clikit
		Requires: py3-poetry-core py3-clikit py3-rapidfuzz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BuildRequires: py3-hatchling
		Requires: py3-traitlets
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BuildRequires: py3-hatchling py3-hatch-vcs
		Requires: py3-dask py3-awkward
Original file line number	Diff line number	Diff line change
		@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Requires: py3-pytoml py3-toml
		%define PipNoWheelDep 1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Requires: py3-flit-core py3-setuptools-scm py3-tomli
Original file line number	Diff line number	Diff line change
		@@ -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