Skip to content

Commit

Permalink
fix ImportError circularImport using absolute Import
Browse files Browse the repository at this point in the history
  • Loading branch information
earthai-tech committed Oct 1, 2021
1 parent 3f79df1 commit 3a288ec
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 18 deletions.
5 changes: 0 additions & 5 deletions pycsamt/ff/core/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from .avg import Avg
from .cs import *
from .edi import *
from .j import *
from .z import *
14 changes: 6 additions & 8 deletions pycsamt/ff/core/avg.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,17 @@
import warnings,shutil
import numpy as np
import pandas as pd

from pycsamt.etc import infos as infOS
from datetime import datetime, timezone

from pycsamt.ff.core.cs import Site

from pycsamt.ff.core.j import J_collection
from pycsamt.ff.core.edi import Edi

from pycsamt.ff.processing import corr
from pycsamt.ff.processing import callffunc as cfunc
from pycsamt.ff.processing import zcalculator as Zcc
from pycsamt.utils._csamtpylog import csamtpylog
from pycsamt.utils import func_utils as func
from pycsamt.utils import exceptions as CSex


_logger=csamtpylog.get_csamtpy_logger(__name__)


Expand Down Expand Up @@ -539,11 +534,12 @@ def avg_to_jfile (self, avg_data_fn=None , profile_fn =None,
* survey_name: bool,
survey_area
"""
from pycsamt.ff.core.cs import Site

savepath =kws.pop('savepath', None)
write_info =kws.pop('writeInfos', False)
survey_name =kws.pop('survey_name', None)



if j_extension is not None and '.' not in j_extension:
j_extension ='.'+j_extension

Expand Down Expand Up @@ -816,6 +812,8 @@ def avg_to_edifile (self, data_fn =None , profile_fn =None ,
... savepath =save_edipath,
... apply_filter=None )
"""
from pycsamt.ff.core.cs import Site
from pycsamt.ff.processing import corr

utm_zone = kwargs.pop('utm_zone', None)

Expand Down
3 changes: 2 additions & 1 deletion pycsamt/geodrill/geoCore/geodrill.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import datetime
import numpy as np
import pandas as pd
import scipy as sp

import pycsamt.utils.exceptions as CSex
from pycsamt.modeling import occam2d
Expand All @@ -59,7 +58,9 @@
_logger=csamtpylog.get_csamtpy_logger(__name__)
except :
pass

try :
import scipy as sp
import scipy.stats as spSTAT
scipy_version = [int(vers) for vers in sp.__version__.split('.')]
if scipy_version [0] == 1 :
Expand Down
3 changes: 0 additions & 3 deletions pycsamt/geodrill/geoDB/sql_recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,10 @@

from pycsamt.geodrill.geoCore.structural import Geo_formation
import pycsamt.utils.exceptions as CSex

from pycsamt.geodrill.geoDB.dict_app import Glob
from pycsamt.geodrill.geoDB.interfaceDB import ManageDB

from pycsamt.utils.decorator import redirect_cls_or_func
from pycsamt.utils._csamtpylog import csamtpylog

#set LogInfos
try :
_logger=csamtpylog.get_csamtpy_logger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
'pyproj',
'configparser']

setup_kwargs['python_requires'] ='>=3.6'
setup_kwargs['python_requires'] ='>=3.7'

authors =["Kouadio K. Laurent, ", 'Rong Liu, ',
'Binbin Mi, ','Chum-ning Liu, ', 'Albert O. Malory.']
Expand Down

0 comments on commit 3a288ec

Please sign in to comment.