Merge branch 'IB/CMSSW_12_0_X/master' into update-RecoTracker-Displac…

…edRegionalTracking-to-V00-01-00

OpenBLAS-fix-dynamic-arch.patch

@@ -1,22 +1,13 @@
 diff --git a/Makefile.x86_64 b/Makefile.x86_64
-index f2de51e..e1c348a 100644
+index f62ab9e..f23a65b 100644
 --- a/Makefile.x86_64
 +++ b/Makefile.x86_64
 @@ -9,7 +9,7 @@ endif
  endif
 
- ifeq ($(CORE), SKYLAKEX)
--ifndef DYNAMIC_ARCH
-+ifneq ($(DYNAMIC_ARCH), 1)
- ifndef NO_AVX512
- CCOMMON_OPT += -march=skylake-avx512
- FCOMMON_OPT += -march=skylake-avx512
-@@ -28,7 +28,7 @@ endif
- endif
 
- ifeq ($(CORE), HASWELL)
 -ifndef DYNAMIC_ARCH
 +ifneq ($(DYNAMIC_ARCH), 1)
- ifndef NO_AVX2
- ifeq ($(C_COMPILER), GCC)
- CCOMMON_OPT += -mavx2
+ ADD_CPUFLAGS = 1
+ else
+ ifdef TARGET_CORE

OpenBLAS.spec

@@ -1,4 +1,4 @@
-### RPM external OpenBLAS 0.3.9
+### RPM external OpenBLAS 0.3.15
 ## INCLUDE compilation_flags
 Source: https://github.com/xianyi/OpenBLAS/archive/v%{realversion}.tar.gz
 Patch0: OpenBLAS-fix-dynamic-arch

classlib.spec

@@ -1,5 +1,5 @@
 ### RPM external classlib 3.1.3
-%define tag b2569c29126780017b48b96d324fe73a05573bc5
+%define tag f7f9fb3ecf3c8bfe58dc0bf64e796274e62304ec
 %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}.tgz

cmssw-queue-override.file

@@ -14,8 +14,12 @@
 %endif
 
 %if "%(case %realversion in (*_DBG_X*) echo true ;; (*) echo false ;; esac)" == "true"
+%ifarch ppc64le
+%define usercxxflags    -g
+%else
 %define usercxxflags    -g -O3 -DEDM_ML_DEBUG
 %endif
+%endif
 
 %if "%(case %realversion in (*_FORTIFIED_X*) echo true ;; (*) echo false ;; esac)" == "true"
 %define usercxxflags    -fexceptions -fstack-protector-all --param=ssp-buffer-size=4 -Wp,-D_FORTIFY_SOURCE=2

compilation_flags.file

@@ -1,4 +1,4 @@
 %if "%{?ppc64le_build_flags:set}" != "set"
-%define ppc64le_build_flags  -mlong-double-64 -mcpu=power8 -mtune=power8 --param=l1-cache-size=64 --param=l1-cache-line-size=128 --param=l2-cache-size=512
+%define ppc64le_build_flags  -mcpu=powerpc64le -mtune=power8 --param=l1-cache-size=64 --param=l1-cache-line-size=128 --param=l2-cache-size=512
 %endif
 

crab-dev.spec

@@ -3,7 +3,7 @@
 #For any other change, increment version_suffix
 ##########################################
 %define version_suffix 00
-%define crabclient_version v3.210601
+%define crabclient_version v3.210607
 ### RPM cms crab-dev %{crabclient_version}.%{version_suffix}
 %define wmcore_version     1.3.6.crab6
 %define crabserver_version v3.210429

data/cmsswdata.txt

@@ -4,15 +4,15 @@
 #If there is no customization for the packae then remove its .spec and .file
 [default]
 RecoTracker-DisplacedRegionalTracking=V00-01-00
+PhysicsTools-PatUtils=V00-05-00
+GeneratorInterface-EvtGenInterface=V02-05-00
 RecoJets-JetProducers=V05-14-00
 RecoEgamma-ElectronIdentification=V01-06-00
