update to 0.1.6 : fixed mdfconverter packaging for pip

sneusse · May 31, 2015 · 835fce6 · 835fce6
1 parent 173079f
commit 835fce6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
     mdfreader is a tool written in pyhon to read mdf (Measured Data Format) files version 3.x and 4.x 
 
-    Copyright (C) 2014  Aymeric Rateau
+    Copyright (C) 2015  Aymeric Rateau
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/README b/README
@@ -12,7 +12,7 @@ The structure of the mdf dictionary, for each channel: mdf[channelName]
 - master : vector name corresponding to master channel
 - masterType : type of master channel (time, angle, distance, etc.)
 - description : physical meaning of channel
-- conversion: (optional) dictionary describing how to convert raw data in data to meaningful/physical data
+- conversion: (optional) dictionary describing how to convert raw data into meaningful/physical data
 
 Mdfreader module methods:
 =========================
@@ -42,15 +42,15 @@ Reading channels defined by a formula will require sympy.
 Export requirements (optional): scipy, csv, h5py, xlwt(3), openpyxl, pandas
 Mdfconverter user interface requires pyQT
 
-User interface:
-===============
-User interface in PyQT(4.6) to convert batch of files is also written. You can launch it with command "python mdfconverter.py" By right clicking a channel in the interface list, you can plot it. You can also drag-drop channels between columns to tune import list. Channel list from a .lab text file can be imported. You can optionally merge several files into one and even resample all them.
+User interface: mdfconverter (PyQt4)
+==================================
+User interface in PyQT4 to convert batch of files is also written. You can launch it with command mdfconverter. By right clicking a channel in the interface list, you can plot it. You can also drag-drop channels between columns to tune import list. Channel list from a .lab text file can be imported. You can optionally merge several files into one and even resample all of them.
 
 Others:
 =======
 In the case of big files and lack of memory, you can optionally:
 - Read only a channel list (slightly slower, argument channelList = ['channel', 'list'])
-- Keep raw data as stored in mdf, data type conversion (mdfreader argument convertAfterRead=False). Data will then be converted on the fly by the other functions (plot, exportTo..., getChannelData, etc.) but raw data will remain as in mdf file along with conversion information.
+- Keep raw data as stored in mdf without data type conversion (mdfreader argument convertAfterRead=False). Data will then be converted on the fly by the other functions (plot, exportTo..., getChannelData, etc.) but raw data will remain as in mdf file along with conversion information.
 
 Warning:
 ========

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.4"
+__version__ = "0.1.6"
diff --git a/mdfconverter/mdfconverter.py b/mdfconverter/mdfconverter.py
@@ -3,12 +3,12 @@
 from sys import argv, exit
 from multiprocessing import freeze_support
 
-if __name__ == "__main__":
-    main()
-
-def main()
+def main():
     freeze_support()
     app = QtGui.QApplication(argv)
     myapp = MainWindow()
     myapp.show()
     exit(app.exec_())
+
+if __name__ == "__main__":
+    main()
diff --git a/mdfconverter/mdfreaderui.py b/mdfconverter/mdfreaderui.py
@@ -9,7 +9,7 @@
 from Ui_mdfreaderui import Ui_MainWindow
 from io import open
 from multiprocessing import Pool, cpu_count
-from mdfreader import mdfinfo, mdf
+from mdfreader import *
 
 from sys import version_info
 from os import path

diff --git a/mdfreader/__init__.py b/mdfreader/__init__.py
@@ -12,4 +12,12 @@
 # along with this program.  If not, see http://www.gnu.org/licenses.
 #
 # ----------------------------------------------------------------------
-__version__ = "0.1.5"
+
+__author__ = 'Aymeric Rateau (aymeric.rateau@gmail.com)'
+__copyright__ = 'Copyright (c) 2015 Aymeric Rateau'
+__license__ = 'GPLV3'
+__version__ = "0.1.6"
+
+#if it's run as a script or imported within python, this happens
+if __name__ == 'mdfreader':
+    from mdfreader import *
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.5',
+    version='0.1.6',
 
     description='A Measured Data Format file parser',
     long_description=long_description,