changed the way apid_order was used so that SipsIngest-0.4.5 could use it

edosl0util/cli/merge.py

@@ -3,9 +3,6 @@ from datetime import datetime
 from edosl0util.cli import util
 from edosl0util import merge, stream
 
-VIIRS_APID_ORDER = [826, 821] + range(800, 826)
-
-
 def main():
     parser = util.default_parser()
     parser.add_argument('-o', '--output', default='out.pds')
@@ -28,7 +25,7 @@ def main():
 
     util.configure_logging(args)
 
-    apid_order = {'viirs': VIIRS_APID_ORDER, 'numerical': None}[args.apid_order]
+    apid_order = {'viirs': merge.VIIRS_APID_ORDER, 'numerical': None}[args.apid_order]
     streams = [stream.jpss_packet_stream(io.open(f, 'rb')) for f in args.pds]
     merge.merge(
         streams, output=io.open(args.output, 'wb'),

edosl0util/merge.py

@@ -14,6 +14,7 @@ from collections import deque
 
 LOG = logging.getLogger(__name__)
 
+VIIRS_APID_ORDER = [826, 821] + range(800, 821) + range(822,826)
 
 class _Ptr(object):
     """

setup.py

@@ -5,7 +5,7 @@ setup(
     author='Bruce Flynn',
     author_email='brucef@ssec.wisc.edu',
     description='Utilities for working with EDOS L0 PDS files',
-    version='0.9.dev',
+    version='0.9.1.dev',
     zip_safe=False,
     packages=find_packages(),
     pyver=True,