diff --git a/.circleci/config.yml b/.circleci/config.yml index 98bb5bd..25ba14b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,7 @@ jobs: set -ex pwd . /opt/conda/bin/activate root - export ISCE_HOME=/root/project/install/isce + ISCE_HOME=/root/project/install/isce export PATH="$ISCE_HOME/bin:$ISCE_HOME/applications:/opt/conda/bin:$PATH" export PYTHONPATH="/root/project/install:$PYTHONPATH" export LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH" diff --git a/__init__.py b/__init__.py index a6e2c5b..f2f76a8 100755 --- a/__init__.py +++ b/__init__.py @@ -32,7 +32,12 @@ version = release_history # compatibility alias __version__ = release_version import sys, os -isce_path = os.path.split(os.path.abspath(__file__))[0] +isce_path = os.path.dirname(os.path.abspath(__file__)) + +import logging +from logging.config import fileConfig as _fc +_fc(os.path.join(isce_path, 'defaults', 'logging', 'logging.conf')) + sys.path.insert(1,isce_path) sys.path.insert(1,os.path.join(isce_path,'applications')) sys.path.insert(1,os.path.join(isce_path,'components')) diff --git a/applications/CalculatePegPoint.py b/applications/CalculatePegPoint.py index 5f52ca4..a300c0e 100755 --- a/applications/CalculatePegPoint.py +++ b/applications/CalculatePegPoint.py @@ -31,12 +31,8 @@ -import os import math -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from iscesys.Compatibility import Compatibility Compatibility.checkPythonVersion() from isceobj.Location.Peg import Peg diff --git a/applications/calculateBaseline.py b/applications/calculateBaseline.py index 375fec3..a6eeff5 100755 --- a/applications/calculateBaseline.py +++ b/applications/calculateBaseline.py @@ -30,11 +30,7 @@ -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from iscesys.Compatibility import Compatibility Compatibility.checkPythonVersion() from iscesys.Component.FactoryInit import FactoryInit diff --git a/applications/createGeneric.py b/applications/createGeneric.py index aebb6ba..c7f706b 100755 --- a/applications/createGeneric.py +++ b/applications/createGeneric.py @@ -30,11 +30,7 @@ -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging import isceobj from iscesys.Component.FactoryInit import FactoryInit diff --git a/applications/extractHDROrbit.py b/applications/extractHDROrbit.py index 421b60b..fd7278c 100755 --- a/applications/extractHDROrbit.py +++ b/applications/extractHDROrbit.py @@ -30,12 +30,8 @@ -import os import datetime -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from iscesys.Compatibility import Compatibility Compatibility.checkPythonVersion() from iscesys.Component.FactoryInit import FactoryInit diff --git a/applications/focus.py b/applications/focus.py index 280a9d2..53f64ed 100755 --- a/applications/focus.py +++ b/applications/focus.py @@ -30,12 +30,8 @@ -import os import math -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging import isceobj from iscesys.Component.FactoryInit import FactoryInit from iscesys.DateTimeUtil.DateTimeUtil import DateTimeUtil as DTU diff --git a/applications/insarApp.py b/applications/insarApp.py index 0ab2f0a..8136d1d 100755 --- a/applications/insarApp.py +++ b/applications/insarApp.py @@ -34,8 +34,7 @@ from __future__ import print_function import time import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -46,11 +45,6 @@ from iscesys.Component.Configurable import SELF import isceobj.InsarProc as InsarProc from isceobj.Scene.Frame import FrameMixin -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.insar') diff --git a/applications/isceApp.py b/applications/isceApp.py index 7aec323..4dd6c36 100755 --- a/applications/isceApp.py +++ b/applications/isceApp.py @@ -41,8 +41,7 @@ import datetime import os import sys import math -import logging -import logging.config +from isce import logging import isce import isceobj @@ -1438,11 +1437,6 @@ class IsceApp(Application, FrameMixin): sys.exit("Could not find the output directory: %s" % self.outputDir) os.chdir(self.outputDir) ##change working directory to given output directory - ##read configfile only here so that log path is in output directory - logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') - ) logger = logging.getLogger('isce.isceProc') logger.info(self.intromsg) self._isce.dataDirectory = self.outputDir diff --git a/applications/make_raw.py b/applications/make_raw.py index a3b1f44..3c2af20 100755 --- a/applications/make_raw.py +++ b/applications/make_raw.py @@ -27,16 +27,8 @@ # Author: Walter Szeliga #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) - import isce +from isce import logging from iscesys.Compatibility import Compatibility from iscesys.Component.Component import Component, Port from isceobj.Planet.Ellipsoid import Ellipsoid diff --git a/applications/rtcApp.py b/applications/rtcApp.py index 836151e..05d4575 100755 --- a/applications/rtcApp.py +++ b/applications/rtcApp.py @@ -30,10 +30,8 @@ import time -import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -44,11 +42,6 @@ from iscesys.Component.Configurable import SELF from isceobj import RtcProc from isceobj.Util.decorators import use_api -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.grdsar') diff --git a/applications/scansarApp.py b/applications/scansarApp.py index 55fe196..a5338ce 100755 --- a/applications/scansarApp.py +++ b/applications/scansarApp.py @@ -27,13 +27,9 @@ # Authors: Giangi Sacco, Eric Gurrola #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - import time -import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -43,11 +39,6 @@ from iscesys.Compatibility import Compatibility from iscesys.Component.Configurable import SELF from isceobj import ScansarProc -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.insar') diff --git a/applications/stripmapApp.py b/applications/stripmapApp.py index 6f76b66..3793ac6 100755 --- a/applications/stripmapApp.py +++ b/applications/stripmapApp.py @@ -35,10 +35,8 @@ from __future__ import print_function import time -import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -50,11 +48,6 @@ import isceobj.StripmapProc as StripmapProc from isceobj.Scene.Frame import FrameMixin from isceobj.Util.decorators import use_api -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.insar') diff --git a/applications/topsApp.py b/applications/topsApp.py index 7bc2dc9..7f76a37 100755 --- a/applications/topsApp.py +++ b/applications/topsApp.py @@ -34,10 +34,8 @@ import time -import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -47,11 +45,6 @@ from iscesys.Compatibility import Compatibility from iscesys.Component.Configurable import SELF from isceobj import TopsProc -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.insar') diff --git a/applications/topsOffsetApp.py b/applications/topsOffsetApp.py index f2049a8..52b1e3b 100755 --- a/applications/topsOffsetApp.py +++ b/applications/topsOffsetApp.py @@ -30,10 +30,8 @@ import time -import os import sys -import logging -import logging.config +from isce import logging import isce import isceobj @@ -42,11 +40,6 @@ from isce.applications.topsApp import TopsInSAR from iscesys.Component.Application import Application from isceobj.Util.decorators import use_api -logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', 'logging', - 'logging.conf') -) - logger = logging.getLogger('isce.insar') WINDOW_SIZE_WIDTH = Application.Parameter( diff --git a/applications/viewMetadata.py b/applications/viewMetadata.py index 3051193..8021ff0 100755 --- a/applications/viewMetadata.py +++ b/applications/viewMetadata.py @@ -27,14 +27,7 @@ # Author: Walter Szeliga #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from iscesys.Compatibility import Compatibility Compatibility.checkPythonVersion() from iscesys.Component.FactoryInit import FactoryInit diff --git a/components/isceobj/Location/Offset.py b/components/isceobj/Location/Offset.py index 8bcff9b..96960f4 100755 --- a/components/isceobj/Location/Offset.py +++ b/components/isceobj/Location/Offset.py @@ -29,11 +29,7 @@ import math -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from isceobj.Util.decorators import type_check, force, pickled, logged import numpy as np diff --git a/components/isceobj/Scene/test/testTrack.py b/components/isceobj/Scene/test/testTrack.py index b67cc5c..51883d1 100755 --- a/components/isceobj/Scene/test/testTrack.py +++ b/components/isceobj/Scene/test/testTrack.py @@ -27,14 +27,7 @@ # Author: Walter Szeliga #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - -import os -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from isceobj.Sensor.ERS import ERS from isceobj.Scene.Track import Track logger = logging.getLogger("testTrack") diff --git a/components/isceobj/Util/geo/__init__.py b/components/isceobj/Util/geo/__init__.py index 85f13b9..0c7ffe3 100755 --- a/components/isceobj/Util/geo/__init__.py +++ b/components/isceobj/Util/geo/__init__.py @@ -45,10 +45,6 @@ ellipsoid oblate ellipsoid of revolution (e.g, WGS84) with all the See mainpage.txt for a complete dump of geo's philosophy-- otherwise, use the docstrings. """ -import os -isce_path = os.getenv("ISCE_HOME") ## \namespace geo Vector- and Affine-spaces, on Earth __all__ = ['euclid', 'coordinates', 'ellipsoid', 'charts', 'affine', 'motion'] - - diff --git a/components/iscesys/Component/Configurable.py b/components/iscesys/Component/Configurable.py index 5e9b9ff..3cff30c 100755 --- a/components/iscesys/Component/Configurable.py +++ b/components/iscesys/Component/Configurable.py @@ -32,10 +32,7 @@ from __future__ import print_function import os import sys import operator -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging from iscesys.DictUtils.DictUtils import DictUtils as DU from iscesys.Compatibility import Compatibility Compatibility.checkPythonVersion() diff --git a/components/iscesys/DataRetriever/DataRetriever.py b/components/iscesys/DataRetriever/DataRetriever.py index 4f1a4b2..1599ff8 100755 --- a/components/iscesys/DataRetriever/DataRetriever.py +++ b/components/iscesys/DataRetriever/DataRetriever.py @@ -37,8 +37,7 @@ import isce import zipfile import os import sys -import logging -import logging.config +from isce import logging from iscesys.Component.Component import Component import shutil from urllib import request @@ -325,8 +324,4 @@ class DataRetriever(Component): # logger not defined until baseclass is called if not self.logger: - logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf') - ) self.logger = logging.getLogger('isce.iscesys.DataRetriever') diff --git a/components/stdproc/orbit/orbitLib/CalcSchHeightVel.py b/components/stdproc/orbit/orbitLib/CalcSchHeightVel.py index 684cbeb..53da593 100755 --- a/components/stdproc/orbit/orbitLib/CalcSchHeightVel.py +++ b/components/stdproc/orbit/orbitLib/CalcSchHeightVel.py @@ -29,10 +29,8 @@ -import os import logging import math -import logging.config from iscesys.Compatibility import Compatibility @@ -40,9 +38,6 @@ from isceobj.Planet import Planet from isceobj import Constants as CN from iscesys.Component.Component import Component, Port -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) - RANGE_SAMPLING_RATE = Component.Parameter('rangeSamplingRate', public_name='range sampling rate', type=float, diff --git a/contrib/demUtils/demstitcher/DemStitcher.py b/contrib/demUtils/demstitcher/DemStitcher.py index ea3d51f..ba3e1e3 100755 --- a/contrib/demUtils/demstitcher/DemStitcher.py +++ b/contrib/demUtils/demstitcher/DemStitcher.py @@ -43,8 +43,7 @@ import os import sys import math import urllib.request, urllib.parse, urllib.error -import logging -import logging.config +from isce import logging from iscesys.Component.Component import Component import xml.etree.ElementTree as ET @@ -1013,10 +1012,6 @@ class DemStitcher(Component): # logger not defined until baseclass is called if not self.logger: - logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf') - ) self.logger = logging.getLogger('isce.contrib.demUtils.DemStitcher') url = property(getUrl,setUrl) diff --git a/contrib/demUtils/demstitcher/DemStitcherV3.py b/contrib/demUtils/demstitcher/DemStitcherV3.py index c2b486d..6c5f02c 100755 --- a/contrib/demUtils/demstitcher/DemStitcherV3.py +++ b/contrib/demUtils/demstitcher/DemStitcherV3.py @@ -39,8 +39,7 @@ from ctypes import cdll import os import sys import urllib.request, urllib.error, urllib.parse -import logging -import logging.config +from isce import logging from iscesys.Component.Component import Component from contrib.demUtils.DemStitcher import DemStitcher as DS #Parameters definitions @@ -291,7 +290,4 @@ class DemStitcher(DS): #it's /srtm/version2_1/SRTM(1,3) self._remove = ['.jpg','.xml'] if not self.logger: - logging.config.fileConfig( - os.environ['ISCE_HOME'] + '/library/applications/logging.conf' - ) self.logger = logging.getLogger('isce.contrib.demUtils.DemStitcherV3') diff --git a/contrib/demUtils/swbdstitcher/SWBDStitcher.py b/contrib/demUtils/swbdstitcher/SWBDStitcher.py index cca55fb..e299e9b 100755 --- a/contrib/demUtils/swbdstitcher/SWBDStitcher.py +++ b/contrib/demUtils/swbdstitcher/SWBDStitcher.py @@ -39,9 +39,8 @@ from ctypes import cdll import numpy as np import os import sys -import logging +from isce import logging import math -import logging.config import urllib.request, urllib.parse, urllib.error from iscesys.Component.Component import Component from contrib.demUtils.DemStitcher import DemStitcher @@ -315,9 +314,6 @@ class SWBDStitcher(DemStitcher): #it's /srtm/version2_1/SRTM(1,3) self._remove = ['.jpg','.xml'] if not self.logger: - logging.config.fileConfig( - os.environ['ISCE_HOME'] + '/library/applications/logging.conf' - ) self.logger = logging.getLogger('isce.contrib.demUtils.SWBDStitcher') self.parameter_list = self.parameter_list + super(DemStitcher,self).parameter_list diff --git a/contrib/demUtils/watermask/WaterMask.py b/contrib/demUtils/watermask/WaterMask.py index 766060b..57b5603 100755 --- a/contrib/demUtils/watermask/WaterMask.py +++ b/contrib/demUtils/watermask/WaterMask.py @@ -35,8 +35,7 @@ import sys import math from html.parser import HTMLParser import urllib.request, urllib.parse, urllib.error -import logging -import logging.config +from isce import logging from iscesys.Component.Component import Component import zipfile import os @@ -979,10 +978,6 @@ class MaskStitcher(Component): # logger not defined until baseclass is called if not self.logger: - logging.config.fileConfig( - os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf') - ) self.logger = logging.getLogger('isce.contrib.demUtils.MaskStitcher') utl = property(getUrl,setUrl) diff --git a/contrib/issi/applications/ISSI.py b/contrib/issi/applications/ISSI.py index 330905b..9146035 100755 --- a/contrib/issi/applications/ISSI.py +++ b/contrib/issi/applications/ISSI.py @@ -32,10 +32,7 @@ import os import math -import logging -import logging.config -logging.config.fileConfig(os.path.join(os.environ['ISCE_HOME'], 'defaults', - 'logging', 'logging.conf')) +from isce import logging import isce from iscesys.Component.FactoryInit import FactoryInit