-PhysicsTools-PatUtils=V00-03-00
 L1Trigger-L1TMuon=V01-05-00
 L1Trigger-L1THGCal=V01-05-00
 Geometry-TestReference=V00-08-00
 L1Trigger-DTTriggerPhase2=V00-02-00
 L1Trigger-CSCTriggerPrimitives=V00-08-00
-GeneratorInterface-EvtGenInterface=V02-04-00
 RecoBTag-Combined=V01-11-00
 RecoEgamma-PhotonIdentification=V01-01-00
 RecoHGCal-TICL=V00-02-01

eigen.spec

@@ -1,7 +1,7 @@
 ### RPM external eigen 011e0db31d1bed8b7f73662be6d57d9f30fa457a
 ## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
 ## NOCOMPILER
-%define tag fd0c254c0a9adc47c094257ce6256ab4d94b956e
+%define tag 14ec43b998505b1294e300b1d1717cee901d5f02
 %define branch cms/master/%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/eigen-git-mirror.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

fftjet.spec

@@ -1,4 +1,5 @@
 ### RPM external fftjet 1.5.0
+## INCLUDE compilation_flags
 Source: http://www.hepforge.org/archive/fftjet/%n-%realversion.tar.gz
 Requires: fftw3
 
@@ -25,7 +26,7 @@ touch pkg-config ; chmod +x pkg-config
 ./configure $PLATF_CONF_OPTS --disable-dependency-tracking --enable-threads \
             --prefix=%i F77="$F77" CXX="$CXX" DEPS_CFLAGS=-I$FFTW3_ROOT/include \
 %ifarch ppc64le
-            CXXFLAGS="-O2 -mlong-double-64" \
+            CXXFLAGS="-O2 %{ppc64le_build_flags}" \
 %else
             CXXFLAGS="-O2" \
 %endif

fmt.spec

@@ -1,5 +1,5 @@
 ### RPM external fmt 7.0.1
-
+## INCLUDE compilation_flags
 Source: https://github.com/fmtlib/fmt/archive/%{realversion}.tar.gz
 BuildRequires: gmake cmake
 
@@ -15,7 +15,7 @@ cmake ../%{n}-%{realversion} \
     -DCMAKE_INSTALL_PREFIX:STRING=%{i} \
     -DCMAKE_INSTALL_LIBDIR:STRING=lib \
 %ifarch ppc64le
-    -DCMAKE_CXX_FLAGS="-mlong-double-64" \
+    -DCMAKE_CXX_FLAGS="%{ppc64le_build_flags}" \
 %endif
     -DBUILD_SHARED_LIBS=TRUE
 

geant4.spec

@@ -1,4 +1,5 @@
 ### RPM external geant4 10.7.1
+## INCLUDE compilation_flags
 %define tag %{realversion}
 %define branch geant4-10.7-release
 %define github_user Geant4
@@ -32,9 +33,9 @@ export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom
 cmake ../%{n}.%{realversion} \
   -DCMAKE_CXX_COMPILER="g++" \
 %ifarch ppc64le
-  -DCMAKE_CXX_FLAGS="-fPIC -mlong-double-64" \
-  -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC -mlong-double-64" \
-  -DCMAKE_STATIC_LIBRARY_C_FLAGS="-fPIC -mlong-double-64" \
+  -DCMAKE_CXX_FLAGS="-fPIC %{ppc64le_build_flags}" \
+  -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC %{ppc64le_build_flags}" \
+  -DCMAKE_STATIC_LIBRARY_C_FLAGS="-fPIC %{ppc64le_build_flags}" \
 %else
   -DCMAKE_CXX_FLAGS="-fPIC" \
   -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC" \

llvm-gcc-toolfile.spec

@@ -53,7 +53,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-cxxcompiler.xml
     <flags REM_CXXFLAGS="-mrecip"/>
     <flags REM_CXXFLAGS="-fno-crossjumping"/>
     <flags REM_CXXFLAGS="-fno-aggressive-loop-optimizations"/>
-    <flags REM_CXXFLAGS="-mlong-double-64"/>
     <flags REM_CXXFLAGS="-funroll-all-loops"/>
     <flags CXXFLAGS="-Wno-c99-extensions"/>
     <flags CXXFLAGS="-Wno-c++11-narrowing"/>

llvm.spec

