This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch granule-ingester
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ingester.git
The following commit(s) were added to refs/heads/granule-ingester by this push:
new 9d85512 refactor
9d85512 is described below
commit 9d85512ffde1ea1b8213ebdf604f1c4cb39607ce
Author: Eamon Ford <[email protected]>
AuthorDate: Wed Jun 17 16:46:27 2020 -0700
refactor
---
granule_ingester/docker/Dockerfile | 10 +++++-----
granule_ingester/docker/entrypoint.sh | 2 +-
granule_ingester/{sdap => granule_ingester}/__init__.py | 0
.../{sdap => granule_ingester}/consumer/Consumer.py | 4 ++--
granule_ingester/granule_ingester/consumer/__init__.py | 1 +
.../granule_loaders/GranuleLoader.py | 0
granule_ingester/granule_ingester/granule_loaders/__init__.py | 1 +
.../{sdap => granule_ingester}/healthcheck/HealthCheck.py | 0
granule_ingester/granule_ingester/healthcheck/__init__.py | 1 +
granule_ingester/{sdap => granule_ingester}/main.py | 8 ++++----
.../{sdap => granule_ingester}/pipeline/Modules.py | 8 ++++----
.../{sdap => granule_ingester}/pipeline/Pipeline.py | 10 +++++-----
granule_ingester/granule_ingester/pipeline/__init__.py | 2 ++
.../{sdap => granule_ingester}/processors/EmptyTileFilter.py | 2 +-
.../{sdap => granule_ingester}/processors/GenerateTileId.py | 2 +-
.../{sdap => granule_ingester}/processors/TileProcessor.py | 0
.../processors/TileSummarizingProcessor.py | 2 +-
granule_ingester/granule_ingester/processors/__init__.py | 5 +++++
.../{sdap => granule_ingester}/processors/kelvintocelsius.py | 2 +-
.../processors/reading_processors/EccoReadingProcessor.py | 2 +-
.../processors/reading_processors/GridReadingProcessor.py | 2 +-
.../processors/reading_processors/SwathReadingProcessor.py | 2 +-
.../processors/reading_processors/TileReadingProcessor.py | 2 +-
.../reading_processors/TimeSeriesReadingProcessor.py | 2 +-
.../granule_ingester/processors/reading_processors/__init__.py | 5 +++++
.../{sdap => granule_ingester}/slicers/SliceFileByDimension.py | 2 +-
.../{sdap => granule_ingester}/slicers/SliceFileByStepSize.py | 2 +-
.../slicers/SliceFileByTilesDesired.py | 2 +-
.../{sdap => granule_ingester}/slicers/TileSlicer.py | 0
granule_ingester/granule_ingester/slicers/__init__.py | 2 ++
.../{sdap => granule_ingester}/writers/CassandraStore.py | 2 +-
.../{sdap => granule_ingester}/writers/DataStore.py | 2 +-
.../{sdap => granule_ingester}/writers/MetadataStore.py | 2 +-
.../{sdap => granule_ingester}/writers/SolrStore.py | 2 +-
granule_ingester/granule_ingester/writers/__init__.py | 4 ++++
granule_ingester/sdap/consumer/__init__.py | 1 -
granule_ingester/sdap/granule_loaders/__init__.py | 1 -
granule_ingester/sdap/healthcheck/__init__.py | 1 -
granule_ingester/sdap/pipeline/__init__.py | 2 --
granule_ingester/sdap/processors/__init__.py | 5 -----
.../sdap/processors/reading_processors/__init__.py | 5 -----
granule_ingester/sdap/slicers/__init__.py | 2 --
granule_ingester/sdap/writers/__init__.py | 4 ----
granule_ingester/tests/pipeline/test_Pipeline.py | 10 +++++-----
granule_ingester/tests/processors/test_GenerateTileId.py | 2 +-
.../tests/reading_processors/test_EccoReadingProcessor.py | 2 +-
.../tests/reading_processors/test_GridReadingProcessor.py | 2 +-
.../tests/reading_processors/test_SwathReadingProcessor.py | 2 +-
.../tests/reading_processors/test_TileReadingProcessor.py | 2 +-
.../reading_processors/test_TimeSeriesReadingProcessor.py | 2 +-
granule_ingester/tests/slicers/test_SliceFileByDimension.py | 2 +-
granule_ingester/tests/slicers/test_SliceFileByStepSize.py | 2 +-
granule_ingester/tests/slicers/test_SliceFileByTilesDesired.py | 2 +-
granule_ingester/tests/slicers/test_TileSlicer.py | 2 +-
granule_ingester/tests/writers/test_SolrStore.py | 2 +-
55 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/granule_ingester/docker/Dockerfile
b/granule_ingester/docker/Dockerfile
index 8ca61ce..4b25318 100644
--- a/granule_ingester/docker/Dockerfile
+++ b/granule_ingester/docker/Dockerfile
@@ -6,15 +6,15 @@ ENV PATH="/opt/conda/bin:$PATH"
RUN apk update --no-cache && apk add --no-cache --virtual .build-deps git
openjdk8
-COPY /sdap /incubator-sdap-ningester2/sdap
-COPY /setup.py /incubator-sdap-ningester2/setup.py
-COPY /requirements.txt /incubator-sdap-ningester2/requirements.txt
-COPY /conda-requirements.txt /incubator-sdap-ningester2/conda-requirements.txt
+COPY /granule_ingester /sdap/granule_ingester
+COPY /setup.py /sdap/setup.py
+COPY /requirements.txt /sdap/requirements.txt
+COPY /conda-requirements.txt /sdap/conda-requirements.txt
COPY /docker/install_nexusproto.sh /install_nexusproto.sh
COPY /docker/entrypoint.sh /entrypoint.sh
RUN ./install_nexusproto.sh
-RUN cd /incubator-sdap-ningester2 && python setup.py install
+RUN cd /sdap && python setup.py install
RUN apk del .build-deps
diff --git a/granule_ingester/docker/entrypoint.sh
b/granule_ingester/docker/entrypoint.sh
index cec1974..e6f7262 100644
--- a/granule_ingester/docker/entrypoint.sh
+++ b/granule_ingester/docker/entrypoint.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-python /incubator-sdap-ningester2/sdap/main.py \
+python /sdap/granule_ingester/main.py \
$([[ ! -z "$RABBITMQ_HOST" ]] && echo --rabbitmq_host=$RABBITMQ_HOST) \
$([[ ! -z "$RABBITMQ_USERNAME" ]] && echo
--rabbitmq_username=$RABBITMQ_USERNAME) \
$([[ ! -z "$RABBITMQ_PASSWORD" ]] && echo
--rabbitmq_password=$RABBITMQ_PASSWORD) \
diff --git a/granule_ingester/sdap/__init__.py
b/granule_ingester/granule_ingester/__init__.py
similarity index 100%
rename from granule_ingester/sdap/__init__.py
rename to granule_ingester/granule_ingester/__init__.py
diff --git a/granule_ingester/sdap/consumer/Consumer.py
b/granule_ingester/granule_ingester/consumer/Consumer.py
similarity index 97%
rename from granule_ingester/sdap/consumer/Consumer.py
rename to granule_ingester/granule_ingester/consumer/Consumer.py
index 887caad..75d347a 100644
--- a/granule_ingester/sdap/consumer/Consumer.py
+++ b/granule_ingester/granule_ingester/consumer/Consumer.py
@@ -17,8 +17,8 @@ import logging
import aio_pika
-from sdap.healthcheck import HealthCheck
-from sdap.pipeline import Pipeline
+from granule_ingester.healthcheck import HealthCheck
+from granule_ingester.pipeline import Pipeline
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/granule_ingester/consumer/__init__.py
b/granule_ingester/granule_ingester/consumer/__init__.py
new file mode 100644
index 0000000..35d075b
--- /dev/null
+++ b/granule_ingester/granule_ingester/consumer/__init__.py
@@ -0,0 +1 @@
+from granule_ingester.consumer.Consumer import Consumer
diff --git a/granule_ingester/sdap/granule_loaders/GranuleLoader.py
b/granule_ingester/granule_ingester/granule_loaders/GranuleLoader.py
similarity index 100%
rename from granule_ingester/sdap/granule_loaders/GranuleLoader.py
rename to granule_ingester/granule_ingester/granule_loaders/GranuleLoader.py
diff --git a/granule_ingester/granule_ingester/granule_loaders/__init__.py
b/granule_ingester/granule_ingester/granule_loaders/__init__.py
new file mode 100644
index 0000000..5df1cb0
--- /dev/null
+++ b/granule_ingester/granule_ingester/granule_loaders/__init__.py
@@ -0,0 +1 @@
+from granule_ingester.granule_loaders.GranuleLoader import GranuleLoader
diff --git a/granule_ingester/sdap/healthcheck/HealthCheck.py
b/granule_ingester/granule_ingester/healthcheck/HealthCheck.py
similarity index 100%
rename from granule_ingester/sdap/healthcheck/HealthCheck.py
rename to granule_ingester/granule_ingester/healthcheck/HealthCheck.py
diff --git a/granule_ingester/granule_ingester/healthcheck/__init__.py
b/granule_ingester/granule_ingester/healthcheck/__init__.py
new file mode 100644
index 0000000..f343c01
--- /dev/null
+++ b/granule_ingester/granule_ingester/healthcheck/__init__.py
@@ -0,0 +1 @@
+from granule_ingester.healthcheck.HealthCheck import HealthCheck
diff --git a/granule_ingester/sdap/main.py
b/granule_ingester/granule_ingester/main.py
similarity index 96%
rename from granule_ingester/sdap/main.py
rename to granule_ingester/granule_ingester/main.py
index e8baf94..29795f7 100644
--- a/granule_ingester/sdap/main.py
+++ b/granule_ingester/granule_ingester/main.py
@@ -19,10 +19,10 @@ import logging
from functools import partial
from typing import List
-from sdap.consumer import Consumer
-from sdap.healthcheck import HealthCheck
-from sdap.writers import CassandraStore
-from sdap.writers import SolrStore
+from granule_ingester.consumer import Consumer
+from granule_ingester.healthcheck import HealthCheck
+from granule_ingester.writers import CassandraStore
+from granule_ingester.writers import SolrStore
def cassandra_factory(contact_points, port):
diff --git a/granule_ingester/sdap/pipeline/Modules.py
b/granule_ingester/granule_ingester/pipeline/Modules.py
similarity index 65%
rename from granule_ingester/sdap/pipeline/Modules.py
rename to granule_ingester/granule_ingester/pipeline/Modules.py
index 046f283..2cf2245 100644
--- a/granule_ingester/sdap/pipeline/Modules.py
+++ b/granule_ingester/granule_ingester/pipeline/Modules.py
@@ -1,7 +1,7 @@
-from sdap.processors import *
-from sdap.processors.reading_processors import *
-from sdap.slicers import *
-from sdap.granule_loaders import *
+from granule_ingester.processors import *
+from granule_ingester.processors.reading_processors import *
+from granule_ingester.slicers import *
+from granule_ingester.granule_loaders import *
modules = {
"granule": GranuleLoader,
diff --git a/granule_ingester/sdap/pipeline/Pipeline.py
b/granule_ingester/granule_ingester/pipeline/Pipeline.py
similarity index 95%
rename from granule_ingester/sdap/pipeline/Pipeline.py
rename to granule_ingester/granule_ingester/pipeline/Pipeline.py
index 718d357..8f2dd6f 100644
--- a/granule_ingester/sdap/pipeline/Pipeline.py
+++ b/granule_ingester/granule_ingester/pipeline/Pipeline.py
@@ -23,11 +23,11 @@ import xarray as xr
import yaml
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.granule_loaders import GranuleLoader
-from sdap.pipeline.Modules import modules as processor_module_mappings
-from sdap.processors.TileProcessor import TileProcessor
-from sdap.slicers import TileSlicer
-from sdap.writers import DataStore, MetadataStore
+from granule_ingester.granule_loaders import GranuleLoader
+from granule_ingester.pipeline.Modules import modules as
processor_module_mappings
+from granule_ingester.processors.TileProcessor import TileProcessor
+from granule_ingester.slicers import TileSlicer
+from granule_ingester.writers import DataStore, MetadataStore
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/granule_ingester/pipeline/__init__.py
b/granule_ingester/granule_ingester/pipeline/__init__.py
new file mode 100644
index 0000000..7346aa7
--- /dev/null
+++ b/granule_ingester/granule_ingester/pipeline/__init__.py
@@ -0,0 +1,2 @@
+from granule_ingester.pipeline.Pipeline import Pipeline
+from granule_ingester.pipeline.Modules import modules
diff --git a/granule_ingester/sdap/processors/EmptyTileFilter.py
b/granule_ingester/granule_ingester/processors/EmptyTileFilter.py
similarity index 95%
rename from granule_ingester/sdap/processors/EmptyTileFilter.py
rename to granule_ingester/granule_ingester/processors/EmptyTileFilter.py
index e8fd252..4f012f5 100644
--- a/granule_ingester/sdap/processors/EmptyTileFilter.py
+++ b/granule_ingester/granule_ingester/processors/EmptyTileFilter.py
@@ -19,7 +19,7 @@ import numpy
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import from_shaped_array
-from sdap.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileProcessor import TileProcessor
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/sdap/processors/GenerateTileId.py
b/granule_ingester/granule_ingester/processors/GenerateTileId.py
similarity index 94%
rename from granule_ingester/sdap/processors/GenerateTileId.py
rename to granule_ingester/granule_ingester/processors/GenerateTileId.py
index 3b965d8..2d965f7 100644
--- a/granule_ingester/sdap/processors/GenerateTileId.py
+++ b/granule_ingester/granule_ingester/processors/GenerateTileId.py
@@ -17,7 +17,7 @@ import os
import uuid
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileProcessor import TileProcessor
class GenerateTileId(TileProcessor):
diff --git a/granule_ingester/sdap/processors/TileProcessor.py
b/granule_ingester/granule_ingester/processors/TileProcessor.py
similarity index 100%
rename from granule_ingester/sdap/processors/TileProcessor.py
rename to granule_ingester/granule_ingester/processors/TileProcessor.py
diff --git a/granule_ingester/sdap/processors/TileSummarizingProcessor.py
b/granule_ingester/granule_ingester/processors/TileSummarizingProcessor.py
similarity index 98%
rename from granule_ingester/sdap/processors/TileSummarizingProcessor.py
rename to
granule_ingester/granule_ingester/processors/TileSummarizingProcessor.py
index 7f9eb75..1fe5d7d 100644
--- a/granule_ingester/sdap/processors/TileSummarizingProcessor.py
+++ b/granule_ingester/granule_ingester/processors/TileSummarizingProcessor.py
@@ -17,7 +17,7 @@ import numpy
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import from_shaped_array
-from sdap.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileProcessor import TileProcessor
class NoTimeException(Exception):
diff --git a/granule_ingester/granule_ingester/processors/__init__.py
b/granule_ingester/granule_ingester/processors/__init__.py
new file mode 100644
index 0000000..592d8ea
--- /dev/null
+++ b/granule_ingester/granule_ingester/processors/__init__.py
@@ -0,0 +1,5 @@
+from granule_ingester.processors.EmptyTileFilter import EmptyTileFilter
+from granule_ingester.processors.GenerateTileId import GenerateTileId
+from granule_ingester.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileSummarizingProcessor import
TileSummarizingProcessor
+from granule_ingester.processors.kelvintocelsius import KelvinToCelsius
diff --git a/granule_ingester/sdap/processors/kelvintocelsius.py
b/granule_ingester/granule_ingester/processors/kelvintocelsius.py
similarity index 94%
rename from granule_ingester/sdap/processors/kelvintocelsius.py
rename to granule_ingester/granule_ingester/processors/kelvintocelsius.py
index 59b505a..e728418 100644
--- a/granule_ingester/sdap/processors/kelvintocelsius.py
+++ b/granule_ingester/granule_ingester/processors/kelvintocelsius.py
@@ -16,7 +16,7 @@
from nexusproto.serialization import from_shaped_array, to_shaped_array
-from sdap.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileProcessor import TileProcessor
class KelvinToCelsius(TileProcessor):
diff --git
a/granule_ingester/sdap/processors/reading_processors/EccoReadingProcessor.py
b/granule_ingester/granule_ingester/processors/reading_processors/EccoReadingProcessor.py
similarity index 96%
rename from
granule_ingester/sdap/processors/reading_processors/EccoReadingProcessor.py
rename to
granule_ingester/granule_ingester/processors/reading_processors/EccoReadingProcessor.py
index 9613307..1876013 100644
---
a/granule_ingester/sdap/processors/reading_processors/EccoReadingProcessor.py
+++
b/granule_ingester/granule_ingester/processors/reading_processors/EccoReadingProcessor.py
@@ -5,7 +5,7 @@ import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import to_shaped_array
-from sdap.processors.reading_processors.TileReadingProcessor import
TileReadingProcessor
+from granule_ingester.processors.reading_processors.TileReadingProcessor
import TileReadingProcessor
class EccoReadingProcessor(TileReadingProcessor):
diff --git
a/granule_ingester/sdap/processors/reading_processors/GridReadingProcessor.py
b/granule_ingester/granule_ingester/processors/reading_processors/GridReadingProcessor.py
similarity index 96%
rename from
granule_ingester/sdap/processors/reading_processors/GridReadingProcessor.py
rename to
granule_ingester/granule_ingester/processors/reading_processors/GridReadingProcessor.py
index 3629dcb..4354f9e 100644
---
a/granule_ingester/sdap/processors/reading_processors/GridReadingProcessor.py
+++
b/granule_ingester/granule_ingester/processors/reading_processors/GridReadingProcessor.py
@@ -5,7 +5,7 @@ import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import to_shaped_array
-from sdap.processors.reading_processors.TileReadingProcessor import
TileReadingProcessor
+from granule_ingester.processors.reading_processors.TileReadingProcessor
import TileReadingProcessor
class GridReadingProcessor(TileReadingProcessor):
diff --git
a/granule_ingester/sdap/processors/reading_processors/SwathReadingProcessor.py
b/granule_ingester/granule_ingester/processors/reading_processors/SwathReadingProcessor.py
similarity index 95%
rename from
granule_ingester/sdap/processors/reading_processors/SwathReadingProcessor.py
rename to
granule_ingester/granule_ingester/processors/reading_processors/SwathReadingProcessor.py
index 545cafc..fec28ca 100644
---
a/granule_ingester/sdap/processors/reading_processors/SwathReadingProcessor.py
+++
b/granule_ingester/granule_ingester/processors/reading_processors/SwathReadingProcessor.py
@@ -5,7 +5,7 @@ import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import to_shaped_array
-from sdap.processors.reading_processors.TileReadingProcessor import
TileReadingProcessor
+from granule_ingester.processors.reading_processors.TileReadingProcessor
import TileReadingProcessor
class SwathReadingProcessor(TileReadingProcessor):
diff --git
a/granule_ingester/sdap/processors/reading_processors/TileReadingProcessor.py
b/granule_ingester/granule_ingester/processors/reading_processors/TileReadingProcessor.py
similarity index 97%
rename from
granule_ingester/sdap/processors/reading_processors/TileReadingProcessor.py
rename to
granule_ingester/granule_ingester/processors/reading_processors/TileReadingProcessor.py
index d5a9867..14a44f5 100644
---
a/granule_ingester/sdap/processors/reading_processors/TileReadingProcessor.py
+++
b/granule_ingester/granule_ingester/processors/reading_processors/TileReadingProcessor.py
@@ -21,7 +21,7 @@ import numpy as np
import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors.TileProcessor import TileProcessor
+from granule_ingester.processors.TileProcessor import TileProcessor
class TileReadingProcessor(TileProcessor, ABC):
diff --git
a/granule_ingester/sdap/processors/reading_processors/TimeSeriesReadingProcessor.py
b/granule_ingester/granule_ingester/processors/reading_processors/TimeSeriesReadingProcessor.py
similarity index 97%
rename from
granule_ingester/sdap/processors/reading_processors/TimeSeriesReadingProcessor.py
rename to
granule_ingester/granule_ingester/processors/reading_processors/TimeSeriesReadingProcessor.py
index 6ea57fa..2831c0c 100644
---
a/granule_ingester/sdap/processors/reading_processors/TimeSeriesReadingProcessor.py
+++
b/granule_ingester/granule_ingester/processors/reading_processors/TimeSeriesReadingProcessor.py
@@ -5,7 +5,7 @@ import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import to_shaped_array
-from sdap.processors.reading_processors.TileReadingProcessor import
TileReadingProcessor
+from granule_ingester.processors.reading_processors.TileReadingProcessor
import TileReadingProcessor
class TimeSeriesReadingProcessor(TileReadingProcessor):
diff --git
a/granule_ingester/granule_ingester/processors/reading_processors/__init__.py
b/granule_ingester/granule_ingester/processors/reading_processors/__init__.py
new file mode 100644
index 0000000..2fecce9
--- /dev/null
+++
b/granule_ingester/granule_ingester/processors/reading_processors/__init__.py
@@ -0,0 +1,5 @@
+from granule_ingester.processors.reading_processors.EccoReadingProcessor
import EccoReadingProcessor
+from granule_ingester.processors.reading_processors.GridReadingProcessor
import GridReadingProcessor
+from granule_ingester.processors.reading_processors.SwathReadingProcessor
import SwathReadingProcessor
+from granule_ingester.processors.reading_processors.TileReadingProcessor
import TileReadingProcessor
+from granule_ingester.processors.reading_processors.TimeSeriesReadingProcessor
import TimeSeriesReadingProcessor
diff --git a/granule_ingester/sdap/slicers/SliceFileByDimension.py
b/granule_ingester/granule_ingester/slicers/SliceFileByDimension.py
similarity index 97%
rename from granule_ingester/sdap/slicers/SliceFileByDimension.py
rename to granule_ingester/granule_ingester/slicers/SliceFileByDimension.py
index 9310727..193cf69 100644
--- a/granule_ingester/sdap/slicers/SliceFileByDimension.py
+++ b/granule_ingester/granule_ingester/slicers/SliceFileByDimension.py
@@ -2,7 +2,7 @@
# import itertools
# from typing import List, Dict, Tuple,Set
#
-# # from sdap.entities import Dimension
+# # from granule_ingester.entities import Dimension
#
#
# class SliceFileByDimension:
diff --git a/granule_ingester/sdap/slicers/SliceFileByStepSize.py
b/granule_ingester/granule_ingester/slicers/SliceFileByStepSize.py
similarity index 97%
rename from granule_ingester/sdap/slicers/SliceFileByStepSize.py
rename to granule_ingester/granule_ingester/slicers/SliceFileByStepSize.py
index c6f6956..6e03336 100644
--- a/granule_ingester/sdap/slicers/SliceFileByStepSize.py
+++ b/granule_ingester/granule_ingester/slicers/SliceFileByStepSize.py
@@ -17,7 +17,7 @@ import itertools
import logging
from typing import List, Dict
-from sdap.slicers.TileSlicer import TileSlicer
+from granule_ingester.slicers.TileSlicer import TileSlicer
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/sdap/slicers/SliceFileByTilesDesired.py
b/granule_ingester/granule_ingester/slicers/SliceFileByTilesDesired.py
similarity index 98%
rename from granule_ingester/sdap/slicers/SliceFileByTilesDesired.py
rename to granule_ingester/granule_ingester/slicers/SliceFileByTilesDesired.py
index 64b9c90..a4d401a 100644
--- a/granule_ingester/sdap/slicers/SliceFileByTilesDesired.py
+++ b/granule_ingester/granule_ingester/slicers/SliceFileByTilesDesired.py
@@ -2,7 +2,7 @@
# import itertools
# from typing import List, Dict, Tuple
#
-# # from sdap.entities import Dimension
+# # from granule_ingester.entities import Dimension
#
#
# class SliceFileByTilesDesired:
diff --git a/granule_ingester/sdap/slicers/TileSlicer.py
b/granule_ingester/granule_ingester/slicers/TileSlicer.py
similarity index 100%
rename from granule_ingester/sdap/slicers/TileSlicer.py
rename to granule_ingester/granule_ingester/slicers/TileSlicer.py
diff --git a/granule_ingester/granule_ingester/slicers/__init__.py
b/granule_ingester/granule_ingester/slicers/__init__.py
new file mode 100644
index 0000000..b13ea59
--- /dev/null
+++ b/granule_ingester/granule_ingester/slicers/__init__.py
@@ -0,0 +1,2 @@
+from granule_ingester.slicers.SliceFileByStepSize import SliceFileByStepSize
+from granule_ingester.slicers.TileSlicer import TileSlicer
diff --git a/granule_ingester/sdap/writers/CassandraStore.py
b/granule_ingester/granule_ingester/writers/CassandraStore.py
similarity index 98%
rename from granule_ingester/sdap/writers/CassandraStore.py
rename to granule_ingester/granule_ingester/writers/CassandraStore.py
index 213a489..7a9f146 100644
--- a/granule_ingester/sdap/writers/CassandraStore.py
+++ b/granule_ingester/granule_ingester/writers/CassandraStore.py
@@ -23,7 +23,7 @@ from cassandra.cqlengine import columns
from cassandra.cqlengine.models import Model
from nexusproto.DataTile_pb2 import NexusTile, TileData
-from sdap.writers.DataStore import DataStore
+from granule_ingester.writers.DataStore import DataStore
logging.getLogger('cassandra').setLevel(logging.INFO)
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/sdap/writers/DataStore.py
b/granule_ingester/granule_ingester/writers/DataStore.py
similarity index 81%
rename from granule_ingester/sdap/writers/DataStore.py
rename to granule_ingester/granule_ingester/writers/DataStore.py
index 9931cca..889d41e 100644
--- a/granule_ingester/sdap/writers/DataStore.py
+++ b/granule_ingester/granule_ingester/writers/DataStore.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.healthcheck import HealthCheck
+from granule_ingester.healthcheck import HealthCheck
class DataStore(HealthCheck, ABC):
diff --git a/granule_ingester/sdap/writers/MetadataStore.py
b/granule_ingester/granule_ingester/writers/MetadataStore.py
similarity index 81%
rename from granule_ingester/sdap/writers/MetadataStore.py
rename to granule_ingester/granule_ingester/writers/MetadataStore.py
index 0b66af0..26311af 100644
--- a/granule_ingester/sdap/writers/MetadataStore.py
+++ b/granule_ingester/granule_ingester/writers/MetadataStore.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.healthcheck import HealthCheck
+from granule_ingester.healthcheck import HealthCheck
class MetadataStore(HealthCheck, ABC):
diff --git a/granule_ingester/sdap/writers/SolrStore.py
b/granule_ingester/granule_ingester/writers/SolrStore.py
similarity index 99%
rename from granule_ingester/sdap/writers/SolrStore.py
rename to granule_ingester/granule_ingester/writers/SolrStore.py
index 187940c..9d6a7f0 100644
--- a/granule_ingester/sdap/writers/SolrStore.py
+++ b/granule_ingester/granule_ingester/writers/SolrStore.py
@@ -25,7 +25,7 @@ import aiohttp
from nexusproto.DataTile_pb2 import *
from tenacity import *
-from sdap.writers.MetadataStore import MetadataStore
+from granule_ingester.writers.MetadataStore import MetadataStore
logger = logging.getLogger(__name__)
diff --git a/granule_ingester/granule_ingester/writers/__init__.py
b/granule_ingester/granule_ingester/writers/__init__.py
new file mode 100644
index 0000000..9323d8c
--- /dev/null
+++ b/granule_ingester/granule_ingester/writers/__init__.py
@@ -0,0 +1,4 @@
+from granule_ingester.writers.DataStore import DataStore
+from granule_ingester.writers.MetadataStore import MetadataStore
+from granule_ingester.writers.SolrStore import SolrStore
+from granule_ingester.writers.CassandraStore import CassandraStore
diff --git a/granule_ingester/sdap/consumer/__init__.py
b/granule_ingester/sdap/consumer/__init__.py
deleted file mode 100644
index 5ce7ba7..0000000
--- a/granule_ingester/sdap/consumer/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from sdap.consumer.Consumer import Consumer
diff --git a/granule_ingester/sdap/granule_loaders/__init__.py
b/granule_ingester/sdap/granule_loaders/__init__.py
deleted file mode 100644
index 4997df8..0000000
--- a/granule_ingester/sdap/granule_loaders/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from sdap.granule_loaders.GranuleLoader import GranuleLoader
diff --git a/granule_ingester/sdap/healthcheck/__init__.py
b/granule_ingester/sdap/healthcheck/__init__.py
deleted file mode 100644
index 36587d0..0000000
--- a/granule_ingester/sdap/healthcheck/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from sdap.healthcheck.HealthCheck import HealthCheck
diff --git a/granule_ingester/sdap/pipeline/__init__.py
b/granule_ingester/sdap/pipeline/__init__.py
deleted file mode 100644
index c476cad..0000000
--- a/granule_ingester/sdap/pipeline/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from sdap.pipeline.Pipeline import Pipeline
-from sdap.pipeline.Modules import modules
diff --git a/granule_ingester/sdap/processors/__init__.py
b/granule_ingester/sdap/processors/__init__.py
deleted file mode 100644
index 6de43fd..0000000
--- a/granule_ingester/sdap/processors/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from sdap.processors.EmptyTileFilter import EmptyTileFilter
-from sdap.processors.GenerateTileId import GenerateTileId
-from sdap.processors.TileProcessor import TileProcessor
-from sdap.processors.TileSummarizingProcessor import TileSummarizingProcessor
-from sdap.processors.kelvintocelsius import KelvinToCelsius
diff --git a/granule_ingester/sdap/processors/reading_processors/__init__.py
b/granule_ingester/sdap/processors/reading_processors/__init__.py
deleted file mode 100644
index 0be5cf4..0000000
--- a/granule_ingester/sdap/processors/reading_processors/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from sdap.processors.reading_processors.EccoReadingProcessor import
EccoReadingProcessor
-from sdap.processors.reading_processors.GridReadingProcessor import
GridReadingProcessor
-from sdap.processors.reading_processors.SwathReadingProcessor import
SwathReadingProcessor
-from sdap.processors.reading_processors.TileReadingProcessor import
TileReadingProcessor
-from sdap.processors.reading_processors.TimeSeriesReadingProcessor import
TimeSeriesReadingProcessor
diff --git a/granule_ingester/sdap/slicers/__init__.py
b/granule_ingester/sdap/slicers/__init__.py
deleted file mode 100644
index 00fa7a2..0000000
--- a/granule_ingester/sdap/slicers/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from sdap.slicers.SliceFileByStepSize import SliceFileByStepSize
-from sdap.slicers.TileSlicer import TileSlicer
diff --git a/granule_ingester/sdap/writers/__init__.py
b/granule_ingester/sdap/writers/__init__.py
deleted file mode 100644
index e62b748..0000000
--- a/granule_ingester/sdap/writers/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from sdap.writers.DataStore import DataStore
-from sdap.writers.MetadataStore import MetadataStore
-from sdap.writers.SolrStore import SolrStore
-from sdap.writers.CassandraStore import CassandraStore
diff --git a/granule_ingester/tests/pipeline/test_Pipeline.py
b/granule_ingester/tests/pipeline/test_Pipeline.py
index 6db14e3..c18bf8b 100644
--- a/granule_ingester/tests/pipeline/test_Pipeline.py
+++ b/granule_ingester/tests/pipeline/test_Pipeline.py
@@ -3,11 +3,11 @@ import unittest
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.pipeline.Pipeline import Pipeline
-from sdap.processors import GenerateTileId
-from sdap.processors.reading_processors import EccoReadingProcessor
-from sdap.slicers.SliceFileByStepSize import *
-from sdap.writers import DataStore, MetadataStore
+from granule_ingester.pipeline.Pipeline import Pipeline
+from granule_ingester.processors import GenerateTileId
+from granule_ingester.processors.reading_processors import EccoReadingProcessor
+from granule_ingester.slicers.SliceFileByStepSize import *
+from granule_ingester.writers import DataStore, MetadataStore
class TestPipeline(unittest.TestCase):
diff --git a/granule_ingester/tests/processors/test_GenerateTileId.py
b/granule_ingester/tests/processors/test_GenerateTileId.py
index 92c1964..17f1677 100644
--- a/granule_ingester/tests/processors/test_GenerateTileId.py
+++ b/granule_ingester/tests/processors/test_GenerateTileId.py
@@ -3,7 +3,7 @@ import unittest
import uuid
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors import GenerateTileId
+from granule_ingester.processors import GenerateTileId
class TestGenerateTileId(unittest.TestCase):
diff --git
a/granule_ingester/tests/reading_processors/test_EccoReadingProcessor.py
b/granule_ingester/tests/reading_processors/test_EccoReadingProcessor.py
index 4fc3cbe..f2e9f29 100644
--- a/granule_ingester/tests/reading_processors/test_EccoReadingProcessor.py
+++ b/granule_ingester/tests/reading_processors/test_EccoReadingProcessor.py
@@ -4,7 +4,7 @@ from os import path
import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors.reading_processors import EccoReadingProcessor
+from granule_ingester.processors.reading_processors import EccoReadingProcessor
class TestEccoReadingProcessor(unittest.TestCase):
diff --git
a/granule_ingester/tests/reading_processors/test_GridReadingProcessor.py
b/granule_ingester/tests/reading_processors/test_GridReadingProcessor.py
index 19384b3..aec3ae8 100644
--- a/granule_ingester/tests/reading_processors/test_GridReadingProcessor.py
+++ b/granule_ingester/tests/reading_processors/test_GridReadingProcessor.py
@@ -21,7 +21,7 @@ import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
from nexusproto.serialization import from_shaped_array
-from sdap.processors.reading_processors import GridReadingProcessor
+from granule_ingester.processors.reading_processors import GridReadingProcessor
class TestReadMurData(unittest.TestCase):
diff --git
a/granule_ingester/tests/reading_processors/test_SwathReadingProcessor.py
b/granule_ingester/tests/reading_processors/test_SwathReadingProcessor.py
index 03d20cb..55ac4fc 100644
--- a/granule_ingester/tests/reading_processors/test_SwathReadingProcessor.py
+++ b/granule_ingester/tests/reading_processors/test_SwathReadingProcessor.py
@@ -19,7 +19,7 @@ from os import path
import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors.reading_processors import SwathReadingProcessor
+from granule_ingester.processors.reading_processors import
SwathReadingProcessor
class TestReadAscatbData(unittest.TestCase):
diff --git
a/granule_ingester/tests/reading_processors/test_TileReadingProcessor.py
b/granule_ingester/tests/reading_processors/test_TileReadingProcessor.py
index cf54a86..90ae8bb 100644
--- a/granule_ingester/tests/reading_processors/test_TileReadingProcessor.py
+++ b/granule_ingester/tests/reading_processors/test_TileReadingProcessor.py
@@ -4,7 +4,7 @@ from os import path
import xarray as xr
-from sdap.processors.reading_processors import TileReadingProcessor
+from granule_ingester.processors.reading_processors import TileReadingProcessor
class TestEccoReadingProcessor(unittest.TestCase):
diff --git
a/granule_ingester/tests/reading_processors/test_TimeSeriesReadingProcessor.py
b/granule_ingester/tests/reading_processors/test_TimeSeriesReadingProcessor.py
index be6a2d5..a936885 100644
---
a/granule_ingester/tests/reading_processors/test_TimeSeriesReadingProcessor.py
+++
b/granule_ingester/tests/reading_processors/test_TimeSeriesReadingProcessor.py
@@ -19,7 +19,7 @@ from os import path
import xarray as xr
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.processors.reading_processors import TimeSeriesReadingProcessor
+from granule_ingester.processors.reading_processors import
TimeSeriesReadingProcessor
class TestReadWSWMData(unittest.TestCase):
diff --git a/granule_ingester/tests/slicers/test_SliceFileByDimension.py
b/granule_ingester/tests/slicers/test_SliceFileByDimension.py
index 4cf264a..e86442b 100644
--- a/granule_ingester/tests/slicers/test_SliceFileByDimension.py
+++ b/granule_ingester/tests/slicers/test_SliceFileByDimension.py
@@ -2,7 +2,7 @@
# from collections import Set
#
# from netCDF4 import Dataset
-# from sdap.slicers.SliceFileByDimension import SliceFileByDimension
+# from granule_ingester.slicers.SliceFileByDimension import
SliceFileByDimension
#
#
# class TestSliceFileByTilesDesired(unittest.TestCase):
diff --git a/granule_ingester/tests/slicers/test_SliceFileByStepSize.py
b/granule_ingester/tests/slicers/test_SliceFileByStepSize.py
index 995a67b..7a8dd51 100644
--- a/granule_ingester/tests/slicers/test_SliceFileByStepSize.py
+++ b/granule_ingester/tests/slicers/test_SliceFileByStepSize.py
@@ -3,7 +3,7 @@ from os import path
import xarray as xr
-from sdap.slicers.SliceFileByStepSize import SliceFileByStepSize
+from granule_ingester.slicers.SliceFileByStepSize import SliceFileByStepSize
class TestSliceFileByStepSize(unittest.TestCase):
diff --git a/granule_ingester/tests/slicers/test_SliceFileByTilesDesired.py
b/granule_ingester/tests/slicers/test_SliceFileByTilesDesired.py
index 2b0b0ae..772c63e 100644
--- a/granule_ingester/tests/slicers/test_SliceFileByTilesDesired.py
+++ b/granule_ingester/tests/slicers/test_SliceFileByTilesDesired.py
@@ -2,7 +2,7 @@
# from collections import Set
#
# from netCDF4 import Dataset
-# from sdap.slicers.SliceFileByTilesDesired import SliceFileByTilesDesired
+# from granule_ingester.slicers.SliceFileByTilesDesired import
SliceFileByTilesDesired
#
#
# class TestSliceFileByTilesDesired(unittest.TestCase):
diff --git a/granule_ingester/tests/slicers/test_TileSlicer.py
b/granule_ingester/tests/slicers/test_TileSlicer.py
index 41c9b77..c3ad97f 100644
--- a/granule_ingester/tests/slicers/test_TileSlicer.py
+++ b/granule_ingester/tests/slicers/test_TileSlicer.py
@@ -1,7 +1,7 @@
import asyncio
import os
import unittest
-from sdap.slicers.TileSlicer import TileSlicer
+from granule_ingester.slicers.TileSlicer import TileSlicer
import xarray as xr
diff --git a/granule_ingester/tests/writers/test_SolrStore.py
b/granule_ingester/tests/writers/test_SolrStore.py
index cfded10..76b85ac 100644
--- a/granule_ingester/tests/writers/test_SolrStore.py
+++ b/granule_ingester/tests/writers/test_SolrStore.py
@@ -3,7 +3,7 @@ import unittest
from nexusproto import DataTile_pb2 as nexusproto
-from sdap.writers import SolrStore
+from granule_ingester.writers import SolrStore
class TestSolrStore(unittest.TestCase):
