Merge pull request #40 from Morisset/devel

1.1.21

pyneb/utils/manage_atomic_data.py

@@ -617,18 +617,15 @@ def extract_flt(str_):
     extract_flt('(123.00?') -> 123.00
     """
     res = ''
-    if len(str_) > 0:
-        if str_.decode()[0] in ('(', '['):
-            str_ = str_[1:]
-    for l in str_.decode():
+    this_str_ = str_.decode() if isinstance(str_, bytes) else str_
+    if len(this_str_) > 0 and this_str_[0] in ('(', '['):
+        this_str_ = this_str_[1:]
+    for l in this_str_:
         if l.isdigit() or l == '.':
             res += l
         else:
             break
-    if res == '':
-        return np.nan
-    else:
-        return float(res)
+    return np.nan if res == '' else float(res)
 
 def readNIST(NISTfile,NLevels=None):
     """

pyneb/version.py

@@ -1,2 +1,2 @@
 # PyNeb version
-__version__ = '1.1.20'
+__version__ = '1.1.21'

updatePyNeb.md

@@ -27,6 +27,7 @@ Publish the new version on the pypi server
 =============================
 
 * Switch to master branch
+* synchronize with repository: git pull
 * Run the following from the root directory (where dist is) and check the tar file is created in dist:
     `python setup.py sdist`
 * Run the following to upload the tar file to pypi server. **Update the value of the distribution in {0}:**