Merge branch 'IB/CMSSW_12_0_X/master' into scram-tools-change

cms-sw · Jul 16, 2021 · 14e1e98 · 14e1e98
2 parents e50000c + e8f3759
commit 14e1e98
Show file tree

Hide file tree

Showing 24 changed files with 40 additions and 101 deletions.
diff --git 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.210706
+%define crabclient_version v3.210714
 ### RPM cms crab-dev %{crabclient_version}.%{version_suffix}
 %define wmcore_version     1.4.9
 %define crabserver_version v3.210701

diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt
@@ -110,5 +110,5 @@ CalibCalorimetry-CaloMiscalibTools=V01-00-00
 FastSimulation-MaterialEffects=V05-00-00
 L1Trigger-RPCTrigger=V00-15-00
 RecoParticleFlow-PFBlockProducer=V02-04-02
-SimG4CMS-Calo=V03-01-00
-Validation-Geometry=V00-07-00
+SimG4CMS-Calo=V03-02-00
+Validation-Geometry=V00-07-00
diff --git a/data/data-SimG4CMS-Calo.spec b/data/data-SimG4CMS-Calo.spec
@@ -8,6 +8,7 @@
 cat << CMS_EOF >> ./sources
 SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v4.root
 SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en_v3.root
+SimG4CMS/Calo/data/HFShowerLibrary_run3_v5.root
 CMS_EOF
 
 ## IMPORT data-package-build
diff --git a/fastjet.spec b/fastjet.spec
@@ -1,10 +1,10 @@
-### RPM external fastjet 3.4.0-beta
+### RPM external fastjet 3.4.0
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 ## INCLUDE compilation_flags
 
 BuildRequires: autotools
 Requires: python3
-%define tag 65f948f075860df1fddf7b819f60c3346710ebf1
+%define tag 2423e8c763b7d7b73f77c5a0c71c8638df362246
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/fastjet.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

diff --git a/fwlite_python_tools.spec b/fwlite_python_tools.spec
@@ -3,7 +3,6 @@
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 Source: none
 
-Requires: py2-six
 Requires: py3-six
 Requires: py3-scipy
 Requires: py3-numpy

diff --git a/pip/backports-functools_lru_cache.file b/pip/backports-functools_lru_cache.file
diff --git a/pip/backports-lzma.file b/pip/backports-lzma.file
diff --git a/pip/backports-shutil_get_terminal_size.file b/pip/backports-shutil_get_terminal_size.file
diff --git a/pip/backports-shutil_which.file b/pip/backports-shutil_which.file
diff --git a/pip/backports-ssl_match_hostname.file b/pip/backports-ssl_match_hostname.file
diff --git a/pip/configparser.file b/pip/configparser.file
diff --git a/pip/py2-PyYAML.file b/pip/py2-PyYAML.file
diff --git a/pip/py2-prettytable.file b/pip/py2-prettytable.file
diff --git a/pip/py2-setuptools-scm.file b/pip/py2-setuptools-scm.file
diff --git a/pip/py2-wcwidth.file b/pip/py2-wcwidth.file
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -32,7 +32,6 @@ avro==1.10.1; python_version>'3.0'
 awkward==0.14.0; python_version>'3.0'
 awkward1==0.4.4; python_version>'3.0'
 backcall==0.2.0 ; python_version>'3.0'
-backports-functools_lru_cache==1.6.1; python_version<'3.0'
 beautifulsoup4==4.9.3; python_version>'3.0'
 bleach==3.3.0; python_version>'3.0'
 bokeh==2.3.0 ; python_version>'3.0'
@@ -57,7 +56,6 @@ climate==0.4.6; python_version>'3.0'
 cloudpickle==1.3.0; python_version>'3.0'
 colorama==0.4.4; python_version>'3.0'
 conan==1.34.1 ; python_version>'3.0'
-configparser==4.0.2;python_version<'3.0'
 contextlib2==0.6.0.post1; python_version>'3.0'
 contextvars==2.4 ; python_version>'3.0'
 coverage==5.5; python_version>'3.0'
@@ -73,7 +71,6 @@ docopt==0.6.2 ; python_version>'3.0'
 docutils==0.16; python_version>'3.0'
 downhill==0.4.0; python_version>'3.0'
 entrypoints==0.3; python_version>'3.0'
-enum34==1.1.10;python_version<'3.0'
 fasteners==0.16 ; python_version>'3.0'
 filelock==3.0.12; python_version>'3.0'
 fire==0.4.0; python_version>'3.0'
@@ -84,7 +81,6 @@ flatbuffers==1.12.0 ; python_version>'3.0'
 flawfinder==2.0.15; python_version>'3.0'
 fs==2.4.12; python_version>'3.0'
 funcsigs==1.0.2; python_version>'3.0'
-future==0.18.2; python_version<'3.0'
 future==0.18.2; python_version>'3.0'
 gast==0.4.0; python_version>'3.0'
 gitdb==4.0.5 ; python_version>'3.0'
