fixed packaging error

ratal · Jun 4, 2015 · fc1d518 · fc1d518
1 parent 8585ba0
commit fc1d518
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/mdfconverter/__init__.py b/mdfconverter/__init__.py
@@ -12,4 +12,4 @@
 # along with this program.  If not, see http://www.gnu.org/licenses.
 #
 # ----------------------------------------------------------------------
-__version__ = "0.1.7"
+__version__ = "0.1.8"
diff --git a/mdfreader.e4p b/mdfreader.e4p
@@ -23,7 +23,7 @@
     <Source>mdfconverter/mdfconverter.py</Source>
     <Source>mdfreader/mdfinfo4.py</Source>
     <Source>mdfreader/mdfinfo3.py</Source>
-    <Source>test/test.py</Source>
+    <Source>mdfreader/tests/test.py</Source>
     <Source>mdfreader/mdf3reader.py</Source>
     <Source>mdfreader/mdf4reader.py</Source>
     <Source>README</Source>

diff --git a/mdfreader/__init__.py b/mdfreader/__init__.py
@@ -16,7 +16,7 @@
 __author__ = 'Aymeric Rateau (aymeric.rateau@gmail.com)'
 __copyright__ = 'Copyright (c) 2015 Aymeric Rateau'
 __license__ = 'GPLV3'
-__version__ = "0.1.7"
+__version__ = "0.1.8"
 
 #if it's run as a script or imported within python, this happens
 if __name__ == 'mdfreader':

diff --git a/mdfreader/mdfreader.py b/mdfreader/mdfreader.py
@@ -149,10 +149,10 @@ def readinfo(self, fileName=None, filterChannelNames=False):
         VersionNumber = unpack('<H', fid.read(2))
         self.mdfversion = VersionNumber[0]
         if self.mdfversion < 400:  # up to version 3.x not compatible with version 4.x
-            from mdfreader.mdfinfo3 import info3
+            from .mdfinfo3 import info3
             self.update(info3(None, fid, filterChannelNames))
         else:  # MDF version 4.x
-            from mdfreader.mdfinfo4 import info4
+            from .mdfinfo4 import info4
             self.update(info4(None, fid))
 
     def listChannels(self, fileName=None):
@@ -180,11 +180,11 @@ def listChannels(self, fileName=None):
         VersionNumber = unpack('<H', fid.read(2))
         self.mdfversion = VersionNumber[0]
         if self.mdfversion < 400:  # up to version 3.x not compatible with version 4.x
-            from mdfinfo3 import info3
+            from .mdfinfo3 import info3
             channelNameList = info3()
             nameList = channelNameList.listChannels3(self.fileName)
         else:
-            from mdfinfo4 import info4
+            from .mdfinfo4 import info4
             channelNameList = info4()
             nameList = channelNameList.listChannels4(self.fileName)
         return nameList

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/development.html#single-sourcing-the-version
-    version='0.1.7',
+    version='0.1.8',
 
     description='A Measured Data Format file parser',
     long_description=long_description,