Fixed imports for Py3. Was working when I tested, but not when I trie…

…d using it... + also added echo for path to .gitlab-ci.yml
dougthor42 · Apr 11, 2016 · 6cc96cf · 6cc96cf
1 parent d5f1fd8
commit 6cc96cf
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 18 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ python34_x64-pip-install:
   script:
     - call C:\WinPython34\scripts\env.bat
     - python -c "import sys;print('='*80+'\n{}\n'.format(sys.version)+'-'*80)"
+    - echo %VENV_ROOT%\python34_x64\%CI_PROJECT_ID%__%CI_BUILD_REF_NAME%
     - python -m venv --clear %VENV_ROOT%\python34_x64\%CI_PROJECT_ID%__%CI_BUILD_REF_NAME%
     - call %VENV_ROOT%\python34_x64\%CI_PROJECT_ID%__%CI_BUILD_REF_NAME%\Scripts\activate.bat
     # Can't upgrade pip in place.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 This document highlights high-level changes made to this program.
 
+## 1.0.16 / 2016-04-11
+
+  + Fixed imports for Py3
+
 ## 1.0.15 / 2016-04-11
 
   + Version bump because of a messed up PyPI release.

diff --git a/wafer_map/__init__.py b/wafer_map/__init__.py
@@ -10,7 +10,7 @@
 """
 
 ### Constants ###############################################################
-__version__ = "1.0.15"
+__version__ = "1.0.16"
 __project_url__ = "https://github.com/dougthor42/wafer_map"
 __project_name__ = "wafer_map"
 __description__ = "Semiconductor Wafer Mapping"

diff --git a/wafer_map/example.py b/wafer_map/example.py
@@ -32,9 +32,14 @@
 # Third-Party
 import wx
 
-import gen_fake_data
-import wm_core
-import wm_app
+if PY2:
+    import gen_fake_data
+    import wm_core
+    import wm_app
+else:
+    from . import gen_fake_data
+    from . import wm_core
+    from . import wm_app
 
 __author__ = "Douglas Thor"
 __version__ = "v0.4.0"

diff --git a/wafer_map/gen_fake_data.py b/wafer_map/gen_fake_data.py
@@ -28,9 +28,14 @@
 import math
 import random
 
-import wm_info
-import wm_utils
-import wm_constants as wm_const
+if PY2:
+    import wm_info
+    import wm_utils
+    import wm_constants as wm_const
+else:
+    from . import wm_info
+    from . import wm_utils
+    from . import wm_constants as wm_const
 
 
 # Python2 Compatibility

diff --git a/wafer_map/wm_app.py b/wafer_map/wm_app.py
@@ -30,10 +30,16 @@
 import wx
 
 # Package / Application
-import wm_frame
-import wm_info
-import gen_fake_data
-import wm_constants as wm_const
+if PY2:
+    import wm_frame
+    import wm_info
+    import gen_fake_data
+    import wm_constants as wm_const
+else:
+    from . import wm_frame
+    from . import wm_info
+    from . import gen_fake_data
+    from . import wm_constants as wm_const
 
 
 class WaferMapApp(object):

diff --git a/wafer_map/wm_core.py b/wafer_map/wm_core.py
@@ -42,9 +42,14 @@
 import wx.lib.colourselect as csel
 
 # Package / Application
-import wm_legend
-import wm_utils
-import wm_constants as wm_const
+if PY2:
+    import wm_legend
+    import wm_utils
+    import wm_constants as wm_const
+else:
+    from . import wm_legend
+    from . import wm_utils
+    from . import wm_constants as wm_const
 
 
 # Module-level TODO list.

diff --git a/wafer_map/wm_frame.py b/wafer_map/wm_frame.py
@@ -32,8 +32,12 @@
 import wx
 
 # Package / Application
-import wm_core
-import wm_constants as wm_const
+if PY2:
+    import wm_core
+    import wm_constants as wm_const
+else:
+    from . import wm_core
+    from . import wm_constants as wm_const
 
 
 class WaferMapWindow(wx.Frame):

diff --git a/wafer_map/wm_legend.py b/wafer_map/wm_legend.py
@@ -33,8 +33,12 @@
 import wx.lib.colourselect as csel
 
 # Package / Application
-import wm_utils
-import wm_constants as wm_const
+if PY2:
+    import wm_utils
+    import wm_constants as wm_const
+else:
+    from . import wm_utils
+    from . import wm_constants as wm_const
 
 # TODO: Update to Bezier Curves for colors. See http://bsou.io/p/3