Merge IB/CMSSW_12_3_X/master into IB/CMSSW_12_3_X/rootmaster.

cms-sw · Jan 14, 2022 · 1d2a485 · 1d2a485
2 parents b29391a + 1d38608
commit 1d2a485
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 6 deletions.
diff --git a/pip/GitPython.file b/pip/GitPython.file
@@ -1 +1 @@
-Requires: py3-smmap2 py3-gitdb
+Requires: py3-gitdb py3-typing-extensions
diff --git a/pip/PyNaCl.file b/pip/PyNaCl.file
@@ -0,0 +1 @@
+Requires: py3-cffi
diff --git a/pip/Theano.file b/pip/Theano.file
@@ -1 +1 @@
-Requires: py3-scipy
+Requires: py3-scipy py3-six
diff --git a/pip/arrow.file b/pip/arrow.file
@@ -0,0 +1 @@
+Requires: py3-python-dateutil
diff --git a/pip/cachecontrol.file b/pip/cachecontrol.file
@@ -0,0 +1,2 @@
+%define patchsrc0 sed -i -e 's|name="CacheControl"|name="cachecontrol"|' setup.py
+Requires: py3-setuptools py3-msgpack py3-requests
diff --git a/pip/correctionlib.file b/pip/correctionlib.file
@@ -1,3 +1,3 @@
 Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson py3-rich
-BuildRequires: py3-setuptools-scm py3-scikit-build cmake
+BuildRequires: py3-setuptools-scm py3-scikit-build cmake py3-make
 %define PipPreBuildPy export CMAKE_BUILD_PARALLEL_LEVEL=%{compiling_processes}
diff --git a/pip/cryptography.file b/pip/cryptography.file
@@ -0,0 +1,3 @@
+%define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home
+BuildRequires: rust
+Requires: py3-setuptools-rust py3-cffi
diff --git a/pip/deprecated.file b/pip/deprecated.file
@@ -0,0 +1 @@
+Requires: py3-wrapt
diff --git a/pip/jeepney.file b/pip/jeepney.file
@@ -0,0 +1 @@
+Requires: py3-flit-core
diff --git a/pip/jinja2-time.file b/pip/jinja2-time.file
@@ -0,0 +1 @@
+Requires: py3-arrow py3-Jinja2
diff --git a/pip/keyring.file b/pip/keyring.file
@@ -0,0 +1 @@
+Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney
diff --git a/pip/make.file b/pip/make.file
@@ -0,0 +1,6 @@
+%define tag         ce2ef5834837a35dba5f2bea8866b61c8907c83a
+%define branch      master
+%define github_user fholmer
+%define source0 git+https://github.com/%{github_user}/make.git?obj=%{branch}/%{tag}&export=make-%{realversion}&output=/source.tar.gz
+
+Requires: py3-Jinja2 py3-jinja2-time
diff --git a/pip/opt-einsum.file b/pip/opt-einsum.file
@@ -1 +1,2 @@
 %define source0 https://github.com/dgasmith/opt_einsum/archive/v%{realversion}.tar.gz
+Requires: py3-numpy
diff --git a/pip/pygithub.file b/pip/pygithub.file
@@ -0,0 +1 @@
+Requires: py3-deprecated py3-PyJWT py3-PyNaCl py3-requests
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -18,6 +18,7 @@ anyio==3.3.2
 appdirs==1.4.4
 argon2-cffi==21.1.0
 argparse==1.4.0
+arrow==1.2.1
 asn1crypto==1.4.0
 astor==0.8.1
 astroid==2.7.3
@@ -58,13 +59,16 @@ conan==1.40.3
 contextlib2==21.6.0
 contextvars==2.4
 coverage==5.5
+# Newer versions of py3-cryptography require OpenSSL 1.1.0+, see https://github.com/pyca/cryptography/issues/5906
+cryptography==3.2.1
 cx-Oracle==8.2.1
 cycler==0.10.0
 cython==0.29.24
 decorator==5.0.9
 debugpy==1.4.1
 defusedxml==0.7.1
 deprecation==2.1.0
+deprecated==1.2.13
 distlib==0.3.2
 distro==1.6.0
 docopt==0.6.2
@@ -113,7 +117,9 @@ ipython==7.27.0
 ipywidgets==7.6.4
 isort==5.9.3
 jedi==0.18.0
+jeepney==0.7.1 
 Jinja2==3.0.1
+jinja2-time==0.2.0
 joblib==1.0.1
 jsonpickle==2.0.0
 jsonschema==3.2.0
@@ -139,6 +145,7 @@ lockfile==0.12.2
 luigi==3.0.3
 lxml==4.6.5
 lz4==3.1.3
+make==0.1.6post2
 Mako==1.1.5
 Markdown==3.3.4
 MarkupSafe==2.0.1
@@ -152,6 +159,7 @@ mpld3==0.5.5
 mplhep==0.3.12
 mplhep-data==0.0.3
 mpmath==1.2.1
+msgpack==1.0.3
 multidict==5.1.0
 nbclient==0.5.4
 nbconvert==6.1.0
@@ -220,6 +228,7 @@ py==1.10.0
 pydantic==1.8.2
 pygithub==1.55
 pylev==1.4.0
+PyNaCl==1.5.0
 pysqlite3==0.4.6
 pytest==6.2.5
 pytest-cov==2.12.1
@@ -249,18 +258,20 @@ scikit-build==0.12.0
 scikit-learn==0.24.2
 scinum==1.2.0
 scipy==1.7.1
+secretstorage==3.3.1
+semantic-version==2.8.5
 threadpoolctl==2.2.0
 scons==4.2.0
 seaborn==0.11.2
 Send2Trash==1.8.0
+setuptools-rust==1.1.2
 setuptools-scm==6.3.1
 shellingham==1.4.0
 simplegeneric==0.8.1
 singledispatch==3.7.0
 six==1.16.0
 skl2onnx==1.9.2
 smmap==4.0.0
-smmap2==3.0.1
 sniffio==1.2.0
 soupsieve==2.2.1
 sqlalchemy==1.3.24

diff --git a/pip/secretstorage.file b/pip/secretstorage.file
@@ -0,0 +1 @@
+Requires: py3-cryptography py3-jeepney
diff --git a/pip/setuptools-rust.file b/pip/setuptools-rust.file
@@ -0,0 +1,2 @@
+BuildRequires: rust
+Requires: py3-setuptools-scm py3-semantic-version py3-toml py3-typing-extensions
diff --git a/pip/smmap2.file b/pip/smmap2.file
diff --git a/python_tools.spec b/python_tools.spec
@@ -149,7 +149,6 @@ Requires: py3-pluggy
 Requires: py3-pyasn1-modules
 Requires: py3-pyasn1
 Requires: py3-pyflakes
-Requires: py3-smmap2
 Requires: py3-stevedore
 Requires: py3-typing-extensions
 Requires: py3-virtualenv-clone

diff --git a/rust.spec b/rust.spec
@@ -0,0 +1,48 @@
+### RPM external rust 1.57.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
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%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
+
+mkdir -p %{_tmppath}/cargo_home
+export CARGO_HOME=%{_tmppath}/cargo_home
+python3 ./x.py build -vv --exclude src/tools/miri  %{makeprocesses}
+
+%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