tentative for packaging

sneusse · Jun 4, 2015 · 8585ba0 · 8585ba0
1 parent 835fce6
commit 8585ba0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ cur/
 tmp/
 __pycache__/
 *.DS_Store
+/dist/
+/*.egg-info
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.6"
+__version__ = "0.1.7"
diff --git a/mdfreader/__init__.py b/mdfreader/__init__.py
@@ -16,8 +16,8 @@
 __author__ = 'Aymeric Rateau (aymeric.rateau@gmail.com)'
 __copyright__ = 'Copyright (c) 2015 Aymeric Rateau'
 __license__ = 'GPLV3'
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 
 #if it's run as a script or imported within python, this happens
 if __name__ == 'mdfreader':
-    from mdfreader import *
+    from .mdfreader import mdf,mdfinfo
diff --git a/mdfreader/mdf3reader.py b/mdfreader/mdf3reader.py
@@ -32,7 +32,7 @@
 from time import strftime, time
 from struct import pack, Struct
 from io import open  # for python 3 and 2 consistency
-from mdfinfo3 import info3
+from .mdfinfo3 import info3
 PythonVersion = version_info
 PythonVersion = PythonVersion[0]
 

diff --git a/mdfreader/mdf4reader.py b/mdfreader/mdf4reader.py
@@ -34,7 +34,7 @@
 from math import pow
 from sys import platform, version_info
 from io import open  # for python 3 and 2 consistency
-from mdfinfo4 import info4, MDFBlock, ATBlock
+from .mdfinfo4 import info4, MDFBlock, ATBlock
 from time import gmtime, strftime
 from multiprocessing import Queue, Process
 PythonVersion = version_info

diff --git a/mdfreader/mdfreader.py b/mdfreader/mdfreader.py
@@ -34,8 +34,8 @@
 from io import open
 from struct import unpack
 from math import ceil
-from mdf3reader import mdf3
-from mdf4reader import mdf4
+from .mdf3reader import mdf3
+from .mdf4reader import mdf4
 from numpy import arange, interp, all, diff, mean, vstack, hstack, float64, zeros, empty, delete
 from numpy import nan, datetime64, array
 
@@ -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 mdfinfo3 import info3
+            from mdfreader.mdfinfo3 import info3
             self.update(info3(None, fid, filterChannelNames))
         else:  # MDF version 4.x
-            from mdfinfo4 import info4
+            from mdfreader.mdfinfo4 import info4
             self.update(info4(None, fid))
 
     def listChannels(self, fileName=None):

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.6',
+    version='0.1.7',
 
     description='A Measured Data Format file parser',
     long_description=long_description,
@@ -94,7 +94,7 @@
     # pip to create the appropriate form of executable for the target platform.
     entry_points={
        'console_scripts': [
-           'mdfconverter=mdfconverter:main',
+           'mdfconverter=mdfconverter.mdfconverter:main',
        ],
     }
 )