ufpy->python-awips; no longer building thrift or dynamicserialize RPMs

Former-commit-id: d0068c97dd
This commit is contained in:
mjames-upc 2016-03-16 18:51:24 -05:00
parent a4a17a94ed
commit 8930e12dec
77 changed files with 109 additions and 248 deletions

2
.gitignore vendored
View file

@ -10,4 +10,4 @@ bin-test/
*.pyc
*.o
*.orig
*.log

View file

@ -27,7 +27,7 @@ import time
from xml.dom.minidom import parseString
#import stomp
from ufpy import stomp
from awips import stomp
def encodeElevation(elev):
if elev >= 0:

View file

@ -28,7 +28,7 @@ import time
from xml.dom.minidom import parseString
#import stomp
from ufpy import stomp
from awips import stomp
exit_cond = None

View file

@ -33,7 +33,7 @@
#
import logging
from ufpy import AlertVizHandler
from awips import AlertVizHandler
PLUGIN_NAME = 'com.raytheon.viz.aviation'
CLIMATE_CATEGORY = "CLIMATE"

View file

@ -30,7 +30,7 @@
import time, string
import logging
from ufpy import TimeUtil
from awips import TimeUtil
offset = 0
timeStr = ""

View file

@ -41,7 +41,7 @@ from os.path import dirname
from os.path import abspath
from os.path import join
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ConfigureTextProductsRequest
SCRIPT_DIR = abspath(dirname(argv[0]))

View file

@ -56,7 +56,7 @@
import sys, os, time, re, string, getopt
import copy
import LogStream
from ufpy import TimeUtil
from awips import TimeUtil
from com.raytheon.uf.edex.decodertools.time import TimeTools
from com.raytheon.uf.common.wmo import WMOTimeParser

View file

@ -38,7 +38,7 @@
import os, tempfile, shutil
import numpy
import PythonOverriderCore
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.auth.resp import SuccessfulExecution
from dynamicserialize.dstypes.com.raytheon.uf.common.localization import LocalizationContext
from dynamicserialize.dstypes.com.raytheon.uf.common.localization.msgs import ListUtilityCommand

View file

@ -32,7 +32,7 @@
#
#
from ufpy.dataaccess import IData
from awips.dataaccess import IData
import JUtil, DataTime
class JData(IData, JUtil.JavaWrapperClass):

View file

@ -36,7 +36,7 @@
#
#
from ufpy.dataaccess import IDataRequest
from awips.dataaccess import IDataRequest
from com.raytheon.uf.common.dataplugin.level import Level
import JUtil
import jep

View file

@ -34,7 +34,7 @@
#
#
from ufpy.dataaccess import IGeometryData
from awips.dataaccess import IGeometryData
import JData
class JGeometryData(IGeometryData, JData.JData):

View file

@ -35,7 +35,7 @@
#
#
from ufpy.dataaccess import IGridData
from awips.dataaccess import IGridData
import JData
class JGridData(IGridData, JData.JData):

View file

@ -40,7 +40,7 @@
#
#
from ufpy.dataaccess import IDataRequest
from awips.dataaccess import IDataRequest
from com.raytheon.uf.common.dataaccess import DataAccessLayer as JavaDataAccessLayer
from com.raytheon.uf.common.dataaccess.impl import DefaultDataRequest

View file

@ -112,7 +112,7 @@ if exportFileName is None:
if idx > -1:
exportFileName = exportFileName[0:idx]
from ufpy.ThriftClient import *
from awips.ThriftClient import *
client = ThriftClient(server)
from dynamicserialize.dstypes.com.raytheon.uf.common.pointdata.requests import *

View file

@ -42,7 +42,7 @@ import sys
import xml.dom.minidom as minidom
import xml.etree.ElementTree as ET
from ufpy import UsageArgumentParser
from awips import UsageArgumentParser
try:
# dev environment

View file

@ -8,7 +8,7 @@
##
import os
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg
from ufpy import ThriftClient
from awips import ThriftClient
class GpdCliRequestHandler:

View file

@ -8,7 +8,7 @@ import logging
import sys
import time
import GpdCliRequestHandler
from ufpy import UsageArgumentParser
from awips import UsageArgumentParser
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.gpd.query import GenericPointDataReqMsg
from dynamicserialize.dstypes.java.util import Date