@@ -168,7 +164,6 @@ node-semver==0.8.0 ; python_version>'3.0'
 notebook==6.2.0 ; python_version>'3.0'
 numba==0.52.0 ; python_version>'3.0'
 numexpr==2.7.2; python_version>'3.0'
-numpy==1.16.6 ; python_version<'3.0'
 #numpy 1.19 needs an updated tensorflow
 numpy==1.17.5 ; python_version>'3.0'
 onnx==1.8.1; python_version>'3.0'
@@ -197,7 +192,6 @@ ply==3.11; python_version>'3.0'
 poetry==1.1.4 ; python_version>'3.0'
 poetry-core==1.0.2 ; python_version>'3.0'
 prettytable==1.0.1; python_version>'3.0'
-prettytable==1.0.1; python_version<'3.0'
 prometheus_client==0.9.0; python_version>'3.0'
 prompt_toolkit==3.0.16 ; python_version>'3.0'
 protobuf==3.15.1; python_version>'3.0'
@@ -211,7 +205,6 @@ pybrain==0.3.3; python_version>'3.0'
 pycodestyle==2.6.0; python_version>'3.0'
 pycparser==2.20; python_version>'3.0'
 pycuda==2019.1.2; python_version>'3.0'
-pycurl==7.43.0.5; python_version<'3.0'
 pycurl==7.43.0.5; python_version>'3.0'
 pydot==1.4.2; python_version>'3.0'
 pyflakes==2.2.0; python_version>'3.0'
@@ -238,7 +231,6 @@ pytools==2020.3;python_version>'3.0'
 pytz==2021.1; python_version>'3.0'
 #needed by getPayloadData.py which needs python2 until boost-python changes 
 PyYAML==5.4.1; python_version>'3.0'
-PyYAML==5.4.1; python_version<'3.0'
 pyzmq==19.0.2; python_version>'3.0'
 qtconsole==4.7.7 ; python_version> '3.0'
 QtPy==1.9.0; python_version>'3.0'
@@ -258,19 +250,15 @@ threadpoolctl==2.0.0 ; python_version> '3.0'
 scons==4.1.0.post1 ;  python_version> '3.0'
 seaborn==0.9.1; python_version>'3.0'
 Send2Trash==1.5.0; python_version>'3.0'
-setuptools-scm==3.5.0;python_version<'3.0'
 setuptools-scm==3.5.0;python_version>'3.0'
 shellingham==1.4.0 ; python_version> '3.0'
 simplegeneric==0.8.1; python_version>'3.0'
 singledispatch==3.6.1; python_version>'3.0'
-six==1.15.0; python_version<'3.0'
 six==1.15.0; python_version>'3.0'
 skl2onnx==1.7.1 ; python_version>'3.0'
 smmap==3.0.4; python_version>'3.0'
 smmap2==3.0.1; python_version>'3.0'
 soupsieve==1.9.6; python_version>'3.0'
-#to update the patch needs to be fixed...
-sqlalchemy==1.3.11; python_version<'3.0'
 sqlalchemy==1.3.11; python_version>'3.0'
 stevedore==1.32.0; python_version>'3.0'
 subprocess32==3.5.4; python_version>'3.0'
@@ -303,11 +291,9 @@ urllib3==1.26.5; python_version>'3.0'
 virtualenv-clone==0.5.4; python_version>'3.0'
 virtualenv==20.4.2; python_version>'3.0'
 virtualenvwrapper==4.8.4; python_version>'3.0'
-wcwidth==0.2.5; python_version<'3.0'
 wcwidth==0.2.5; python_version>'3.0'
 webencodings==0.5.1; python_version>'3.0'
 Werkzeug==1.0.1; python_version>'3.0'
-wheel==0.33.6; python_version<'3.0'
 wheel==0.33.6; python_version>'3.0'
 widgetsnbextension==3.5.1 ; python_version>'3.0'
 #cannot wrapt update before astroid is

diff --git a/professor2-toolfile.spec b/professor2-toolfile.spec
@@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/professor2.xml
 <environment name="PROFESSOR2_BASE" default="@TOOL_ROOT@"/>
 <environment name="LIBDIR" default="$PROFESSOR2_BASE/lib"/>
 </client>
-<use name="py2-numpy"/>
+<use name="py3-numpy"/>
 <use name="root"/>
 <use name="yoda"/>
 <use name="eigen"/>

