cleanup and migration towards pip of existing python tools

cms-sw · Mar 23, 2017 · a306037 · a306037
1 parent 0e2ddea
commit a306037
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 349 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -92,9 +92,7 @@ Requires: py2-sqlalchemy-toolfile
 Requires: py2-pygithub-toolfile
 Requires: py2-dablooms-toolfile
 Requires: py2-dxr-toolfile
-Requires: py2-pysqlite-toolfile
 Requires: py2-PyYAML-toolfile
-Requires: py2-root_numpy-toolfile
 Requires: py2-h5py-toolfile
 Requires: hdf5-toolfile
 Requires: rivet-toolfile

diff --git a/formencode.patch b/formencode.patch
diff --git a/photospline-toolfile.spec b/photospline-toolfile.spec
@@ -20,7 +20,6 @@ cat << \EOF_TOOLFILE >%{i}/etc/scram.d/photospline.xml
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <use name="root_cxxdefaults"/>
   <use name="py2-matplotlib"/>
-  <use name="py2-pyfits"/>
   <use name="gsl"/>
   <use name="lapack"/>
 </tool>

diff --git a/py2-cheetah.spec b/py2-cheetah.spec
diff --git a/py2-formencode.spec b/py2-formencode.spec
diff --git a/py2-nose-toolfile.spec b/py2-nose-toolfile.spec
diff --git a/py2-nose.spec b/py2-nose.spec
@@ -1,17 +1,9 @@
 ### RPM external py2-nose 1.3.7
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
-%define my_name %(echo %n | cut -f2 -d-)
-Source: https://pypi.python.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-%{realversion}.tar.gz 
-Requires: python
-BuildRequires: py2-setuptools
 
-%prep
-%setup -n %{my_name}-%{realversion}
 
-%build
-python setup.py build
+%define pip_name nose
 
-%install
-python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
-perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/nosetests-2.7 %{i}/bin/nosetests
+
+## IMPORT build-with-pip
 
diff --git a/py2-pil.spec b/py2-pil.spec
diff --git a/py2-pippkgs.spec b/py2-pippkgs.spec
@@ -77,6 +77,9 @@ BuildRequires: py2-mpmath
 BuildRequires: py2-sympy
 BuildRequires: py2-tqdm
 BuildRequires: py2-funcsigs
+BuildRequires: py2-nose
+BuildRequires: py2-pkgconfig
+BuildRequires: py2-pysqlite
 
 %prep
 

diff --git a/py2-pippkgs_depscipy.spec b/py2-pippkgs_depscipy.spec
@@ -21,6 +21,7 @@ BuildRequires: py2-numexpr
 BuildRequires: py2-deepdish
 BuildRequires: py2-histogrammar
 BuildRequires: py2-pandas
+BuildRequires: py2-root_numpy
 
 %prep
 

diff --git a/py2-pkgconfig-toolfile.spec b/py2-pkgconfig-toolfile.spec
diff --git a/py2-pkgconfig.spec b/py2-pkgconfig.spec
@@ -1,16 +1,9 @@
-### RPM external py2-pkgconfig 1.1.0
+### RPM external py2-pkgconfig 1.2.2
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 
-Source: https://pypi.python.org/packages/87/35/4af9634270c00e3411cf951b7e0ea796c262922357cfc7609a86d31f072b/pkgconfig-1.1.0.tar.gz
-BuildRequires: py2-setuptools
-Requires: python py2-nose
 
-%prep
-%setup -n pkgconfig-%{realversion}
+%define pip_name pkgconfig
+Requires: py2-nose
 
-%build
-python setup.py build
-
-%install
-python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
+## IMPORT build-with-pip
 
diff --git a/py2-pycrypto.spec b/py2-pycrypto.spec
diff --git a/py2-pyfits-toolfile.spec b/py2-pyfits-toolfile.spec
diff --git a/py2-pyfits.spec b/py2-pyfits.spec
diff --git a/py2-pyopenssl.spec b/py2-pyopenssl.spec
diff --git a/py2-pysqlite-toolfile.spec b/py2-pysqlite-toolfile.spec
diff --git a/py2-pysqlite.spec b/py2-pysqlite.spec
@@ -1,12 +1,11 @@
-### RPM external py2-pysqlite 2.8.1
-## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES
-Source: https://pypi.python.org/packages/source/p/pysqlite/pysqlite-%realversion.tar.gz
-Requires: python sqlite py2-setuptools
-
-%prep
-%setup -n pysqlite-%realversion
-%build
-echo "include_dirs=$SQLITE_ROOT/include" >> setup.cfg
-python setup.py build
-%install
-python setup.py install --prefix=%i
+### RPM external py2-pysqlite 2.8.3
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+
+
+%define pip_name pysqlite
+Requires: sqlite py2-setuptools 
+%define PipPreBuild tar xfz pysqlite-%{realversion}.tar.gz;rm pysqlite-%{realversion}.tar.gz;echo "include_dirs=$SQLITE_ROOT/include">>pysqlite-%{realversion}/setup.cfg;tar cfz pysqlite-%{realversion}.tar.gz pysqlite-%{realversion}
+#echo "include_dirs=$SQLITE_ROOT/include"\>\>pysqlite-2.8.3/setup.cfg;
+
+## IMPORT build-with-pip
+
diff --git a/py2-root_numpy-toolfile.spec b/py2-root_numpy-toolfile.spec