[BC] fix relative imports

Eomys · Jan 5, 2022 · b6b633a · b6b633a
1 parent 1faff7e
commit b6b633a
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 21 deletions.
diff --git a/SciDataTool/GUI/DDataPlotter/DDataPlotter.ui b/SciDataTool/GUI/DDataPlotter/DDataPlotter.ui
@@ -160,7 +160,7 @@
   <customwidget>
    <class>WPlotManager</class>
    <extends>QWidget</extends>
-   <header>...GUI.WPlotManager.WPlotManager.h</header>
+   <header>SciDataTool.GUI.WPlotManager.WPlotManager.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/SciDataTool/GUI/DDataPlotter/Ui_DDataPlotter.py b/SciDataTool/GUI/DDataPlotter/Ui_DDataPlotter.py
@@ -9,7 +9,7 @@
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from ...GUI.WPlotManager.WPlotManager import WPlotManager
+from SciDataTool.GUI.WPlotManager.WPlotManager import WPlotManager
 
 
 class Ui_DDataPlotter(object):

diff --git a/SciDataTool/GUI/Tools/FloatEdit.py b/SciDataTool/GUI/Tools/FloatEdit.py
@@ -5,8 +5,6 @@
 from PySide2.QtGui import QDoubleValidator
 from PySide2.QtWidgets import QLineEdit
 
-# from ...GUI import gui_option
-
 _float_re = compile(r"(([+-]?\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?)")
 
 

diff --git a/SciDataTool/GUI/WAxisManager/Ui_WAxisManager.py b/SciDataTool/GUI/WAxisManager/Ui_WAxisManager.py
@@ -9,7 +9,7 @@
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from ...GUI.WAxisSelector.WAxisSelector import WAxisSelector
+from SciDataTool.GUI.WAxisSelector.WAxisSelector import WAxisSelector
 
 
 class Ui_WAxisManager(object):

diff --git a/SciDataTool/GUI/WAxisManager/WAxisManager.ui b/SciDataTool/GUI/WAxisManager/WAxisManager.ui
@@ -207,7 +207,7 @@
   <customwidget>
    <class>WAxisSelector</class>
    <extends>QWidget</extends>
-   <header>...GUI.WAxisSelector.WAxisSelector.h</header>
+   <header>SciDataTool.GUI.WAxisSelector.WAxisSelector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/SciDataTool/GUI/WDataRange/Ui_WDataRange.py b/SciDataTool/GUI/WDataRange/Ui_WDataRange.py
@@ -9,7 +9,7 @@
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from ...GUI.Tools.FloatEdit import FloatEdit
+from SciDataTool.GUI.Tools.FloatEdit import FloatEdit
 
 
 class Ui_WDataRange(object):

diff --git a/SciDataTool/GUI/WDataRange/WDataRange.ui b/SciDataTool/GUI/WDataRange/WDataRange.ui
@@ -128,7 +128,7 @@
   <customwidget>
    <class>FloatEdit</class>
    <extends>QLineEdit</extends>
-   <header>...GUI/Tools/FloatEdit.h</header>
+   <header>SciDataTool.GUI/Tools/FloatEdit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/SciDataTool/GUI/WPlotManager/Ui_WPlotManager.py b/SciDataTool/GUI/WPlotManager/Ui_WPlotManager.py
@@ -9,9 +9,9 @@
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from ...GUI.WDataRange.WDataRange import WDataRange
-from ...GUI.WAxisManager.WAxisManager import WAxisManager
-from ...GUI.WVectorSelector.WVectorSelector import WVectorSelector
+from SciDataTool.GUI.WDataRange.WDataRange import WDataRange
+from SciDataTool.GUI.WAxisManager.WAxisManager import WAxisManager
+from SciDataTool.GUI.WVectorSelector.WVectorSelector import WVectorSelector
 
 
 class Ui_WPlotManager(object):

diff --git a/SciDataTool/GUI/WPlotManager/WPlotManager.ui b/SciDataTool/GUI/WPlotManager/WPlotManager.ui
@@ -196,19 +196,19 @@
   <customwidget>
    <class>WDataRange</class>
    <extends>QWidget</extends>
-   <header>...GUI.WDataRange.WDataRange.h</header>
+   <header>SciDataTool.GUI.WDataRange.WDataRange.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>WAxisManager</class>
    <extends>QWidget</extends>
-   <header>...GUI.WAxisManager.WAxisManager.h</header>
+   <header>SciDataTool.GUI.WAxisManager.WAxisManager.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>WVectorSelector</class>
    <extends>QWidget</extends>
-   <header>...GUI.WVectorSelector.WVectorSelector.h</header>
+   <header>SciDataTool.GUI.WVectorSelector.WVectorSelector.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/SciDataTool/GUI/WSliceOperator/Ui_WSliceOperator.py b/SciDataTool/GUI/WSliceOperator/Ui_WSliceOperator.py
@@ -9,7 +9,7 @@
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from ...GUI.Tools.FloatEdit import FloatEdit
+from SciDataTool.GUI.Tools.FloatEdit import FloatEdit
 
 
 class Ui_WSliceOperator(object):

diff --git a/SciDataTool/GUI/WSliceOperator/WSliceOperator.ui b/SciDataTool/GUI/WSliceOperator/WSliceOperator.ui
@@ -166,7 +166,7 @@
   <customwidget>
    <class>FloatEdit</class>
    <extends>QLineEdit</extends>
-   <header>...GUI/Tools/FloatEdit.h</header>
+   <header>SciDataTool.GUI/Tools/FloatEdit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

diff --git a/SciDataTool/Methods/Data/_set_normalizations.py b/SciDataTool/Methods/Data/_set_normalizations.py
@@ -1,5 +1,5 @@
-from ...Functions.Load.import_class import import_class
-from ...Classes._check import check_var
+from SciDataTool.Functions.Load.import_class import import_class
+from SciDataTool.Classes._check import check_var
 from numpy import ndarray, int32, int64, float32, float64
 
 

diff --git a/SciDataTool/__init__.py b/SciDataTool/__init__.py
@@ -14,4 +14,4 @@
 from SciDataTool.Classes.Norm_indices import Norm_indices
 from SciDataTool.Classes.Norm_ref import Norm_ref
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
diff --git a/setup.py b/setup.py
@@ -11,14 +11,14 @@
 
 setuptools.setup(
     name="SciDataTool",
-    version="2.0.1",
+    version="2.0.2",
     author="Helene Toubin",
     author_email="[email protected]",
     description="Scientific Data Tool",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/Eomys/SciDataTool",
-    download_url="https://github.com/Eomys/SciDataTool/archive/2.0.1.tar.gz",
+    download_url="https://github.com/Eomys/SciDataTool/archive/2.0.2.tar.gz",
     packages=setuptools.find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",