This is an automated email from the ASF dual-hosted git repository. fgreg pushed a commit to branch v1.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ningesterpy.git
commit 3fed98d16f69ef519e2b5fe77f1d06ac07d19d3a Author: Frank Greguska <[email protected]> AuthorDate: Fri Jan 26 22:58:37 2018 -0800 root package is now sdap --- .idea/ningesterpy.iml | 2 +- {ningesterpy => sdap}/__init__.py | 2 -- {ningesterpy => sdap}/ningesterpy.py | 12 +++++++++--- {ningesterpy => sdap}/processors/__init__.py | 22 +++++++++++----------- {ningesterpy => sdap}/processors/callncpdq.py | 2 +- {ningesterpy => sdap}/processors/callncra.py | 2 +- .../processors/computespeeddirfromuv.py | 2 +- .../processors/emptytilefilter.py | 2 +- .../processors/kelvintocelsius.py | 2 +- .../processors/normalizetimebeginningofmonth.py | 2 +- {ningesterpy => sdap}/processors/processorchain.py | 6 +++--- {ningesterpy => sdap}/processors/regrid1x1.py | 2 +- .../processors/subtract180longitude.py | 2 +- .../processors/tilereadingprocessor.py | 2 +- .../processors/tilesummarizingprocessor.py | 2 +- .../processors/winddirspeedtouv.py | 2 +- tests/callncpdq_test.py | 2 +- tests/computespeeddirfromuv_test.py | 6 +++--- tests/kelvintocelsius_test.py | 4 ++-- tests/processorchain_test.py | 2 +- tests/regrid1x1_test.py | 16 ++++++++-------- tests/subtract180longitude_test.py | 6 +++--- tests/tilereadingprocessor_test.py | 22 +++++++++++----------- tests/tilesumarizingprocessor_test.py | 6 +++--- tests/winddirspeedtouv_test.py | 6 +++--- 25 files changed, 70 insertions(+), 66 deletions(-) diff --git a/.idea/ningesterpy.iml b/.idea/ningesterpy.iml index 2c9cf97..dcf2bcc 100644 --- a/.idea/ningesterpy.iml +++ b/.idea/ningesterpy.iml @@ -2,7 +2,7 @@ <module type="PYTHON_MODULE" version="4"> <component name="NewModuleRootManager"> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/ningesterpy" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/ningesterpy/__init__.py b/sdap/__init__.py similarity index 95% rename from ningesterpy/__init__.py rename to sdap/__init__.py index 50167e0..6acb5d1 100644 --- a/ningesterpy/__init__.py +++ b/sdap/__init__.py @@ -12,5 +12,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -from ningesterpy import ningesterpy \ No newline at end of file diff --git a/ningesterpy/ningesterpy.py b/sdap/ningesterpy.py similarity index 88% rename from ningesterpy/ningesterpy.py rename to sdap/ningesterpy.py index 17eceba..ff143ed 100644 --- a/ningesterpy/ningesterpy.py +++ b/sdap/ningesterpy.py @@ -15,18 +15,21 @@ import logging import uuid -from nexusproto import DataTile_pb2 as nexusproto from flask import Flask, request, jsonify, Response from flask.json import JSONEncoder from flask_accept import accept from google.protobuf import json_format from google.protobuf.json_format import ParseError +from nexusproto import DataTile_pb2 as nexusproto from werkzeug.exceptions import HTTPException, BadRequest from werkzeug.exceptions import default_exceptions -from ningesterpy.processors.processorchain import ProcessorChain, ProcessorNotFound, MissingProcessorArguments +from sdap.processors.processorchain import ProcessorChain, ProcessorNotFound, MissingProcessorArguments +logging.basicConfig(format="%(asctime)s %(levelname)s %(process)d --- [%(name)s.%(funcName)s:%(lineno)d] %(message)s", + datefmt="%Y-%m-%d %H:%M:%S") applog = logging.getLogger(__name__) +applog.setLevel(logging.INFO) app = Flask(__name__) @@ -91,8 +94,11 @@ def handle_error(e): if __name__ == '__main__': + host = '127.0.0.1' + port = 5000 + applog.info("Running app on %s:%d" % (host, port)) app.register_error_handler(Exception, handle_error) for ex in default_exceptions: app.register_error_handler(ex, handle_error) app.json_encoder = ProtobufJSONEncoder - app.run() + app.run(host=host, port=port) diff --git a/ningesterpy/processors/__init__.py b/sdap/processors/__init__.py similarity index 73% rename from ningesterpy/processors/__init__.py rename to sdap/processors/__init__.py index 8902ff6..8f30cb8 100644 --- a/ningesterpy/processors/__init__.py +++ b/sdap/processors/__init__.py @@ -49,17 +49,17 @@ class NexusTileProcessor(Processor): # All installed processors need to be imported and added to the dict below -from ningesterpy.processors.callncpdq import CallNcpdq -from ningesterpy.processors.callncra import CallNcra -from ningesterpy.processors.computespeeddirfromuv import ComputeSpeedDirFromUV -from ningesterpy.processors.emptytilefilter import EmptyTileFilter -from ningesterpy.processors.kelvintocelsius import KelvinToCelsius -from ningesterpy.processors.normalizetimebeginningofmonth import NormalizeTimeBeginningOfMonth -from ningesterpy.processors.regrid1x1 import Regrid1x1 -from ningesterpy.processors.subtract180longitude import Subtract180Longitude -from ningesterpy.processors.tilereadingprocessor import GridReadingProcessor, SwathReadingProcessor, TimeSeriesReadingProcessor -from ningesterpy.processors.tilesummarizingprocessor import TileSummarizingProcessor -from ningesterpy.processors.winddirspeedtouv import WindDirSpeedToUV +from sdap.processors.callncpdq import CallNcpdq +from sdap.processors.callncra import CallNcra +from sdap.processors.computespeeddirfromuv import ComputeSpeedDirFromUV +from sdap.processors.emptytilefilter import EmptyTileFilter +from sdap.processors.kelvintocelsius import KelvinToCelsius +from sdap.processors.normalizetimebeginningofmonth import NormalizeTimeBeginningOfMonth +from sdap.processors.regrid1x1 import Regrid1x1 +from sdap.processors.subtract180longitude import Subtract180Longitude +from sdap.processors.tilereadingprocessor import GridReadingProcessor, SwathReadingProcessor, TimeSeriesReadingProcessor +from sdap.processors.tilesummarizingprocessor import TileSummarizingProcessor +from sdap.processors.winddirspeedtouv import WindDirSpeedToUV INSTALLED_PROCESSORS = { "CallNcpdq": CallNcpdq, diff --git a/ningesterpy/processors/callncpdq.py b/sdap/processors/callncpdq.py similarity index 97% rename from ningesterpy/processors/callncpdq.py rename to sdap/processors/callncpdq.py index 3dfa9b8..d8b02e8 100644 --- a/ningesterpy/processors/callncpdq.py +++ b/sdap/processors/callncpdq.py @@ -18,7 +18,7 @@ import logging import os from subprocess import call -from ningesterpy.processors import Processor +from sdap.processors import Processor class CallNcpdq(Processor): diff --git a/ningesterpy/processors/callncra.py b/sdap/processors/callncra.py similarity index 98% rename from ningesterpy/processors/callncra.py rename to sdap/processors/callncra.py index b5a8e2e..51bacec 100644 --- a/ningesterpy/processors/callncra.py +++ b/sdap/processors/callncra.py @@ -20,7 +20,7 @@ from subprocess import call from netCDF4 import Dataset, num2date -from ningesterpy.processors import Processor +from sdap.processors import Processor class CallNcra(Processor): diff --git a/ningesterpy/processors/computespeeddirfromuv.py b/sdap/processors/computespeeddirfromuv.py similarity index 98% rename from ningesterpy/processors/computespeeddirfromuv.py rename to sdap/processors/computespeeddirfromuv.py index 9a53cba..a372aa1 100644 --- a/ningesterpy/processors/computespeeddirfromuv.py +++ b/sdap/processors/computespeeddirfromuv.py @@ -17,7 +17,7 @@ import numpy from nexusproto.serialization import from_shaped_array, to_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor def calculate_speed_direction(wind_u, wind_v): diff --git a/ningesterpy/processors/emptytilefilter.py b/sdap/processors/emptytilefilter.py similarity index 96% rename from ningesterpy/processors/emptytilefilter.py rename to sdap/processors/emptytilefilter.py index 0641f38..5d8a7e3 100644 --- a/ningesterpy/processors/emptytilefilter.py +++ b/sdap/processors/emptytilefilter.py @@ -19,7 +19,7 @@ from nexusproto import DataTile_pb2 as nexusproto import numpy from nexusproto.serialization import from_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor logger = logging.getLogger('emptytilefilter') diff --git a/ningesterpy/processors/kelvintocelsius.py b/sdap/processors/kelvintocelsius.py similarity index 95% rename from ningesterpy/processors/kelvintocelsius.py rename to sdap/processors/kelvintocelsius.py index 82d1129..27d1db3 100644 --- a/ningesterpy/processors/kelvintocelsius.py +++ b/sdap/processors/kelvintocelsius.py @@ -16,7 +16,7 @@ from nexusproto.serialization import from_shaped_array, to_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor class KelvinToCelsius(NexusTileProcessor): diff --git a/ningesterpy/processors/normalizetimebeginningofmonth.py b/sdap/processors/normalizetimebeginningofmonth.py similarity index 96% rename from ningesterpy/processors/normalizetimebeginningofmonth.py rename to sdap/processors/normalizetimebeginningofmonth.py index 0889117..4cc0403 100644 --- a/ningesterpy/processors/normalizetimebeginningofmonth.py +++ b/sdap/processors/normalizetimebeginningofmonth.py @@ -17,7 +17,7 @@ import datetime from pytz import timezone -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor EPOCH = timezone('UTC').localize(datetime.datetime(1970, 1, 1)) diff --git a/ningesterpy/processors/processorchain.py b/sdap/processors/processorchain.py similarity index 94% rename from ningesterpy/processors/processorchain.py rename to sdap/processors/processorchain.py index b236f4b..6a68b04 100644 --- a/ningesterpy/processors/processorchain.py +++ b/sdap/processors/processorchain.py @@ -15,7 +15,7 @@ import inspect -import ningesterpy.processors +import sdap.processors class BadChainException(Exception): @@ -39,7 +39,7 @@ class MissingProcessorArguments(Exception): super().__init__(message, *args) -class ProcessorChain(ningesterpy.processors.Processor): +class ProcessorChain(sdap.processors.Processor): def __init__(self, processor_list, *args, **kwargs): super().__init__(*args, **kwargs) @@ -47,7 +47,7 @@ class ProcessorChain(ningesterpy.processors.Processor): # Attempt to construct the needed processors for processor in processor_list: try: - processor_constructor = ningesterpy.processors.INSTALLED_PROCESSORS[processor['name']] + processor_constructor = sdap.processors.INSTALLED_PROCESSORS[processor['name']] except KeyError as e: raise ProcessorNotFound(processor['name']) from e diff --git a/ningesterpy/processors/regrid1x1.py b/sdap/processors/regrid1x1.py similarity index 99% rename from ningesterpy/processors/regrid1x1.py rename to sdap/processors/regrid1x1.py index 7ec8775..daf9921 100644 --- a/ningesterpy/processors/regrid1x1.py +++ b/sdap/processors/regrid1x1.py @@ -22,7 +22,7 @@ from netCDF4 import Dataset from pytz import timezone from scipy import interpolate -from ningesterpy.processors import Processor +from sdap.processors import Processor UTC = timezone('UTC') ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/ningesterpy/processors/subtract180longitude.py b/sdap/processors/subtract180longitude.py similarity index 96% rename from ningesterpy/processors/subtract180longitude.py rename to sdap/processors/subtract180longitude.py index 312d1b8..3552115 100644 --- a/ningesterpy/processors/subtract180longitude.py +++ b/sdap/processors/subtract180longitude.py @@ -15,7 +15,7 @@ from nexusproto.serialization import from_shaped_array, to_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor class Subtract180Longitude(NexusTileProcessor): diff --git a/ningesterpy/processors/tilereadingprocessor.py b/sdap/processors/tilereadingprocessor.py similarity index 99% rename from ningesterpy/processors/tilereadingprocessor.py rename to sdap/processors/tilereadingprocessor.py index 84cf431..cc3afef 100644 --- a/ningesterpy/processors/tilereadingprocessor.py +++ b/sdap/processors/tilereadingprocessor.py @@ -25,7 +25,7 @@ from netCDF4 import Dataset, num2date from nexusproto.serialization import to_shaped_array, to_metadata from pytz import timezone -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor EPOCH = timezone('UTC').localize(datetime.datetime(1970, 1, 1)) diff --git a/ningesterpy/processors/tilesummarizingprocessor.py b/sdap/processors/tilesummarizingprocessor.py similarity index 98% rename from ningesterpy/processors/tilesummarizingprocessor.py rename to sdap/processors/tilesummarizingprocessor.py index 7ff8bc0..afdf070 100644 --- a/ningesterpy/processors/tilesummarizingprocessor.py +++ b/sdap/processors/tilesummarizingprocessor.py @@ -17,7 +17,7 @@ from nexusproto import DataTile_pb2 as nexusproto import numpy from nexusproto.serialization import from_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor class NoTimeException(Exception): diff --git a/ningesterpy/processors/winddirspeedtouv.py b/sdap/processors/winddirspeedtouv.py similarity index 98% rename from ningesterpy/processors/winddirspeedtouv.py rename to sdap/processors/winddirspeedtouv.py index 5fae135..96d2cb1 100644 --- a/ningesterpy/processors/winddirspeedtouv.py +++ b/sdap/processors/winddirspeedtouv.py @@ -20,7 +20,7 @@ from math import sin import numpy from nexusproto.serialization import from_shaped_array, to_shaped_array -from ningesterpy.processors import NexusTileProcessor +from sdap.processors import NexusTileProcessor def enum(**enums): diff --git a/tests/callncpdq_test.py b/tests/callncpdq_test.py index f1eecc7..49c7bf6 100644 --- a/tests/callncpdq_test.py +++ b/tests/callncpdq_test.py @@ -19,7 +19,7 @@ from os import path, remove from netCDF4 import Dataset -from ningesterpy.processors import callncpdq +from sdap.processors import callncpdq class TestMeasuresData(unittest.TestCase): diff --git a/tests/computespeeddirfromuv_test.py b/tests/computespeeddirfromuv_test.py index 6daa962..2b364e7 100644 --- a/tests/computespeeddirfromuv_test.py +++ b/tests/computespeeddirfromuv_test.py @@ -19,8 +19,8 @@ from os import path import numpy as np from nexusproto.serialization import from_shaped_array -import ningesterpy.processors -from ningesterpy.processors.computespeeddirfromuv import calculate_speed_direction +import sdap.processors +from sdap.processors.computespeeddirfromuv import calculate_speed_direction class TestConversion(unittest.TestCase): @@ -86,7 +86,7 @@ class TestConversion(unittest.TestCase): class TestCcmpData(unittest.TestCase): def setUp(self): - self.module = ningesterpy.processors.ComputeSpeedDirFromUV('uwnd', 'vwnd') + self.module = sdap.processors.ComputeSpeedDirFromUV('uwnd', 'vwnd') def test_speed_dir_computation(self): test_file = path.join(path.dirname(__file__), 'dumped_nexustiles', 'ccmp_nonempty_nexustile.bin') diff --git a/tests/kelvintocelsius_test.py b/tests/kelvintocelsius_test.py index 0d738b2..267bba5 100644 --- a/tests/kelvintocelsius_test.py +++ b/tests/kelvintocelsius_test.py @@ -20,12 +20,12 @@ from nexusproto import DataTile_pb2 as nexusproto import numpy as np from nexusproto.serialization import from_shaped_array -import ningesterpy.processors +import sdap.processors class TestAvhrrData(unittest.TestCase): def setUp(self): - self.module = ningesterpy.processors.KelvinToCelsius() + self.module = sdap.processors.KelvinToCelsius() def test_kelvin_to_celsius(self): test_file = path.join(path.dirname(__file__), 'dumped_nexustiles', 'avhrr_nonempty_nexustile.bin') diff --git a/tests/processorchain_test.py b/tests/processorchain_test.py index a8688d8..7657ba6 100644 --- a/tests/processorchain_test.py +++ b/tests/processorchain_test.py @@ -18,7 +18,7 @@ from os import path from nexusproto import DataTile_pb2 as nexusproto -from ningesterpy.processors.processorchain import ProcessorChain +from sdap.processors.processorchain import ProcessorChain class TestRunChainMethod(unittest.TestCase): diff --git a/tests/regrid1x1_test.py b/tests/regrid1x1_test.py index 45e3c0e..b7ee9fe 100644 --- a/tests/regrid1x1_test.py +++ b/tests/regrid1x1_test.py @@ -16,7 +16,7 @@ import os import unittest -import ningesterpy.processors +import sdap.processors def delete_file_if_exists(filename): @@ -39,9 +39,9 @@ class TestSSHData(unittest.TestCase): delete_file_if_exists(self.expected_output_path) def test_ssh_grid(self): - regridder = ningesterpy.processors.Regrid1x1('SLA', 'Latitude', 'Longitude', 'Time', - variable_valid_range='SLA:-100.0:100.0:SLA_ERR:-5000:5000', - filename_prefix=self.prefix) + regridder = sdap.processors.Regrid1x1('SLA', 'Latitude', 'Longitude', 'Time', + variable_valid_range='SLA:-100.0:100.0:SLA_ERR:-5000:5000', + filename_prefix=self.prefix) results = list(regridder.process(self.test_file)) @@ -61,8 +61,8 @@ class TestGRACEData(unittest.TestCase): @unittest.skip def test_lwe_grid(self): - regridder = ningesterpy.processors.Regrid1x1('lwe_thickness', 'lat', 'lon', 'tim', - filename_prefix=self.prefix) + regridder = sdap.processors.Regrid1x1('lwe_thickness', 'lat', 'lon', 'tim', + filename_prefix=self.prefix) results = list(regridder.process(self.test_file)) @@ -82,8 +82,8 @@ class TestIceShelfData(unittest.TestCase): @unittest.skip def test_height_raw(self): - regridder = ningesterpy.processors.Regrid1x1('height_raw,height_filt,height_err', 'lat', 'lon', 'tim', - filename_prefix=self.prefix) + regridder = sdap.processors.Regrid1x1('height_raw,height_filt,height_err', 'lat', 'lon', 'tim', + filename_prefix=self.prefix) results = list(regridder.process(self.test_file)) diff --git a/tests/subtract180longitude_test.py b/tests/subtract180longitude_test.py index e8c2f77..81472cc 100644 --- a/tests/subtract180longitude_test.py +++ b/tests/subtract180longitude_test.py @@ -20,7 +20,7 @@ from nexusproto import DataTile_pb2 as nexusproto import numpy as np from nexusproto.serialization import from_shaped_array -import ningesterpy.processors +import sdap.processors class TestAscatbUData(unittest.TestCase): @@ -34,7 +34,7 @@ class TestAscatbUData(unittest.TestCase): nexus_tile_before = nexusproto.NexusTile.FromString(nexustile_str) longitudes_before = from_shaped_array(nexus_tile_before.tile.swath_tile.longitude) - subtract = ningesterpy.processors.Subtract180Longitude() + subtract = sdap.processors.Subtract180Longitude() results = list(subtract.process(nexustile_str)) @@ -54,7 +54,7 @@ class TestAscatbUData(unittest.TestCase): nexus_tile_before = nexusproto.NexusTile.FromString(nexustile_str) longitudes_before = from_shaped_array(nexus_tile_before.tile.swath_tile.longitude) - subtract = ningesterpy.processors.Subtract180Longitude() + subtract = sdap.processors.Subtract180Longitude() results = list(subtract.process(nexustile_str)) diff --git a/tests/tilereadingprocessor_test.py b/tests/tilereadingprocessor_test.py index 8b49eff..2700073 100644 --- a/tests/tilereadingprocessor_test.py +++ b/tests/tilereadingprocessor_test.py @@ -20,12 +20,12 @@ import numpy as np from nexusproto.serialization import from_shaped_array from nexusproto import DataTile_pb2 as nexusproto -import ningesterpy.processors +import sdap.processors class TestReadMurData(unittest.TestCase): def setUp(self): - self.module = ningesterpy.processors.GridReadingProcessor('analysed_sst', 'lat', 'lon', time='time') + self.module = sdap.processors.GridReadingProcessor('analysed_sst', 'lat', 'lon', time='time') def test_read_empty_mur(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'empty_mur.nc4') @@ -82,7 +82,7 @@ class TestReadAscatbData(unittest.TestCase): def test_read_not_empty_ascatb(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_ascatb.nc4') - swath_reader = ningesterpy.processors.SwathReadingProcessor('wind_speed', 'lat', 'lon', time='time') + swath_reader = sdap.processors.SwathReadingProcessor('wind_speed', 'lat', 'lon', time='time') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() @@ -115,7 +115,7 @@ class TestReadAscatbData(unittest.TestCase): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_ascatb.nc4') - swath_reader = ningesterpy.processors.SwathReadingProcessor('wind_speed', 'lat', 'lon', time='time', meta='wind_dir') + swath_reader = sdap.processors.SwathReadingProcessor('wind_speed', 'lat', 'lon', time='time', meta='wind_dir') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() @@ -142,10 +142,10 @@ class TestReadSmapData(unittest.TestCase): def test_read_not_empty_smap(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_smap.h5') - swath_reader = ningesterpy.processors.SwathReadingProcessor('smap_sss', 'lat', 'lon', - time='row_time', - glblattr_day='REV_START_TIME', - glblattr_day_format='%Y-%jT%H:%M:%S.%f') + swath_reader = sdap.processors.SwathReadingProcessor('smap_sss', 'lat', 'lon', + time='row_time', + glblattr_day='REV_START_TIME', + glblattr_day_format='%Y-%jT%H:%M:%S.%f') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() @@ -187,7 +187,7 @@ class TestReadCcmpData(unittest.TestCase): def test_read_not_empty_ccmp(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_ccmp.nc') - ccmp_reader = ningesterpy.processors.GridReadingProcessor('uwnd', 'latitude', 'longitude', time='time', meta='vwnd') + ccmp_reader = sdap.processors.GridReadingProcessor('uwnd', 'latitude', 'longitude', time='time', meta='vwnd') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() @@ -228,7 +228,7 @@ class TestReadAvhrrData(unittest.TestCase): def test_read_not_empty_avhrr(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_avhrr.nc4') - avhrr_reader = ningesterpy.processors.GridReadingProcessor('analysed_sst', 'lat', 'lon', time='time') + avhrr_reader = sdap.processors.GridReadingProcessor('analysed_sst', 'lat', 'lon', time='time') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() @@ -270,7 +270,7 @@ class TestReadWSWMData(unittest.TestCase): def test_read_not_empty_wswm(self): test_file = path.join(path.dirname(__file__), 'datafiles', 'not_empty_wswm.nc') - wswm_reader = ningesterpy.processors.TimeSeriesReadingProcessor('Qout', 'lat', 'lon', 'time') + wswm_reader = sdap.processors.TimeSeriesReadingProcessor('Qout', 'lat', 'lon', 'time') input_tile = nexusproto.NexusTile() tile_summary = nexusproto.TileSummary() diff --git a/tests/tilesumarizingprocessor_test.py b/tests/tilesumarizingprocessor_test.py index ebebd8b..6461e75 100644 --- a/tests/tilesumarizingprocessor_test.py +++ b/tests/tilesumarizingprocessor_test.py @@ -16,7 +16,7 @@ import unittest from os import path -import ningesterpy.processors +import sdap.processors class TestSummarizeTile(unittest.TestCase): @@ -26,7 +26,7 @@ class TestSummarizeTile(unittest.TestCase): with open(test_file, 'rb') as f: nexustile_str = f.read() - summarizer = ningesterpy.processors.TileSummarizingProcessor() + summarizer = sdap.processors.TileSummarizingProcessor() results = list(summarizer.process(nexustile_str)) @@ -59,7 +59,7 @@ class TestSummarizeTile(unittest.TestCase): with open(test_file, 'rb') as f: nexustile_str = f.read() - summarizer = ningesterpy.processors.TileSummarizingProcessor() + summarizer = sdap.processors.TileSummarizingProcessor() results = list(summarizer.process(nexustile_str)) diff --git a/tests/winddirspeedtouv_test.py b/tests/winddirspeedtouv_test.py index 4f747f9..ecc56fe 100644 --- a/tests/winddirspeedtouv_test.py +++ b/tests/winddirspeedtouv_test.py @@ -19,7 +19,7 @@ from os import path import numpy as np from nexusproto.serialization import from_shaped_array -import ningesterpy.processors +import sdap.processors class TestAscatbUData(unittest.TestCase): @@ -30,7 +30,7 @@ class TestAscatbUData(unittest.TestCase): with open(test_file, 'rb') as f: nexustile_str = f.read() - converter = ningesterpy.processors.WindDirSpeedToUV('U') + converter = sdap.processors.WindDirSpeedToUV('U') results = list(converter.process(nexustile_str)) @@ -67,7 +67,7 @@ class TestAscatbVData(unittest.TestCase): with open(test_file, 'rb') as f: nexustile_str = f.read() - converter = ningesterpy.processors.WindDirSpeedToUV('V') + converter = sdap.processors.WindDirSpeedToUV('V') results = list(converter.process(nexustile_str))