View file

@ -40,7 +40,7 @@ import os
# 11/11/2011 11484 rferrel Added SYSTEM for WSHNIMNAT
#
from ufpy import NotificationMessage
from awips import NotificationMessage
def usage():
print ''

View file

@ -38,7 +38,7 @@ import os, socket
#
#
from ufpy import NotificationMessage
from awips import NotificationMessage
class PrintHelpOnErrorParser(ArgumentParser):
def error(self, message):

View file

@ -1,5 +1,5 @@
import os
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import StringDataRecord
from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import ByteDataRecord
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen.request import RetrieveAllProductsRequest

View file

@ -1,5 +1,5 @@
import os
from ufpy import ThriftClient
from awips import ThriftClient
#from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import ByteDataRecord
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen.request import StoreActivityRequest
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen import ResponseMessageValidate

View file

@ -25,7 +25,7 @@ import logging
import xml.etree.ElementTree as ET
from Tkinter import *
from ufpy import UsageArgumentParser
from awips import UsageArgumentParser
import lib.CommHandler as CH
import ProductRetriever
import ActivityUtil

View file

@ -9,7 +9,7 @@ import io
import logging
import xml.etree.ElementTree as ET
from ufpy import UsageArgumentParser
from awips import UsageArgumentParser
from dynamicserialize.dstypes.gov.noaa.nws.ncep.common.dataplugin.pgen import ActivityInfo
import ProductStorer

View file

@ -37,8 +37,8 @@
import logging
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.grid.request import DeleteAllGridDataRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
logger = None
def __initLogger():

View file

@ -37,7 +37,7 @@
# for grib messages
##############################################################################
from ufpy import qpidingest
from awips import qpidingest
from lib.Util import doWithinTime
import logging

View file

@ -29,7 +29,7 @@ import lib.Util as util
import conf.SMConfig as config
import collections
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.request import SubscriptionRequest
##############################################################################

View file

@ -29,7 +29,7 @@ import subscription.SubscriptionManager as SM
import conf.TDBConfig as config
import collections
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.dbsrv import TextDBRequest

View file

@ -26,7 +26,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request impo
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from dynamicserialize import DynamicSerializationManager
from ufpy import ThriftClient, ConfigFileUtil
from awips import ThriftClient, ConfigFileUtil
#
# TODO: ADD DESCRIPTION

View file

@ -25,7 +25,7 @@ import os
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ProcessReceivedConfRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient, ConfigFileUtil
from awips import ThriftClient, ConfigFileUtil
#
# TODO: ADD DESCRIPTION

View file

@ -25,7 +25,7 @@ import os
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ProcessReceivedDigitalDataRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient, ConfigFileUtil
from awips import ThriftClient, ConfigFileUtil
#
# TODO: ADD DESCRIPTION

View file

@ -23,7 +23,7 @@ import os
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import IscDataRecRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from awips import ThriftClient
#
# TODO: ADD DESCRIPTION

View file

@ -86,7 +86,7 @@ class GetGfeNotifyTopicListener(threading.Thread):
threading.Thread.__init__(self)
def run(self):
from ufpy import QpidSubscriber
from awips import QpidSubscriber
self.qs = QpidSubscriber.QpidSubscriber(self.hostname, self.portNumber)
self.qs.topicSubscribe(self.topicName, self.receivedMessage)

View file

