pint 0.7.2 and six 1.10.0

pythonPackages/pint

@@ -0,0 +1 @@
+Subproject commit b2287c5e0f345bcc691d158324b2abeddbb51962

rpms/build/common/lookupRPM.sh

@@ -102,6 +102,18 @@ function lookupRPM()
       export RPM_SPECIFICATION="${python_site__dir}/Installer.pint"
       return 0
    fi
+   if [ "${1}" = "awips2-python-six" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.six"
+      return 0
+   fi
+   if [ "${1}" = "awips2-python-cython" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.cython"
+      return 0
+   fi
+   if [ "${1}" = "awips2-python-dateutil" ]; then
+      export RPM_SPECIFICATION="${python_site__dir}/Installer.dateutil"
+      return 0
+   fi
 
 
    if [ "${1}" = "awips2-python-tables" ]; then

rpms/build/common/usage.sh

@@ -13,6 +13,7 @@ function usage()
    echo "   -edex     only build the EDEX rpms."
    echo "   -shp      only build the EDEX shapefile rpm."
    echo "   -python   build Python rpms."
+   echo "   -pydev    build additional Python rpms."
    echo "   -qpid     build only the QPID rpms."
    echo "   -ldm      build the awips2-ldm rpm; requires root privileges."
    echo "   -upc      build the awips2-edex-upc rpm."

rpms/build/x86_64/build.sh

@@ -117,7 +117,25 @@ if [ "${1}" = "-WA" ]; then
 	exit 0
 fi
 
+if [ "${1}" = "-pydev" ]; then
+   buildRPM "awips2-python-six"
+   #buildRPM "awips2-python-cython"
+   #buildRPM "awips2-python-dateutil"
+   #buildRPM "awips2-python-metpy"
+
+   #buildRPM "awips2-python-numpy"
+   #buildRPM "awips2-python-scipy"
+   #buildRPM "awips2-python-matplotlib"
+
+   # DONE
+   #buildRPM "awips2-python-pint"
+   exit 0
+
+fi
+
 if [ "${1}" = "-python" ]; then
+   buildRPM "awips2-python-pint"
+   
    buildRPM "awips2-python"
    buildRPM "awips2-python-h5py"
    buildRPM "awips2-python-qpid"
@@ -127,9 +145,6 @@ if [ "${1}" = "-python" ]; then
    buildRPM "awips2-python-jimporter"
    buildRPM "awips2-python-matplotlib"
    buildRPM "awips2-python-nose"
-   #buildRPM "awips2-python-cython"
-   #buildRPM "awips2-python-six"
-   #buildRPM "awips2-python-dateutil"
    buildRPM "awips2-python-numpy"
    buildRPM "awips2-python-pil"
    buildRPM "awips2-python-pmw"
@@ -138,8 +153,6 @@ if [ "${1}" = "-python" ]; then
    buildRPM "awips2-python-scientific"
    buildRPM "awips2-python-scipy"
    buildRPM "awips2-python-pyparsing"
-   buildRPM "awips2-python-pint"
-   #buildRPM "awips2-python-metpy"
    buildRPM "awips2-python-tables"
    buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-tpg"

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

@@ -7,8 +7,8 @@
 # AWIPS II Python pint Spec File
 #
 Name: awips2-python-pint
-Summary: AWIPS II Python pint Distribution
-Version: 0.6
+Summary: AWIPS II Python Pint Distribution
+Version: 0.7.2
 Release: 1
 Group: AWIPSII
 BuildRoot: %{_build_root}
@@ -24,7 +24,7 @@ requires: awips2-python
 provides: awips2-python-pint
 
 %description
-AWIPS II Python pint Site-Package
+AWIPS II Python Pint
 
 %prep
 # Verify That The User Has Specified A BuildRoot.
@@ -43,9 +43,9 @@ fi
 mkdir -p %{_python_build_loc}
 
 %build
-SCIPY_SRC_DIR="%{_python_pkgs_dir}/pint"
+PINT_SRC_DIR="%{_python_pkgs_dir}/pint"
 
-cp -rv ${SCIPY_SRC_DIR}/* \
+cp -rv ${PINT_SRC_DIR}/* \
    %{_python_build_loc}
 RC=$?
 if [ ${RC} -ne 0 ]; then

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

@@ -1,5 +1,6 @@
 %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 _version 1.10.0
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -8,7 +9,7 @@
 #
 Name: awips2-python-six
 Summary: AWIPS II Python six Distribution
-Version: 1.9.0
+Version: %{_version}
 Release: 1
 Group: AWIPSII
 BuildRoot: %{_build_root}
@@ -47,7 +48,7 @@ mkdir -p %{_python_build_loc}
 
 %build
 SIX_SRC_DIR="%{_python_pkgs_dir}/six"
-SIX_TAR="six-1.9.0.tar.gz"
+SIX_TAR="six-%{_version}.tar.gz"
 cp -v ${SIX_SRC_DIR}/${SIX_TAR} \
    %{_python_build_loc}
 RC=$?
@@ -63,8 +64,8 @@ if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 rm -fv ${SIX_TAR}
-if [ ! -d six-1.9.0 ]; then
-   file six-1.9.0
+if [ ! -d six-%{_version} ]; then
+   file six-%{_version}
    exit 1
 fi
 source /etc/profile.d/awips2.sh
@@ -72,7 +73,7 @@ RC=$?
 if [ ${RC} -ne 0 ]; then
    exit 1
 fi
-cd six-1.9.0
+cd six-%{_version}
 /awips2/python/bin/python setup.py clean
 RC=$?
 if [ ${RC} -ne 0 ]; then
@@ -89,7 +90,7 @@ popd > /dev/null
 SIX_SRC_DIR="%{_python_pkgs_dir}/six"
 
 pushd . > /dev/null
-cd %{_python_build_loc}/six-1.9.0
+cd %{_python_build_loc}/six-%{_version}
 export LD_LIBRARY_PATH=/awips2/python/lib
 /awips2/python/bin/python setup.py install \
    --root=%{_build_root} \