@@ -1,4 +1,4 @@
-### RPM external llvm 11.1.0
+### RPM external llvm 12.0.0
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
 ## INITENV +PATH PYTHON27PATH %{i}/lib64/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python`echo $PYTHON3_VERSION | cut -d. -f 1,2`/site-packages
@@ -8,8 +8,8 @@ Requires: gcc zlib python python3
 Requires: cuda
 AutoReq: no
 
-%define llvmCommit 78a28e50771b942539061987e51a1a5b39554454
-%define llvmBranch cms/release/11.x/1fdec59
+%define llvmCommit 3c4c9e19d48816ffecc35cae4a410683746f7a48
+%define llvmBranch cms/release/12.x/d28af7c
 %define iwyuCommit 5db414ac448004fe019871c977905cb7c2cff23f
 %define iwyuBranch clang_11
 

pip/GitPython.file

@@ -1 +1 @@
-Requires: py2-gitdb2 py2-smmap2 py3-gitdb
+Requires: py3-smmap2 py3-gitdb

pip/Keras.file

@@ -1,2 +1,2 @@
-Requires: py2-PyYAML py2-six py2-scipy py2-Theano
+Requires: py2-PyYAML py2-six py2-scipy py3-Theano
 Requires: py2-h5py py3-keras-applications py3-keras-preprocessing

pip/Mako.file

