diff --git a/.circleci/config.yml b/.circleci/config.yml index 984216f..a3aded6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,6 +106,32 @@ jobs: root: images paths: - "*" + build-release: + docker: + - image: docker:stable-git + steps: + - checkout + - setup_remote_docker + - run: + name: Install dependencies + command: | + apk add --no-cache \ + python-dev py-pip bash pigz build-base libffi-dev openssl-dev + pip install \ + docker-compose awscli + - run: + name: Build docker image + command: | + mkdir images + echo "export TAG=$CIRCLE_TAG" >> images/env.sh + source images/env.sh + docker build --rm --force-rm -t isce/isce2:$TAG -f docker/Dockerfile . + cd images + docker save isce/isce2:$TAG > isce2.tar + - persist_to_workspace: + root: images + paths: + - "*" build-periodically: docker: - image: docker:stable-git @@ -172,6 +198,22 @@ workflows: filters: branches: only: master + build-deploy-release: + jobs: + - build-release: + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ + - deploy: + requires: + - build-release + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ weekly: triggers: - schedule: diff --git a/components/isceobj/Sensor/UAVSAR_HDF5_SLC.py b/components/isceobj/Sensor/UAVSAR_HDF5_SLC.py index 6323f5b..ffac857 100755 --- a/components/isceobj/Sensor/UAVSAR_HDF5_SLC.py +++ b/components/isceobj/Sensor/UAVSAR_HDF5_SLC.py @@ -188,7 +188,10 @@ class UAVSAR_HDF5_SLC(Sensor): referenceUTC = file['/science/LSAR/SLC/swaths/zeroDopplerTime'].attrs['units'].decode('utf-8') referenceUTC = referenceUTC.replace('seconds since ','') - referenceUTC = datetime.datetime.strptime(referenceUTC,'%Y-%m-%d %H:%M:%S') + format_str = '%Y-%m-%d %H:%M:%S' + if '.' in referenceUTC: + format_str += '.%f' + referenceUTC = datetime.datetime.strptime(referenceUTC, format_str) relStart = file['/science/LSAR/SLC/swaths/zeroDopplerTime'][0] relEnd = file['/science/LSAR/SLC/swaths/zeroDopplerTime'][-1] @@ -222,7 +225,10 @@ class UAVSAR_HDF5_SLC(Sensor): referenceUTC = file['/science/LSAR/SLC/swaths/zeroDopplerTime'].attrs['units'].decode('utf-8') referenceUTC = referenceUTC.replace('seconds since ','') - t0 = datetime.datetime.strptime(referenceUTC,'%Y-%m-%d %H:%M:%S') + format_str = '%Y-%m-%d %H:%M:%S' + if '.' in referenceUTC: + format_str += '.%f' + t0 = datetime.datetime.strptime(referenceUTC, format_str) t = file['/science/LSAR/SLC/metadata/orbit/time'] position = file['/science/LSAR/SLC/metadata/orbit/position'] velocity = file['/science/LSAR/SLC/metadata/orbit/velocity'] @@ -247,9 +253,11 @@ class UAVSAR_HDF5_SLC(Sensor): ds = fid['/science/LSAR/SLC/swaths/' + self.frequency + '/' + self.polarization] nLines = ds.shape[0] - with open(self.output, 'wb') as fout: - for ii in range(nLines): - ds[ii,:].astype(np.complex64).tofile(fout) + # force casting to complex64 + with ds.astype(np.complex64): + with open(self.output, 'wb') as fout: + for ii in range(nLines): + ds[ii, :].tofile(fout) fid.close() diff --git a/components/isceobj/TopsProc/Factories.py b/components/isceobj/TopsProc/Factories.py index 744bc91..2e1b22a 100644 --- a/components/isceobj/TopsProc/Factories.py +++ b/components/isceobj/TopsProc/Factories.py @@ -50,7 +50,7 @@ def createUnwrapper(other, do_unwrap = None, unwrapperName = None, elif unwrapperName.lower() == 'snaphu': from .runUnwrapSnaphu import runUnwrap elif unwrapperName.lower() == 'snaphu_mcf': - from .runUnwrapSnaphu import runUnwrap + from .runUnwrapSnaphu import runUnwrapMcf as runUnwrap elif unwrapperName.lower() == 'downsample_snaphu': from .run_downsample_unwrapper import runUnwrap elif unwrapperName.lower() == 'icu':