merged and resolved the conflicts

requirements.txt

@@ -7,4 +7,6 @@ numexpr
 numpy
 scipy
 # gdal==`gdal-config --version`
+pytz==2020.1
+pandas
 

tests/test_convert.py

@@ -14,6 +14,7 @@
 import unittest
 
 from utilities.convert import Converter, create_sub_dirs_for_convert
+from convert import Converter, create_sub_dirs_for_convert
 
 
 class TestConverter(unittest.TestCase):

tests/test_mpi_runner.py

@@ -17,6 +17,9 @@
 from utilities.convert import create_sub_dirs_for_convert
 from utilities.mpi_runner import parallelise_convert_on_tiles
 from utilities.parallel import attempt_parallel
+from convert import create_sub_dirs_for_convert
+from mpi_runner import parallelise_convert_on_tiles
+from parallel import attempt_parallel
 
 
 class TestMPIRunner(unittest.TestCase):

tests/test_parallel.py

@@ -16,6 +16,7 @@
 import numpy as np
 
 from utilities.parallel import attempt_parallel
+from parallel import attempt_parallel
 
 
 class TestParallel(unittest.TestCase):

tests/test_topographic/test_multipliercalc.py

@@ -18,6 +18,8 @@
     import test_slope, test_escarp
 from tests.test_topographic.test_all_topo_engineered_data \
     import mh_engineered
+from test_all_topo_engineered_data import test_slope, test_escarp
+from test_all_topo_engineered_data import mh_engineered
 
 
 class TestMultiplierCalc(unittest.TestCase):

utilities/blrb.py

@@ -11,6 +11,7 @@
 import numpy
 import logging
 from utilities.meta import print_call
+from meta import print_call
 import math
 
 LOGGER = logging.getLogger('root.' + __name__)

utilities/convert.py

@@ -138,6 +138,7 @@ def process_tile(self, tile):
             band = out_ds.GetRasterBand(band_index)
             try:
                 band.WriteArray(multiplied.data[::-1])
+                band.WriteArray(multiplied.data)
             except ValueError:
                 log.error("Mismatch between output file and data array")
                 log.error(multiplied.data.shape)

utilities/mpi_runner.py

@@ -7,6 +7,8 @@
 
 from utilities.convert import Converter, create_sub_dirs_for_convert
 from utilities.parallel import attempt_parallel
+from convert import Converter, create_sub_dirs_for_convert
+from parallel import attempt_parallel
 
 
 def parallelise_convert_on_tiles(data_path, comm):