Fix relative import syntax.

Fixes broken implementation from
  81f9df69442d686bed368ac6db2180cd482f1acb

diff --git a/calibcant/T_analyze.py b/calibcant/T_analyze.py
index ce4e41abc6aed87fd3856a9d013b4679455f9308..32751fcf48ade5c73603b88b72b8eff8e6d4e89b 100755 (executable)
--- a/calibcant/T_analyze.py
+++ b/calibcant/T_analyze.py
@@ -35,8 +35,8 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 

-import .common
-import .config
+from . import common
+from . import config

 
 
 def C_to_K(celsius) :
 
 
 def C_to_K(celsius) :

diff --git a/calibcant/__init__.py b/calibcant/__init__.py
index 035d77c9b0fe77382a8db1ffeaa795dd9cb89588..516334bc242bb7395fcffd80cc0e4cfb9e6b1ab7 100644 (file)
--- a/calibcant/__init__.py
+++ b/calibcant/__init__.py
@@ -18,4 +18,4 @@
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 

-from .common import VERSION
+VERSION="0.4"

diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index 81f88c2836ed5fdbf2f43a47254a0e65e8550b3a..b8e4c71566d54a7c52ac9073cbbe30eab0ff0baf 100755 (executable)
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -49,9 +49,9 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 

-import .common
-import .config
-import .T_analyze
+from . import common
+from . import config
+from . import T_analyze

 
 
 kb = 1.3806504e-23 # Boltzmann's constant in J/K
 
 
 kb = 1.3806504e-23 # Boltzmann's constant in J/K

diff --git a/calibcant/bump_analyze.py b/calibcant/bump_analyze.py
index 4212da38f80c0645aa44de72b9aa704965023aac..88a964815560faf2e2b1d534ecbacdfe5970dee5 100755 (executable)
--- a/calibcant/bump_analyze.py
+++ b/calibcant/bump_analyze.py
@@ -49,8 +49,8 @@ import data_logger
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 

-import .common
-import .config
+from . import common
+from . import config

 
 
 @splittableKwargsFunction()
 
 
 @splittableKwargsFunction()

diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py
index 004e22dd548575fe08595bf0cf4dfa5711ceb0fe..c2fb1b848034174c972ee7ac8d4f5d0b4b12d134 100755 (executable)
--- a/calibcant/calibrate.py
+++ b/calibcant/calibrate.py
@@ -107,12 +107,12 @@ import piezo.z_piezo_utils as z_piezo_utils
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 

-import .common
-import .config
-import .bump_analyze
-import .T_analyze
-import .vib_analyze
-import .analyze
+from . import common
+from . import config
+from . import bump_analyze
+from . import T_analyze
+from . import vib_analyze
+from . import analyze

 
 
 # bump family
 
 
 # bump family

diff --git a/calibcant/common.py b/calibcant/common.py
index 174790119166b86a87963777d15607039ecd6277..3f09e9d295615b3be26fb5c412ed492bc201cdef 100644 (file)
--- a/calibcant/common.py
+++ b/calibcant/common.py
@@ -18,11 +18,10 @@
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 

-import .config
+from . import VERSION
+from . import config

 
 
 
 

-VERSION="0.4"
-

 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None
 _final_flush_plot = None
 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None
 _final_flush_plot = None

diff --git a/calibcant/vib_analyze.py b/calibcant/vib_analyze.py
index c15d32769de20d06c994ca9ce042cd2b0ab87c37..2d5e601ef424e30ff91b7393f8d8801b3e097fcf 100755 (executable)
--- a/calibcant/vib_analyze.py
+++ b/calibcant/vib_analyze.py
@@ -38,8 +38,8 @@ import FFT_tools
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 

-import .common
-import .config
+from . import common
+from . import config

 
 
 PLOT_GUESSED_LORENTZIAN=False
 
 
 PLOT_GUESSED_LORENTZIAN=False