pyparsing 2.0.1 and six 1.9.0

Former-commit-id: ca15bbcb1ed28f29b85b92d615a85380f76592a1 [formerly b77e15ce03]
Former-commit-id: 755e8a07fb

pythonPackages/six

@@ -1 +0,0 @@
-Subproject commit 30b8641f5b25e095c1f7ca1c8b82b3c0f9925f48

rpms/build/common/lookupRPM.sh

@@ -102,6 +102,10 @@ function lookupRPM()
       export RPM_SPECIFICATION="${python_site__dir}/Installer.scipy"
       return 0
    fi
+   if [ "${1}" = "awips2-python-pyparsing" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.pyparsing"
+      return 0
+   fi
    if [ "${1}" = "awips2-python-metpy" ]; then
       export RPM_SPECIFICATION="${python_site__dir}/Installer.metpy"
       return 0

rpms/build/x86_64/build.sh

@@ -123,7 +123,7 @@ if [ "${1}" = "-python" ]; then
    #buildRPM "awips2-python-dynamicserialize"
    #buildRPM "awips2-python-h5py"
    #buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
+   #buildRPM "awips2-python-matplotlib"
    #buildRPM "awips2-python-nose"
    #buildRPM "awips2-python-cython"
    #buildRPM "awips2-python-six"
@@ -135,6 +135,7 @@ if [ "${1}" = "-python" ]; then
    #buildRPM "awips2-python-qpid"
    #buildRPM "awips2-python-scientific"
    #buildRPM "awips2-python-scipy"
+   buildRPM "awips2-python-pyparsing"
    #buildRPM "awips2-python-pint"
    #buildRPM "awips2-python-metpy"
    #buildRPM "awips2-python-tables"

rpms/python.site-packages/Installer.pyparsing/component.spec

@@ -0,0 +1,118 @@
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+%define _build_arch %(uname -i)
+%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
+%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#
+# AWIPS II Python pyparsing Spec File
+#
+Name: awips2-python-pyparsing
+Summary: AWIPS II Python pyparsing Distribution
+Version: 2.0.1
+Release: 1
+Group: AWIPSII
+BuildRoot: %{_build_root}
+BuildArch: %{_build_arch}
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Unidata
+Packager: Michael James
+
+AutoReq: no
+requires: compat-libf2c-34(x86-64) >= 3.4.6-19.el6
+requires: libgfortran(x86-64) >= 4.4.7-3.el6
+requires: awips2-python
+requires: awips2-python-nose
+provides: awips2-python-pyparsing
+
+%description
+AWIPS II Python pyparsing Site-Package
+
+%prep
+# Verify That The User Has Specified A BuildRoot.
+if [ "%{_build_root}" = "" ]
+then
+   echo "A Build Root has not been specified."
+   echo "Unable To Continue ... Terminating"
+   exit 1
+fi
+
+rm -rf %{_build_root}
+mkdir -p %{_build_root}
+if [ -d %{_python_build_loc} ]; then
+   rm -rf %{_python_build_loc}
+fi
+mkdir -p %{_python_build_loc}
+
+%build
+PYPARSING_SRC_DIR="%{_python_pkgs_dir}/pyparsing"
+PYPARSING_TAR="pyparsing-2.0.1.tar.gz"
+cp -v ${PYPARSING_SRC_DIR}/${PYPARSING_TAR} \
+   %{_python_build_loc}
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null
+cd %{_python_build_loc}
+tar -xvf ${PYPARSING_TAR}
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+rm -fv ${PYPARSING_TAR}
+if [ ! -d pyparsing-2.0.1 ]; then
+   file pyparsing-2.0.1
+   exit 1
+fi
+source /etc/profile.d/awips2Python.sh
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+cd pyparsing-2.0.1
+/awips2/python/bin/python setup.py clean
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi 
+/awips2/python/bin/python setup.py build
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null
+
+%install
+PYPARSING_SRC_DIR="%{_python_pkgs_dir}/pyparsing"
+
+pushd . > /dev/null
+cd %{_python_build_loc}/pyparsing-2.0.1
+export LD_LIBRARY_PATH=/awips2/python/lib
+/awips2/python/bin/python setup.py install \
+   --root=%{_build_root} \
+   --prefix=/awips2/python
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null
+
+%pre
+
+%post
+
+%preun
+
+%postun
+
+%clean
+rm -rf %{_build_root}
+rm -rf %{_python_build_loc}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%dir /awips2/python/lib/python2.7/site-packages
+/awips2/python/lib/python2.7/site-packages/*

rpms/python.site-packages/Installer.six/component.spec

@@ -20,7 +20,10 @@ Vendor: Unidata
 Packager: Michael James
 
 AutoReq: no
+requires: compat-libf2c-34(x86-64) >= 3.4.6-19.el6
+requires: libgfortran(x86-64) >= 4.4.7-3.el6
 requires: awips2-python
+requires: awips2-python-nose
 provides: awips2-python-six
 
 %description
@@ -43,46 +46,50 @@ fi
 mkdir -p %{_python_build_loc}
 
 %build
-SCIPY_SRC_DIR="%{_python_pkgs_dir}/six"
-
-cp -rv ${SCIPY_SRC_DIR}/* \
+SIX_SRC_DIR="%{_python_pkgs_dir}/six"
+SIX_TAR="six-1.9.0.tar.gz"
+cp -v ${SIX_SRC_DIR}/${SIX_TAR} \
    %{_python_build_loc}
 RC=$?
 if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 
-export BLAS=/awips2/python/lib
-export LAPACK=/awips2/python/lib
+pushd . > /dev/null
+cd %{_python_build_loc}
+tar -xvf ${SIX_TAR}
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi
+rm -fv ${SIX_TAR}
+if [ ! -d six-1.9.0 ]; then
+   file six-1.9.0
+   exit 1
+fi
 source /etc/profile.d/awips2Python.sh
 RC=$?
 if [ ${RC} -ne 0 ]; then
    exit 1
 fi
-
-pushd . > /dev/null
-cd %{_python_build_loc}
-export LD_LIBRARY_PATH=/awips2/python/lib
+cd six-1.9.0
+/awips2/python/bin/python setup.py clean
+RC=$?
+if [ ${RC} -ne 0 ]; then
+   exit 1
+fi 
 /awips2/python/bin/python setup.py build
 RC=$?
 if [ ${RC} -ne 0 ]; then
-   # Try to build a second time. It seems to work
-   # for some reason.
-   /awips2/python/bin/python setup.py build
-   RC=$?
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
+   exit 1
 fi
 popd > /dev/null
 
 %install
-
-export BLAS=/awips2/python/lib
-export LAPACK=/awips2/python/lib
+SIX_SRC_DIR="%{_python_pkgs_dir}/six"
 
 pushd . > /dev/null
-cd %{_python_build_loc}
+cd %{_python_build_loc}/six-1.9.0
 export LD_LIBRARY_PATH=/awips2/python/lib
 /awips2/python/bin/python setup.py install \
    --root=%{_build_root} \
@@ -93,6 +100,14 @@ if [ ${RC} -ne 0 ]; then
 fi
 popd > /dev/null
 
+%pre
+
+%post
+
+%preun
+
+%postun
+
 %clean
 rm -rf %{_build_root}
 rm -rf %{_python_build_loc}