@@ -1,2 +1,2 @@
-Requires: py2-MarkupSafe
+Requires: py3-MarkupSafe
 %define RelocatePython %{i}/bin/*

pip/Theano.file

@@ -1,3 +1,4 @@
 Requires: py2-scipy py2-six
 Requires: py3-scipy
-%define RelocatePython %{i}/bin/theano-nose %{i}/bin/theano-cache %{i}/bin/theano-test
+%define RelocatePython %{i}/bin/theano-*
+%define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/theano-*

pip/aiohttp.file

@@ -1 +1 @@
-Requires: py2-attrs py2-chardet py3-multidict py3-yarl py3-async-timeout py2-typing_extensions
+Requires: py2-attrs py3-chardet py3-multidict py3-yarl py3-async-timeout py2-typing_extensions

pip/argon2-cffi.file

@@ -1 +1 @@
-Requires: py2-cffi py2-six py2-enum34 py2-wheel
+Requires: py3-cffi py2-six py2-enum34 py2-wheel

pip/astroid.file

@@ -1,2 +1,2 @@
-Requires: py2-lazy-object-proxy py2-six py2-wrapt py2-enum34 py2-singledispatch py2-backports-functools_lru_cache
+Requires: py3-lazy-object-proxy py2-six py3-wrapt py2-enum34 py3-singledispatch py2-backports-functools_lru_cache
 Requires: py2-pytest-runner

pip/autopep8.file

@@ -1,2 +1,2 @@
-Requires: py2-pycodestyle py2-toml
+Requires: py3-pycodestyle py2-toml
 %define RelocatePython %{i}/bin/*

pip/avro.file

@@ -1,2 +1,2 @@
-Requires: py2-pycodestyle py2-isort
+Requires: py3-pycodestyle py3-isort
 %define RelocatePython %{i}/bin/*

pip/beautifulsoup4.file

@@ -1 +1 @@
-Requires: py2-soupsieve
+Requires: py3-soupsieve

pip/bokeh.file

@@ -1,3 +1,3 @@
-Requires: py2-tornado py2-pillow py2-PyYAML py2-python-dateutil py2-Jinja2 py2-numpy py2-packaging
+Requires: py2-pillow py2-PyYAML py3-python-dateutil py3-Jinja2 py2-numpy py2-packaging
 Requires: py3-tornado py3-numpy py3-pillow
 %define RelocatePython %{i}/bin/*

pip/climate.file

@@ -1,3 +1,3 @@
-Requires: py2-plac
+Requires: py3-plac
 %define source0 http://cmsrep.cern.ch/cmssw/download/climate-%{realversion}.tar.gz
 

pip/conan.file

@@ -1,3 +1,3 @@
-Requires: py2-python-dateutil py2-requests py3-PyJWT py2-tqdm py2-PyYAML py2-Jinja2 py3-Pygments py3-patch-ng py3-pluginbase
+Requires: py3-python-dateutil py3-requests py3-PyJWT py3-tqdm py2-PyYAML py3-Jinja2 py3-Pygments py3-patch-ng py3-pluginbase
 Requires: py3-fasteners py3-patch-ng py3-pluginbase py3-node-semver py3-distro py2-future py3-deprecation py3-bottle py2-colorama
 %define PipPostBuildPy3 sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/conan*

pip/downhill.file

@@ -1 +1 @@
-Requires: py2-Theano py3-Click
+Requires: py3-Theano py3-Click

pip/entrypoints.file

@@ -1,2 +1,2 @@
-Requires: py2-backports
+Requires: py2-backports py3-flit
 %define PipDownloadSourceType none

pip/fire.file

@@ -1 +1 @@
-Requires: py2-six py2-termcolor py2-enum34
+Requires: py2-six py3-termcolor py2-enum34

pip/flake8.file

@@ -1,2 +1,2 @@
-Requires: py2-backports py2-enum34 py2-mccabe py2-pycodestyle py2-pyflakes py2-entrypoints py2-functools32 py2-typing py2-importlib-metadata 
+Requires: py2-backports py2-enum34 py3-mccabe py3-pycodestyle py2-pyflakes py3-entrypoints py2-typing py2-importlib-metadata
 %define RelocatePython %{i}/bin/*

pip/flit.file

@@ -1 +1 @@
-Requires: py2-docutils py3-flit-core py3-pytoml py2-requests
+Requires: py3-docutils py3-flit-core py3-pytoml py3-requests

pip/fs.file

@@ -1,2 +1,2 @@
-Requires: py2-six py2-typing py2-appdirs py2-pytz py2-backports py2-enum34
+Requires: py2-six py2-typing py2-appdirs py3-pytz py2-backports py2-enum34
 %define RelocatePython %{i}/bin/*

pip/gitdb2.file

@@ -1 +1 @@
-Requires: py2-smmap2
+Requires: py3-smmap2

pip/hep_ml.file

@@ -1,2 +1,2 @@
-Requires: py2-pandas py2-scikit-learn py2-Theano
+Requires: py3-Theano
 Requires: py3-pandas py3-scikit-learn

pip/hyperopt.file

@@ -1,4 +1,4 @@
-Requires: py2-six py2-pymongo py2-nose py2-networkx py2-future py2-pymongo py2-scipy py2-tqdm
-Requires: py3-scipy py3-networkx py2-cloudpickle
+Requires: py2-six py2-nose py2-future py3-pymongo py2-scipy py3-tqdm
+Requires: py3-scipy py3-networkx py3-cloudpickle
 %define patchsrc sed -i -e 's|packages = None|packages = ["hyperopt"]|' setup.py
 %define RelocatePython %{i}/bin/*

pip/importlib-resources.file

@@ -1,3 +1,3 @@
-BuildRequires: py2-wheel
-Requires: py2-pathlib2 py2-contextlib2 py2-singledispatch py2-typing py2-zipp py2-importlib-metadata py3-zipp
+Requires: py2-wheel
+Requires: py2-pathlib2 py2-contextlib2 py3-singledispatch py2-typing py2-zipp py2-importlib-metadata py3-zipp
 

pip/ipykernel.file

@@ -1 +1 @@
-Requires: py3-ipython py3-jupyter_client py2-jedi py3-backcall
+Requires: py3-ipython py3-jupyter_client py3-jedi py3-backcall

pip/ipython.file

@@ -1 +1 @@
-Requires: py3-traitlets py2-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py2-simplegeneric py2-backports
+Requires: py3-traitlets py3-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py3-simplegeneric py2-backports

pip/jedi.file

@@ -1 +1 @@
-Requires: py2-parso
+Requires: py3-parso

pip/jsonschema.file

@@ -1,4 +1,4 @@
-Requires: py2-functools32 py2-repoze-lru py2-argparse py2-pyrsistent py3-pyrsistent
+Requires: py3-repoze-lru py2-argparse py2-pyrsistent py3-pyrsistent
 Requires: py2-attrs py2-six py2-importlib-metadata
 %define RelocatePython %{i}/bin/jsonschema
 

pip/jupyter_client.file

@@ -1,4 +1,4 @@
-Requires: py3-jupyter_core py2-tornado py2-python-dateutil py2-pyzmq
+Requires: py3-jupyter_core py3-python-dateutil py3-pyzmq
 Requires: py3-tornado
 %define RelocatePython %{i}/bin/*
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done

pip/llvmlite.file

@@ -2,6 +2,7 @@ Requires: llvm py2-wheel py2-enum34
 Patch0: py2-llvmlite-fpic-flag
 Patch1: py2-llvmlite-llvm9
 Patch2: py2-llvmlite-removeduplicate
+Patch3: py2-llvmlite-removeMethod
 
 %define source0 git+https://github.com/numba/llvmlite?obj=release0.35/v0.35.0&export=llvmlite-%{realversion}&output=/source.tar.gz
 %define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config

pip/luigi.file

@@ -1,4 +1,4 @@
-Requires: py2-tornado py3-tornado py3-python-daemon py2-python-dateutil py2-enum34
+Requires: py3-tornado py3-python-daemon py3-python-dateutil py2-enum34
 
 %define PipPostBuildPy2 (cd "%{i}/bin" && for f in *; do cp ${f} ${f}2; done)
 %define PipPostBuildPy3 (cd "%{i}/bin" && for f in *; do mv ${f} ${f}3; done)

pip/matplotlib.file

@@ -1,2 +1,2 @@
-Requires: py3-cycler py2-kiwisolver py2-pyparsing py2-python-dateutil py2-certifi
+Requires: py3-cycler py3-kiwisolver py2-pyparsing py3-python-dateutil py3-certifi
 Requires: zlib libpng freetype

pip/mock.file

@@ -1 +1 @@
-Requires: py2-six py2-funcsigs py2-pbr
+Requires: py2-six py2-funcsigs py3-pbr

pip/mpld3.file

@@ -1 +1 @@
-Requires: py2-Jinja2 py3-matplotlib
+Requires: py3-Jinja2 py3-matplotlib

pip/mplhep.file

@@ -1 +1 @@
-Requires: py3-numpy py3-matplotlib py3-scipy py2-requests py2-packaging
+Requires: py3-numpy py3-matplotlib py3-scipy py3-requests py2-packaging

pip/nbconvert.file

@@ -1,3 +1,3 @@
-Requires: py2-Jinja2 py3-Pygments py3-bleach py2-backports py2-defusedxml py2-entrypoints py2-mistune py2-pandocfilters py3-nbformat
-Requires: py3-testpath py2-testpath
+Requires: py3-Jinja2 py3-Pygments py3-bleach py2-backports py3-defusedxml py3-entrypoints py3-mistune py3-pandocfilters py3-nbformat
+Requires: py3-testpath
 %define RelocatePython %{i}/bin/jupyter-nbconvert

pip/nbdime.file

@@ -1,4 +1,4 @@
-Requires: py2-GitPython py2-requests py2-colorama py2-backports
+Requires: py3-GitPython py3-requests py2-colorama py2-backports
 Requires: py3-notebook py3-GitPython
 %define RelocatePython %{i}/bin/*
 

pip/networkx.file

@@ -1 +1 @@
-Requires: py2-decorator
+Requires: py3-decorator

pip/notebook.file

@@ -1,2 +1,2 @@
-Requires: py2-terminado py3-nbconvert py3-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client py2-argon2-cffi
+Requires: py3-terminado py3-nbconvert py3-ipykernel py3-Send2Trash py3-ipaddress py3-prometheus_client py3-argon2-cffi
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done

pip/pandas.file

@@ -1 +1 @@
-Requires: py2-six py2-python-dateutil py2-pytz py2-numpy py3-numpy py2-cython
+Requires: py2-six py3-python-dateutil py3-pytz py2-numpy py3-numpy py2-cython

pip/pexpect.file

@@ -1 +1 @@
-Requires: py2-ptyprocess
+Requires: py3-ptyprocess

pip/py2-matplotlib.file

@@ -1,4 +1,4 @@
-Requires: py2-pytz py2-backports py2-subprocess32 py2-numpy
+Requires: py3-pytz py2-backports py3-subprocess32 py2-numpy
 
 %define patchsrc \
 cat >> setup.cfg <<- EOF\

pip/py3-Jinja2.file

@@ -0,0 +1 @@
+Requires: py3-MarkupSafe

pip/py3-gitdb.file

@@ -1 +1 @@
-Requires: py2-smmap
+Requires: py3-smmap

pip/py3-ipython.file

@@ -1,2 +1,2 @@
-Requires: py2-jedi py3-prompt_toolkit py3-backcall
+Requires: py3-jedi py3-prompt_toolkit py3-backcall
 %define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython ; sed -i -e 's| %{cmsroot}/.*python3 | python3 |' %{i}/bin/*3

pip/py3-keras2onnx.file

@@ -1,2 +1,2 @@
-Requires:  py3-numpy py2-protobuf py2-requests py2-onnx py3-onnxconverter-common py3-fire
+Requires: py3-numpy py2-protobuf py3-requests py2-onnx py3-onnxconverter-common py3-fire
 %define source0 https://github.com/onnx/keras-onnx/archive/v%{realversion}.tar.gz

pip/py3-numba.file

@@ -1,2 +1,2 @@
-Requires: py2-funcsigs py2-six py2-singledispatch py3-llvmlite py3-numpy python3
+Requires: py2-funcsigs py2-six py3-singledispatch py3-llvmlite py3-numpy python3
 %define RelocatePython %{i}/bin/*

pip/py3-tables.file

@@ -1,2 +1,2 @@
-Requires: py2-numexpr py2-six hdf5 bz2lib py2-mock py3-numpy
+Requires: py3-numexpr py2-six hdf5 bz2lib py3-mock py3-numpy
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done

pip/py3-tensorflow.file

@@ -1,4 +1,4 @@
-Requires: py3-tensorboard py3-opt-einsum py2-tensorflow-estimator py2-wrapt py2-google-pasta py3-scipy
-BuildRequires: tensorflow-sources
+Requires: py3-tensorboard py3-opt-einsum py3-tensorflow-estimator py3-wrapt py3-google-pasta py3-scipy
+Requires: tensorflow-sources
 %define PipPreBuildPy3 PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp38-cp38-linux_%{_arch}.whl
 %define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'

pip/pycuda.file

@@ -1 +1 @@
-Requires: py2-numpy py3-numpy cuda py3-pytools py2-pytest py2-decorator py2-appdirs py3-Mako
+Requires: py2-numpy py3-numpy cuda py3-pytools py2-pytest py3-decorator py2-appdirs py3-Mako

pip/pylint.file

@@ -1 +1 @@
-Requires: py2-astroid py2-six py2-isort py2-mccabe py2-configparser
+Requires: py3-astroid py2-six py3-isort py3-mccabe py2-configparser

pip/pysqlite3.file

@@ -0,0 +1,2 @@
+Requires: sqlite
+%define patchsrc sed -i -e "s|^include_dirs *=.*|include_dirs=$SQLITE_ROOT/include|;s|^library_dirs *=.*|library_dirs=$SQLITE_ROOT/lib|" setup.cfg

pip/python-daemon.file

@@ -1 +1 @@
-Requires: py2-wheel py2-docutils py3-lockfile
+Requires: py2-wheel py3-docutils py3-lockfile

pip/python-ldap.file

@@ -1,2 +1,2 @@
-Requires: python openldap py2-pyasn1-modules
+Requires: python openldap py3-pyasn1-modules
 %define PipBuildOptions --global-option=build_ext --global-option="-L${PYTHON_ROOT}/lib" --global-option="-L${OPENLDAP_ROOT}/lib" --global-option="-I${PYTHON_ROOT}/include" --global-option="-I${OPENLDAP_ROOT}/include"  --global-option="-UHAVE_SASL"

pip/pytools.file

@@ -1 +1 @@
-Requires: py2-decorator py2-appdirs py2-six py2-numpy py3-numpy
+Requires: py3-decorator py2-appdirs py2-six py2-numpy py3-numpy

pip/qtconsole.file

@@ -1,2 +1,2 @@
-Requires: py3-ipykernel py2-QtPy
+Requires: py3-ipykernel py3-QtPy
 %define RelocatePython %{i}/bin/jupyter-qtconsole