Merge pull request #1862 from degano/matplotlib_updt_76X

Update matplotlib to version 1.4.3. Add py2-six py2-pyparsing required.

cmssw-tool-conf.spec

@@ -148,6 +148,8 @@ Requires: gdb-toolfile
 Requires: py2-pytz-toolfile
 Requires: file-toolfile
 Requires: libxslt-toolfile
+Requires: py2-six-toolfile
+Requires: py2-pyparsing-toolfile
 
 # Only for Linux platform.
 %if %islinux

py2-matplotlib.spec

@@ -1,19 +1,19 @@
-### RPM external py2-matplotlib 1.2.1
+### RPM external py2-matplotlib 1.4.3
 ## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
 %define realname matplotlib
 Source: https://downloads.sourceforge.net/project/%{realname}/%{realname}/%{realname}-%{realversion}/%{realname}-%{realversion}.tar.gz
-Requires: py2-pytz py2-numpy py2-python-dateutil zlib libpng freetype
+Requires: py2-pytz py2-numpy py2-python-dateutil py2-six py2-pyparsing zlib libpng freetype
 
 %prep
 %setup -n %{realname}-%{realversion}
 
 cat >> setup.cfg <<- EOF
 [build_ext]
-include_dirs = ${FREETYPE_ROOT}/include/freetype2:${FREETYPE_ROOT}/include:${LIBPNG_ROOT}/include:${ZLIB_ROOT}/include:/usr/X11R6/include:/usr/X11R6/include/freetype2
-library_dirs = ${FREETYPE_ROOT}/lib:${LIBPNG_ROOT}/lib:${ZLIB_ROOT}/lib:/usr/X11R6/lib
+include_dirs = ${FREETYPE_ROOT}/include/freetype2,${FREETYPE_ROOT}/include,${LIBPNG_ROOT}/include,${ZLIB_ROOT}/include
+library_dirs = ${FREETYPE_ROOT}/lib,${LIBPNG_ROOT}/lib,${ZLIB_ROOT}/lib
 
 [directories]
-basedirlist  = ${FREETYPE_ROOT}:${FREETYPE_ROOT}:${LIBPNG_ROOT}:${ZLIB_ROOT}:/usr/X11R6
+basedirlist  = ${FREETYPE_ROOT},${FREETYPE_ROOT},${LIBPNG_ROOT},${ZLIB_ROOT}
 
 [gui_support]
 gtk = False
@@ -30,7 +30,7 @@ chmod +x no-pkg-config/pkg-config
 %build
 export MPLCONFIGDIR=$PWD/no-pkg-config
 PATH=$PWD/no-pkg-config:$PATH \
-python setup.py build 
+python setup.py build
 
 %install
 python -c 'import numpy'
@@ -40,7 +40,7 @@ PATH=$PWD/no-pkg-config:$PATH \
 # in a scratch area.
 export MPLCONFIGDIR=$PWD/no-pkg-config
 
-python setup.py install --prefix=%i
+python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%i
 find %i -name '*.egg-info' -exec rm {} \;
 
 # No need for test files

py2-pyparsing-toolfile.spec

@@ -0,0 +1,23 @@
+### RPM external py2-pyparsing-toolfile 1.0
+Requires: py2-pyparsing
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-pyparsing.xml
+<tool name="py2-pyparsing" version="@TOOL_VERSION@">
+  <info url="https://pyparsing.wikispaces.com/"/>
+  <client>
+    <environment name="PY2_PYPARSING" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY2_PYPARSING/lib"/>
+    <runtime name="PYTHONPATH" value="$PY2_PYPARSING/lib/python@PYTHONV@/site-packages" type="path"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post

py2-pyparsing.spec

@@ -0,0 +1,17 @@
+### RPM external py2-pyparsing 2.0.3
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+%define my_name %(echo %n | cut -f2 -d-)
+Source: http://downloads.sourceforge.net/project/%{my_name}/%{my_name}/%{my_name}-%{realversion}/%{my_name}-%{realversion}.zip
+Requires: python
+BuildRequires: py2-setuptools
+
+%prep
+%setup -n %{my_name}-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python -c 'import setuptools; print(setuptools.__file__)'
+python setup.py install --skip-build --prefix=%{i}
+find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -type d -print0 | xargs -0 rm -rf

py2-six-toolfile.spec

@@ -0,0 +1,23 @@
+### RPM external py2-six-toolfile 1.0
+Requires: py2-six
+%prep
+
+%build
+
+%install
+
+mkdir -p %{i}/etc/scram.d
+cat << \EOF_TOOLFILE >%{i}/etc/scram.d/py2-six.xml
+<tool name="py2-six" version="@TOOL_VERSION@">
+  <info url="https://pypi.python.org/pypi/six"/>
+  <client>
+    <environment name="PY2_SIX" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$PY2_SIX/lib"/>
+    <runtime name="PYTHONPATH" value="$PY2_SIX/lib/python@PYTHONV@/site-packages" type="path"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
+
+## IMPORT scram-tools-post

py2-six.spec

@@ -0,0 +1,17 @@
+### RPM external py2-six 1.9.0
+## INITENV +PATH PYTHONPATH %{i}/$PYTHON_LIB_SITE_PACKAGES
+%define my_name %(echo %n | cut -f2 -d-)
+Source: https://pypi.python.org/packages/source/s/six/%{my_name}-%{realversion}.tar.gz
+Requires: python
+BuildRequires: py2-setuptools
+
+%prep
+%setup -n %{my_name}-%{realversion}
+
+%build
+python setup.py build
+
+%install
+python -c 'import setuptools; print(setuptools.__file__)'
+python setup.py install --single-version-externally-managed --record=/dev/null --skip-build --prefix=%{i}
+find %{i}/${PYTHON_LIB_SITE_PACKAGES} -name '*.egg-info' -type d -print0 | xargs -0 rm -rf