diff --git a/py2-future.spec b/py2-future.spec
@@ -0,0 +1,19 @@
+### RPM external py2-future 0.18.2
+## INITENV +PATH PATH %{i}/bin
+## INITENV +PATH LD_LIBRARY_PATH %{i}/lib
+## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
+
+%define my_name %(echo %n | cut -f2 -d-)
+Source: https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9/future-0.18.2.tar.gz
+Requires: python
+
+%prep
+%setup -n %{my_name}-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python setup.py install  --prefix=%{i}
+%{relocatePy2SitePackages}
+perl -p -i -e "s|^#!.*python.*|#!/usr/bin/env python|" %{i}/bin/*
diff --git a/py2-pip.spec b/py2-pip.spec
diff --git a/py2-setuptools.spec b/py2-setuptools.spec
diff --git a/py3-dxr-toolfile.spec b/py3-dxr-toolfile.spec
@@ -8,13 +8,13 @@ Requires: py3-dxr
 %install
 
 mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-dxr.xml
-<tool name="py2-dxr" version="@TOOL_VERSION@">
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-dxr.xml
+<tool name="py3-dxr" version="@TOOL_VERSION@">
   <client>
-    <environment name="PY2_DXR_BASE" default="@TOOL_ROOT@"/>
-    <environment name="LIBDIR" default="$PY2_DXR_BASE/lib"/>
+    <environment name="PY3_DXR_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY3_DXR_BASE/lib"/>
   </client>
-  <runtime name="PATH" value="$PY2_DXR_BASE/bin" type="path"/>
+  <runtime name="PATH" value="$PY3_DXR_BASE/bin" type="path"/>
 </tool>
 EOF_TOOLFILE
 

diff --git a/py3-numpy-toolfile.spec b/py3-numpy-toolfile.spec
@@ -8,12 +8,12 @@ Requires: py3-numpy
 %install
 
 mkdir -p %{i}/etc/scram.d
-cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-numpy.xml
-<tool name="py2-numpy" version="@TOOL_VERSION@">
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-numpy.xml
+<tool name="py3-numpy" version="@TOOL_VERSION@">
   <client>
-    <environment name="PY2_NUMPY_BASE" default="@TOOL_ROOT@"/>
+    <environment name="PY3_NUMPY_BASE" default="@TOOL_ROOT@"/>
   </client>
-  <runtime name="PATH" value="$PY2_NUMPY_BASE/bin" type="path"/>
+  <runtime name="PATH" value="$PY3_NUMPY_BASE/bin" type="path"/>
 </tool>
 EOF_TOOLFILE
 

diff --git a/python_tools.spec b/python_tools.spec
@@ -1,14 +1,11 @@
-### RPM external python_tools 2.0
+### RPM external python_tools 3.0
 ## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 Source: none
 
 Requires: root curl python python3 xrootd llvm hdf5 mxnet-predict yoda opencv
-Requires: professor2 rivet frontier_client onnxruntime
-
-#needed for cmssw until python2-> python3 switch of framework
-Requires: py2-configparser
-Requires: py2-enum34
+Requires: professor2 rivet frontier_client onnxruntime openldap
+Requires: py2-future
 
 Requires: py3-scipy
 Requires: py3-Keras
@@ -47,8 +44,6 @@ Requires: py3-joblib
 #this DOES NOT depend on numpy..
 Requires: py3-xrootdpyfs
 
-Requires: root curl python openldap
-
 Requires: py3-entrypoints
 Requires: py3-psutil
 Requires: py3-repoze-lru
@@ -83,25 +78,20 @@ Requires: py3-pyparsing
 Requires: py3-pyzmq
 Requires: py3-qtconsole
 Requires: py3-scandir
-Requires: py2-setuptools
 Requires: py3-setuptools
 Requires: py3-simplegeneric
 Requires: py3-singledispatch
-Requires: py2-six
 Requires: py3-six
 Requires: py3-terminado
 Requires: py3-testpath
 Requires: py3-tornado
 Requires: py3-traitlets
-Requires: py2-wcwidth
 Requires: py3-webencodings
 Requires: py3-widgetsnbextension
 Requires: py3-cycler
 Requires: py3-docopt
 Requires: py3-networkx
-Requires: py2-prettytable
 Requires: py3-prettytable
-Requires: py2-pycurl
 Requires: py3-pycurl
 Requires: py3-pytz
 Requires: py3-requests
@@ -134,20 +124,16 @@ Requires: py3-plac
 
 Requires: py3-matplotlib
 Requires: py3-numpy
-Requires: py2-sqlalchemy
 Requires: py3-sqlalchemy
 Requires: py3-pygithub
 Requires: py3-dxr
-Requires: py2-PyYAML
 Requires: py3-PyYAML
 Requires: py3-pylint
-Requires: py2-pip
 Requires: py3-pip
 %ifarch x86_64
 Requires: py3-cx-Oracle
 %endif
 Requires: py3-cython
-Requires: py2-future
 Requires: py3-pybind11
 Requires: py3-histbook
 Requires: py3-flake8

diff --git a/root.spec b/root.spec
@@ -2,8 +2,8 @@
 ## INITENV +PATH PYTHON3PATH %{i}/lib
 ## INITENV SET ROOTSYS %{i}
 
-%define tag 0917f47b22a3d691bc98086284eb805bac94d69a
-%define branch cms/v6-22-00-patches/a15e883
+%define tag 32c9dc53cf8f6b70df032f56fc8958f9beffd75d
+%define branch cms/v6-22-00-patches/abd79a9716
 
 %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