@ -8,8 +8,8 @@ import logging
import traceback
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import SendPracticeProductRequest
from ufpy import ThriftClient
from ufpy import TimeUtil
from awips import ThriftClient
from awips import TimeUtil
class VTECDecoder(object):
"""

View file

@ -44,9 +44,9 @@ import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import MergeActiveTableRequest
from ufpy import ThriftClient
from ufpy import TimeUtil
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import TimeUtil
from awips import UsageArgumentParser
logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",

View file

@ -22,7 +22,7 @@
import getopt, sys
import logging, time, traceback, string, gzip
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import DumpActiveTableRequest
from ufpy import ThriftClient
from awips import ThriftClient
from getVtecAttribute import getVtecAttribute
## sorting function

View file

@ -20,7 +20,7 @@
import os
import logging
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetActiveTableDictRequest
from ufpy import ThriftClient
from awips import ThriftClient
from getVtecAttribute import getVtecAttribute
logging.basicConfig(level=logging.INFO)

View file

@ -20,7 +20,7 @@
import logging
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetFourCharSitesRequest
from ufpy import ThriftClient
from awips import ThriftClient
##
# Convert a list with 3-char site IDs to a list of 4-char site IDs.

View file

@ -21,7 +21,7 @@
import os
import logging
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable import GetVtecAttributeRequest
from ufpy import ThriftClient
from awips import ThriftClient
##
# Ask the server for an attribute from the VTECPartners script for a site.

View file

@ -40,8 +40,8 @@ import os
import sys
import MergeVTEC
from ufpy import TimeUtil
from ufpy import UsageArgumentParser
from awips import TimeUtil
from awips import UsageArgumentParser

View file

@ -36,8 +36,8 @@ import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import RetrieveRemoteActiveTableRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",

View file

@ -41,8 +41,8 @@ import logging
import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.activetable.request import SendActiveTableRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",

View file

@ -32,8 +32,8 @@ import sys
import os
import logging
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
#
# Provides a command-line utility to break all locks.

View file

@ -41,8 +41,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import
from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import LocalizationStreamPutRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
##

View file

@ -24,8 +24,8 @@ import os
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import SmartInitRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
##

View file

@ -41,10 +41,10 @@ import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIfpNetCDFGridRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
from awips import ThriftClient
from awips import UsageArgumentParser
from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
from awips.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
RETRY_ATTEMPTS = 3

View file

@ -39,7 +39,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import User
from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import UserId
from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import GetActiveSitesRequest
from ufpy import ThriftClient
from awips import ThriftClient
#
# The ifpServerText program. Stores, deletes, gets, and inventories text.

View file

@ -22,10 +22,10 @@ import logging
import os
import sys
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
from ufpy.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
from awips import ThriftClient
from awips import UsageArgumentParser
from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
from awips.UsageArgumentParser import AppendParmNameAndLevelAction as AppendParmNameAndLevelAction
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExecuteIscMosaicRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId

View file

@ -36,8 +36,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import
from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import LocalizationStreamPutRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
#

View file

@ -24,8 +24,8 @@ import argparse
import logging
import sys
from ufpy import UsageArgumentParser
from ufpy.gfe import IFPClient
from awips import UsageArgumentParser
from awips.gfe import IFPClient
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID

View file

@ -40,9 +40,9 @@ import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import PurgeGfeGridsRequest
from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from ufpy.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
from awips import ThriftClient
from awips import UsageArgumentParser
from awips.UsageArgumentParser import StoreDatabaseIDAction as StoreDatabaseIDAction
logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s: %(message)s",

View file

@ -19,7 +19,7 @@
##
from optparse import OptionParser
from ufpy import NotificationMessage
from awips import NotificationMessage
from argparse import ArgumentParser
import os, sys

View file

@ -40,8 +40,8 @@ import sys
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import ExportGridsRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
class SendGridsToNDFD:

View file

@ -36,7 +36,7 @@ import traceback
import dynamicserialize
from dynamicserialize.dstypes.com.raytheon.uf.common.site.notify import ClusterActivationNotification
from ufpy import QpidSubscriber
from awips import QpidSubscriber
class ActivationTopicListener(threading.Thread):
def __init__(self, hostname='localHost', portNumber='5762', topicName="edex.alerts.siteActivate" ):

View file

@ -35,8 +35,8 @@ import sys
import time
from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import ActivateSiteRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
from ActivationTopicListener import ActivationTopicListener

View file

@ -35,8 +35,8 @@ import time
from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import DeactivateSiteRequest
from ufpy import ThriftClient
from ufpy import UsageArgumentParser
from awips import ThriftClient
from awips import UsageArgumentParser
from ActivationTopicListener import ActivationTopicListener

View file

@ -30,7 +30,7 @@
#
from ufpy.dataaccess import IDataRequest
from awips.dataaccess import IDataRequest
from dynamicserialize.dstypes.com.vividsolutions.jts.geom import Envelope
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level

View file

@ -43,7 +43,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -41,7 +41,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange

View file

@ -42,7 +42,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange

View file

@ -33,7 +33,7 @@ import argparse
import numpy
import sys
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
def get_args():
parser = argparse.ArgumentParser(conflict_handler="resolve")

View file

@ -33,7 +33,7 @@ import argparse
import numpy
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange

View file

@ -34,7 +34,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -34,7 +34,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -36,7 +36,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -36,7 +36,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -36,7 +36,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -37,7 +37,7 @@ import sys
from datetime import datetime
from datetime import timedelta
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level

View file

@ -37,14 +37,14 @@ import sys
from datetime import datetime
from datetime import timedelta
from ufpy import ThriftClient
from awips import ThriftClient
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level
from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.radar.request import GetRadarDataRecordRequest
def get_default_host():
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
return DataAccessLayer.THRIFT_HOST

View file

@ -34,7 +34,7 @@ import argparse
import sys
from datetime import datetime
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -32,7 +32,7 @@ import argparse
import numpy
import sys
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
def get_args():
parser = argparse.ArgumentParser(conflict_handler="resolve")

View file

@ -44,7 +44,7 @@ import sys
from datetime import datetime
from datetime import timedelta
from ufpy.dataaccess import DataAccessLayer
from awips.dataaccess import DataAccessLayer
from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
def get_args():

View file

@ -28,7 +28,6 @@ AWIPS2_SITE_PKG_RPMS=\
'awips2-python-scientific-2.8-2.i386.rpm' \
'awips2-python-scipy-0.8.0-2.i386.rpm' \
'awips2-python-tables-2.1.2-2.i386.rpm' \
'awips2-python-thrift-20080411p1-2.i386.rpm' \
'awips2-python-tpg-3.1.2-2.i386.rpm' \
'awips2-python-werkzeug-0.6.2-2.i386.rpm' \
)
@ -47,58 +46,12 @@ do
cp -v ${CORE_RPM_DIR}/${rpm} /tmp/awips2-ade-${CURRENT_DATE}
done
# Copy ufpy and dynamicserialize
# Determine where ufpy and dynamicserialize are located first. They should either
# be in the integration repository or the workspace of RPMBuildNoDeploy-Delivery.
INT_REPO="/var/www/html/repo/awips2-int/i386/python.site-packages"
DEL_WORKSPACE="/usr/share/tomcat5/.hudson/jobs/RPMBuildNoDeploy-Delivery/workspace/var/www/html/repo/awips2-int/i386/python.site-packages"
UFPY_FOUND="N"
DYNAMICSERIALIZE_FOUND="N"
UFPY_RPM="awips2-python-ufpy-${CURRENT_VERSION}-${CURRENT_RELEASE}.i386.rpm"
DYNAMICSERIALIZE_RPM="awips2-python-dynamicserialize-${CURRENT_VERSION}-${CURRENT_RELEASE}.i386.rpm"
# Check the integration repository first.
if [ -f ${INT_REPO}/${UFPY_RPM} ]; then
cp -v ${INT_REPO}/${UFPY_RPM} /tmp/awips2-ade-${CURRENT_DATE}
UFPY_FOUND="Y"
fi
if [ -f ${INT_REPO}/${DYNAMICSERIALIZE_RPM} ]; then
cp -v ${INT_REPO}/${DYNAMICSERIALIZE_RPM} /tmp/awips2-ade-${CURRENT_DATE}
DYNAMICSERIALIZE_FOUND="Y"
fi
# Check the workspace next - if the rpm was not found in the repo.
if [ "${UFPY_FOUND}" = "N" ]; then
if [ ! -f ${DEL_WORKSPACE}/${UFPY_RPM} ]; then
echo "ERROR: Unable to find - ${UFPY_RPM}."
echo "Unable To Continue ... Terminating."
exit 1
fi
cp -v ${DEL_WORKSPACE}/${UFPY_RPM} /tmp/awips2-ade-${CURRENT_DATE}
fi
if [ "${DYNAMICSERIALIZE_FOUND}" = "N" ]; then
if [ ! -f ${DEL_WORKSPACE}/${DYNAMICSERIALIZE_RPM} ]; then
echo "ERROR: Unable to find - ${DYNAMICSERIALIZE_RPM}."
echo "Unable To Continue ... Terminating."
exit 1
fi
cp -v ${DEL_WORKSPACE}/${DYNAMICSERIALIZE_RPM} /tmp/awips2-ade-${CURRENT_DATE}
fi
# Copy the installation / removal scripts.
cp -v ${WORKSPACE_DIR}/Installer.rpm/awips2.ade/tar.ade/scripts/* \
/tmp/awips2-ade-${CURRENT_DATE}
chmod a+x /tmp/awips2-ade-${CURRENT_DATE}/*.sh
# Update the installation script.
perl -p -i -e "s/PY_DYNAMICSERIALIZE=/PY_DYNAMICSERIALIZE=${DYNAMICSERIALIZE_RPM}/g" \
/tmp/awips2-ade-${CURRENT_DATE}/ade_quick_install.sh
perl -p -i -e "s/PY_UFPY=/PY_UFPY=${UFPY_RPM}/g" \
/tmp/awips2-ade-${CURRENT_DATE}/ade_quick_install.sh
cd /tmp
# Remove any existing tar files
if [ -f awips2-ade-${CURRENT_DATE}.tar ]; then

View file

@ -42,10 +42,6 @@ function lookupRPM()
export RPM_SPECIFICATION="${python_site__dir}/Installer.cherrypy"
return 0
fi
if [ "${1}" = "awips2-python-dynamicserialize" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.dynamicserialize"
return 0
fi
if [ "${1}" = "awips2-python-h5py" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.h5py/"
return 0
@ -128,10 +124,6 @@ function lookupRPM()
export RPM_SPECIFICATION="${python_site__dir}/Installer.tables"
return 0
fi
if [ "${1}" = "awips2-python-thrift" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.thrift"
return 0
fi
if [ "${1}" = "awips2-python-tpg" ]; then
export RPM_SPECIFICATION="${python_site__dir}/Installer.tpg"
return 0

View file

@ -89,7 +89,7 @@ if [ "${1}" = "-python-qpid" ]; then
# buildRPM "awips2-python-qpid"
# buildRPM "awips2-python"
# buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
# buildRPM "awips2-python-nose"
# buildRPM "awips2-python-numpy"
# buildRPM "awips2-python-h5py"
@ -101,9 +101,7 @@ if [ "${1}" = "-python-qpid" ]; then
# buildRPM "awips2-python-scientific"
# buildRPM "awips2-python-scipy"
# buildRPM "awips2-python-tables"
# buildRPM "awips2-python-thrift"
# buildRPM "awips2-python-tpg"
# buildRPM "awips2-python-python-awips"
# buildRPM "awips2-python-werkzeug"
# buildRPM "awips2-python-pygtk"
# buildRPM "awips2-python-pycairo"
@ -168,8 +166,7 @@ if [ "${1}" = "-delta" ]; then
buildRPM "awips2-ncep-database"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-awips"
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-shared"
@ -207,7 +204,7 @@ if [ "${1}" = "-full" ]; then
fi
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
@ -220,9 +217,7 @@ if [ "${1}" = "-full" ]; then
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
@ -281,7 +276,7 @@ if [ "${1}" = "-ade" ]; then
buildRPM "awips2-ant"
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
@ -294,9 +289,7 @@ if [ "${1}" = "-ade" ]; then
buildRPM "awips2-python-scientific"
buildRPM "awips2-python-scipy"
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
@ -379,7 +372,7 @@ if [ "${1}" = "-edex" ]; then
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
# buildRPM "awips2-ncep-database"
# buildRPM "awips2-python-dynamicserialize"
# buildRPM "awips2-python-awips"
buildEDEX
if [ $? -ne 0 ]; then
exit 1

View file

@ -146,8 +146,8 @@ if [ "${1}" = "-python" ]; then
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-qpid"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
buildRPM "awips2-python-nose"
@ -161,7 +161,6 @@ if [ "${1}" = "-python" ]; then
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
@ -183,7 +182,7 @@ if [ "${1}" = "-64bit" ]; then
fi
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
@ -198,7 +197,6 @@ if [ "${1}" = "-64bit" ]; then
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
@ -236,8 +234,7 @@ if [ "${1}" = "-rh6" ]; then
buildRPM "awips2-python-tables"
buildRPM "awips2-python-pmw"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-pycairo"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-shapely"
@ -323,8 +320,7 @@ if [ "${1}" = "-delta" ]; then
buildRPM "awips2-ncep-database"
buildRPM "awips2-gfesuite-client"
buildRPM "awips2-gfesuite-server"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-awips"
buildRPM "awips2-aviation-shared"
buildRPM "awips2-cli"
@ -387,9 +383,8 @@ if [ "${1}" = "-full" ]; then
# fi
# buildQPID
# buildRPM "awips2-python-jimporter"
# buildRPM "awips2-python-python-awips"
# buildRPM "awips2-python-cherrypy"
# buildRPM "awips2-python-dynamicserialize"
# buildRPM "awips2-python-awips"
# buildRPM "awips2-python-h5py"
# buildRPM "awips2-python-matplotlib"
# buildRPM "awips2-python-nose"
@ -458,7 +453,7 @@ if [ "${1}" = "-ade" ]; then
buildRPM "awips2-ant"
buildRPM "awips2-python"
buildRPM "awips2-python-cherrypy"
buildRPM "awips2-python-dynamicserialize"
buildRPM "awips2-python-awips"
buildRPM "awips2-python-h5py"
buildRPM "awips2-python-jimporter"
buildRPM "awips2-python-matplotlib"
@ -473,7 +468,6 @@ if [ "${1}" = "-ade" ]; then
buildRPM "awips2-python-tables"
buildRPM "awips2-python-thrift"
buildRPM "awips2-python-tpg"
buildRPM "awips2-python-python-awips"
buildRPM "awips2-python-werkzeug"
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
@ -576,7 +570,7 @@ if [ "${1}" = "-edex" ]; then
#if [ $? -ne 0 ]; then
# exit 1
#fi
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-awips"
exit 0
fi
@ -591,7 +585,7 @@ if [ "${1}" = "-custom" ]; then
#buildRPM "awips2-common-base"
#buildRPM "awips2-gfesuite-client"
#buildRPM "awips2-gfesuite-server"
#buildRPM "awips2-python-dynamicserialize"
#buildRPM "awips2-python-awips"
#buildRPM "awips2-alertviz"
#buildRPM "awips2-python"
#buildRPM "awips2-alertviz"

View file

@ -1,70 +0,0 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
#
# AWIPS II Python dynamicserialize Spec File
#
Name: awips2-python-dynamicserialize
Summary: AWIPS II Python dynamicserialize Distribution
Version: %{_component_version}
Release: 1
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: noarch
URL: N/A
License: N/A
Distribution: N/A
Vendor: Raytheon
Packager: Bryan Kowal
AutoReq: no
requires: awips2-python
requires: awips2-python-thrift
provides: awips2-python-dynamicserialize
%description
AWIPS II Python dynamicserialize Site-Package - 64-bit.
%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}
if [ $? -ne 0 ]; then
exit 1
fi
%build
%install
mkdir -p %{_build_root}/awips2/python/lib/python2.7/site-packages/dynamicserialize
if [ $? -ne 0 ]; then
exit 1
fi
DYNAMICSERIALIZE_SRC_DIR="%{_python_pkgs_dir}/dynamicserialize"
cp -rv ${DYNAMICSERIALIZE_SRC_DIR}/* \
%{_build_root}/awips2/python/lib/python2.7/site-packages/dynamicserialize
%pre
%post
%preun
%postun
%clean
rm -rf %{_build_root}
%files
%defattr(644,awips,fxalpha,755)
%dir /awips2/python/lib/python2.7/site-packages
/awips2/python/lib/python2.7/site-packages/*

View file

@ -103,6 +103,5 @@ touch ${RPM_SITE_PACKAGE_LOG_FILE}
# For Now, We Will Only Build The Important RPMs. Will Add An Env Flag That Can Be
# Set To Force A Build Of Everything.
buildRPM "Installer.python-awips"
buildRPM "Installer.dynamicserialize"
buildRPM "Installer.cherrpy"
buildRPM "Installer.h5py"