numpy->1.9.2, cython 0.22.1 added for rpm build

Former-commit-id: f89120af6b [formerly 53c4a138c9]
Former-commit-id: e6133124ac
This commit is contained in:
AWIPS User 2015-08-01 16:06:25 -06:00
parent 375ca58d7d
commit 1746b74950
6 changed files with 154 additions and 29 deletions

Binary file not shown.

View file

@ -55,7 +55,7 @@ function lookupRPM()
return 0
fi
if [ "${1}" = "awips2-python-matplotlib" ]; then
export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.2.0/"
export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.4.3/"
return 0
fi
if [ "${1}" = "awips2-python-nose" ]; then
@ -66,6 +66,10 @@ function lookupRPM()
export RPM_SPECIFICATION="${python_site__dir}/Installer.numpy"
return 0
fi
if [ "${1}" = "awips2-python-cython" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.cython"
return 0
fi
if [ "${1}" = "awips2-python-pil" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.pil"
return 0
@ -119,7 +123,7 @@ function lookupRPM()
return 0
fi
if [ "${1}" = "awips2-python-shapely" ]; then
export RPM_SPECIFICATION="${installer_dir}/shapely-1.4.4/"
export RPM_SPECIFICATION="${installer_dir}/shapely-1.5.9/"
return 0
fi

View file

@ -118,29 +118,30 @@ if [ "${1}" = "-WA" ]; then
fi
if [ "${1}" = "-python" ]; then
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-nose"
#buildRPM "awips2-python"
#buildRPM "awips2-python-cherrypy"
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-h5py"
#buildRPM "awips2-python-jimporter"
#buildRPM "awips2-python-matplotlib"
#buildRPM "awips2-python-nose"
buildRPM "awips2-python-cython"
buildRPM "awips2-python-numpy"
buildRPM "awips2-python-pil"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-pupynere"
#buildRPM "awips2-python-pil"
#buildRPM "awips2-python-pmw"
#buildRPM "awips2-python-pupynere"
#buildRPM "awips2-python-qpid"
buildRPM "awips2-python-scientific"
#buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-ufpy"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
buildRPM "awips2-python-shapely"
buildRPM "awips2-notification"
#buildRPM "awips2-python-tables"
#buildRPM "awips2-python-thrift"
#buildRPM "awips2-python-tpg"
#buildRPM "awips2-python-ufpy"
#buildRPM "awips2-python-werkzeug"
#buildRPM "awips2-python-pygtk"
#buildRPM "awips2-python-pycairo"
#buildRPM "awips2-python-shapely"
#buildRPM "awips2-notification"
exit 0
fi

View file

@ -0,0 +1,120 @@
%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 cython Spec File
#
Name: awips2-python-cython
Summary: AWIPS II Python cython Distribution
Version: 0.22.1
Release: 1
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}
URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
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
provides: awips2-python-cython
%description
AWIPS II Python Cython 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
CYTHON_SRC_DIR="%{_python_pkgs_dir}/cython"
CYTHON_TAR="Cython-0.22.1.tar.gz"
cp -v ${CYTHON_SRC_DIR}/${CYTHON_TAR} \
%{_python_build_loc}
RC=$?
if [ ${RC} -ne 0 ]; then
exit 1
fi
pushd . > /dev/null
cd %{_python_build_loc}
tar -xvf ${CYTHON_TAR}
RC=$?
if [ ${RC} -ne 0 ]; then
exit 1
fi
rm -fv ${CYTHON_TAR}
if [ ! -d Cython-0.22.1 ]; then
file Cython-0.22.1
exit 1
fi
source /etc/profile.d/awips2Python.sh
RC=$?
if [ ${RC} -ne 0 ]; then
exit 1
fi
cd Cython-0.22.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
CYTHON_SRC_DIR="%{_python_pkgs_dir}/cython"
pushd . > /dev/null
cd %{_python_build_loc}/Cython-0.22.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/*
%defattr(755,awips,fxalpha,755)
%dir /awips2/python/bin
/awips2/python/bin/*

View file

@ -8,7 +8,7 @@
#
Name: awips2-python-numpy
Summary: AWIPS II Python numpy Distribution
Version: 1.5.0
Version: 1.9.2
Release: 3
Group: AWIPSII
BuildRoot: %{_build_root}
@ -47,7 +47,7 @@ mkdir -p %{_python_build_loc}
%build
NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy"
NUMPY_TAR="numpy-1.5.0.tar.gz"
NUMPY_TAR="numpy-1.9.2.tar.gz"
NUMPY_PATCH="numpy.patch1"
cp -v ${NUMPY_SRC_DIR}/${NUMPY_TAR} \
%{_python_build_loc}
@ -70,8 +70,8 @@ if [ ${RC} -ne 0 ]; then
exit 1
fi
rm -fv ${NUMPY_TAR}
if [ ! -d numpy-1.5.0 ]; then
file numpy-1.5.0
if [ ! -d numpy-1.9.2 ]; then
file numpy-1.9.2
exit 1
fi
source /etc/profile.d/awips2Python.sh
@ -79,7 +79,7 @@ RC=$?
if [ ${RC} -ne 0 ]; then
exit 1
fi
cd numpy-1.5.0
cd numpy-1.9.2
# Apply the patch
patch -p1 -i ../${NUMPY_PATCH}
RC=$?
@ -102,7 +102,7 @@ popd > /dev/null
NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy"
pushd . > /dev/null
cd %{_python_build_loc}/numpy-1.5.0
cd %{_python_build_loc}/numpy-1.9.2
export LD_LIBRARY_PATH=/awips2/python/lib
/awips2/python/bin/python setup.py install \
--root=%{_build_root} \

View file

@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="14.4.1"
export BUILD_NUMBER="4"
export BUILD_NUMBER="6"
export AWIPSII_RELEASE="2n${BUILD_NUMBER}"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"