diff --git a/crab-dev.spec b/crab-dev.spec index 64c982d1383..0e449b68dfd 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.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 index d77f6ed9903..d8b838dd19a 100644 --- 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 \ No newline at end of file +SimG4CMS-Calo=V03-02-00 +Validation-Geometry=V00-07-00 diff --git a/data/data-SimG4CMS-Calo.spec b/data/data-SimG4CMS-Calo.spec index fb5aee958b5..cdb8da14f8c 100644 --- 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 index 38811795e35..3c97087565d 100644 --- 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 index 42e82d43f6b..595cbb6872c 100644 --- 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 deleted file mode 100644 index ffb7bf8f8d1..00000000000 --- a/pip/backports-functools_lru_cache.file +++ /dev/null @@ -1,2 +0,0 @@ -Requires: py2-setuptools-scm -%define pip_name backports.functools_lru_cache diff --git a/pip/backports-lzma.file b/pip/backports-lzma.file deleted file mode 100644 index c647cfb6536..00000000000 --- a/pip/backports-lzma.file +++ /dev/null @@ -1,5 +0,0 @@ -Requires: xz - -%define pip_name backports.lzma - -%define PipBuildOptions --global-option=build_ext --global-option="-L${XZ_ROOT}/lib" --global-option="-I${XZ_ROOT}/include" diff --git a/pip/backports-shutil_get_terminal_size.file b/pip/backports-shutil_get_terminal_size.file deleted file mode 100644 index 2ea1a169050..00000000000 --- a/pip/backports-shutil_get_terminal_size.file +++ /dev/null @@ -1 +0,0 @@ -%define pip_name backports.shutil_get_terminal_size diff --git a/pip/backports-shutil_which.file b/pip/backports-shutil_which.file deleted file mode 100644 index 4a3549dd40f..00000000000 --- a/pip/backports-shutil_which.file +++ /dev/null @@ -1 +0,0 @@ -%define pip_name backports.shutil_which diff --git a/pip/backports-ssl_match_hostname.file b/pip/backports-ssl_match_hostname.file deleted file mode 100644 index f0ab1427e35..00000000000 --- a/pip/backports-ssl_match_hostname.file +++ /dev/null @@ -1 +0,0 @@ -%define pip_name backports.ssl_match_hostname diff --git a/pip/configparser.file b/pip/configparser.file deleted file mode 100644 index fed4d8c6bf1..00000000000 --- a/pip/configparser.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-setuptools-scm diff --git a/pip/py2-PyYAML.file b/pip/py2-PyYAML.file deleted file mode 100644 index f9ba47fffc7..00000000000 --- a/pip/py2-PyYAML.file +++ /dev/null @@ -1 +0,0 @@ -BuildRequires: py2-wheel diff --git a/pip/py2-prettytable.file b/pip/py2-prettytable.file deleted file mode 100644 index 6b00194e6d4..00000000000 --- a/pip/py2-prettytable.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-wcwidth diff --git a/pip/py2-setuptools-scm.file b/pip/py2-setuptools-scm.file deleted file mode 100644 index 04935344e87..00000000000 --- a/pip/py2-setuptools-scm.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-wheel diff --git a/pip/py2-wcwidth.file b/pip/py2-wcwidth.file deleted file mode 100644 index 6e5f89780db..00000000000 --- a/pip/py2-wcwidth.file +++ /dev/null @@ -1 +0,0 @@ -Requires: py2-backports-functools_lru_cache diff --git a/pip/requirements.txt b/pip/requirements.txt index d3a9a0e73f3..4fdc0613f86 100644 --- 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 index eea1e0b852b..047be7ff11c 100644 --- a/professor2-toolfile.spec +++ b/professor2-toolfile.spec @@ -13,7 +13,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/professor2.xml - + diff --git a/py2-future.spec b/py2-future.spec new file mode 100644 index 00000000000..516e8dd41b1 --- /dev/null +++ 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 deleted file mode 100644 index 4e3edfee242..00000000000 --- a/py2-pip.spec +++ /dev/null @@ -1,19 +0,0 @@ -### RPM external py2-pip 9.0.3 -## 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://github.com/pypa/pip/archive/%{realversion}.tar.gz -Requires: python py2-setuptools -#BuildRequires: - -%prep -%setup -n %{my_name}-%{realversion} - -%build -python2 setup.py build - -%install -python2 setup.py install --single-version-externally-managed --record=/dev/null --prefix=%{i} -%{relocatePy2SitePackages} -perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/* diff --git a/py2-setuptools.spec b/py2-setuptools.spec deleted file mode 100644 index 594b64bd373..00000000000 --- a/py2-setuptools.spec +++ /dev/null @@ -1,18 +0,0 @@ -### RPM external py2-setuptools 44.1.1 -## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES} - -Source: https://github.com/pypa/setuptools/archive/v%{realversion}.tar.gz - -Requires: python - -%prep -%setup -n setuptools-%{realversion} - -%build -which python -python bootstrap.py -python setup.py build - -%install -python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i} -sed -i 's|#!.*/bin/python|#!/usr/bin/env python|' %{i}/bin/easy_install* diff --git a/py3-dxr-toolfile.spec b/py3-dxr-toolfile.spec index e8eef6bf25e..41f3ba13207 100644 --- 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 - +cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-dxr.xml + - - + + - + EOF_TOOLFILE diff --git a/py3-numpy-toolfile.spec b/py3-numpy-toolfile.spec index 69156a6b671..fa44213c57f 100644 --- 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 - +cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py3-numpy.xml + - + - + EOF_TOOLFILE diff --git a/python_tools.spec b/python_tools.spec index 2757c237057..f8f68c71d5e 100644 --- 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 index 05edab8a59a..952719753ec 100644 --- 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