xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scipy 0.15 addback

Browse source
This commit is contained in:
mjames-upc 2018-07-05 11:53:56 -06:00
parent c0d75f4070
commit 110a765273
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dist/comps.xml vendored
View file

@ -15,8 +15,9 @@
<packagereq type="default">awips2-python</packagereq>
<packagereq type="default">awips2-python-cython</packagereq>
<packagereq type="default">awips2-python-dateutil</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-h5py</packagereq>
<packagereq type="default">awips2-python-jep</packagereq>
<packagereq type="default">awips2-python-numpy</packagereq>
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
@ -62,6 +63,7 @@
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-setuptools</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
@ -101,6 +103,7 @@
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
@ -120,7 +123,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">awips2</packagereq>
<packagereq type="default">awips2-cli</packagereq>
<packagereq type="default">awips2-common-base</packagereq>
<packagereq type="default">awips2-database</packagereq>
<packagereq type="default">awips2-data.gfe</packagereq>
@ -156,6 +158,7 @@
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
@ -177,7 +180,6 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">awips2</packagereq>
<packagereq type="default">awips2-cli</packagereq>
<packagereq type="default">awips2-common-base</packagereq>
<packagereq type="default">awips2-database</packagereq>
<packagereq type="default">awips2-data.gfe</packagereq>
@ -214,6 +216,7 @@
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-qpid</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>
@ -248,6 +251,7 @@
<packagereq type="default">awips2-python-pyparsing</packagereq>
<packagereq type="default">awips2-python-pytz</packagereq>
<packagereq type="default">awips2-python-scientific</packagereq>
<packagereq type="default">awips2-python-scipy</packagereq>
<packagereq type="default">awips2-python-shapely</packagereq>
<packagereq type="default">awips2-python-six</packagereq>
<packagereq type="default">awips2-python-tables</packagereq>

4
rpms/build/common/lookupRPM.sh
View file

@ -85,6 +85,10 @@ function lookupRPM()
export RPM_SPECIFICATION="${installer_dir}/scientific"
return 0
fi
if [ "${1}" = "awips2-python-scipy" ]; then
export RPM_SPECIFICATION="${installer_dir}/scipy"
return 0
fi
if [ "${1}" = "awips2-python-tables" ]; then
export RPM_SPECIFICATION="${installer_dir}/tables"
return 0

3
rpms/build/x86_64/build.sh
View file

@ -103,6 +103,7 @@ function build_python() {
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-shapely"
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-cycler"
@ -126,8 +127,8 @@ function build_server() {
buildRPM "awips2"
buildRPM "awips2-ldm"
buildRPM "awips2-tools"
buildRPM "awips2-gfesuite"
build_pypies
buildRPM "awips2-data.gfe"
buildLocalization
}
function build_ade() {