Merge branch 'master' into dev

Author: pyahmed

README.rst

@@ -12,11 +12,9 @@ A script extract data from .res (results) files generated by UNICORN Chromatogra
 
 News
 ----
-v0.15 released:
+v0.16b released:
 
-- Added option to disable title for plot
-- Added option to disable plotting inject marks
-- Added option to disable legend
+- Fixed line ending on non-Windows setups
 
 
 Installation

examplescripts/pycorn-bin.py

@@ -4,7 +4,7 @@
 PyCORN - script to extract data from .res (results) files generated
 by UNICORN Chromatography software supplied with ÄKTA Systems
 (c)2014-2015 - Yasar L. Ahmed
-v0.15
+v0.16
 '''
 import argparse
 from pycorn import pc_res3
@@ -125,16 +125,6 @@ def xy_data(inp):
     return x_data, y_data
 
 
-def uvdata(inp):
-    '''
-    helps in finding the useful data
-    '''
-    UV_blocks = [i for i in inp if i.startswith('UV') or i.endswith('nm')]
-    for i in UV_blocks:
-        if i.endswith("_0nm"):
-            UV_blocks.remove(i)
-
-
 def smartscale(inp):
     '''
     input is the entire fdata block

pycorn/docs/CHANGES.txt

@@ -1,4 +1,8 @@
-v.015
+v0.16b
+======
+- Fixed line ending on non-Windows setups
+
+v0.15
 ======
 - Added option to disable title for plot
 - Added option to disable plotting inject marks

pycorn/pycorn.py

@@ -3,7 +3,7 @@
 PyCORN - script to extract data from .res (results) files generated
 by UNICORN Chromatography software supplied with ÄKTA Systems
 (c)2014-2015 - Yasar L. Ahmed
-v0.14
+v0.14b
 '''
 
 from __future__ import print_function

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='pycorn',
-    version='0.15',
+    version='0.16b',
     author='Yasar L. Ahmed',
     packages=['pycorn'],
     extras_require = {'plotting':  ["matplotlib"], 'xlsx-output': ['xlsxwriter']},