update 0.9.6

Documentation/EGADS Algorithm Handbook - LATEX/cover/alg_cover.tex

@@ -24,7 +24,7 @@
 \setlength{\voffset}{.0cm}
 
 \logoeufar
-\title{EUFAR, Olivier Henry}{}{EGADS Lineage Algorithm Handbook}{Version 0.9.5}
+\title{EUFAR, Olivier Henry}{}{EGADS Lineage Algorithm Handbook}{Version 0.9.6}
 %\author{}{}
 
 

Documentation/changelog.txt

@@ -4,10 +4,18 @@ CHANGELOG | LINEAGE BRANCH
 
 To do list:
 -----------
+  - check feasability of an online algorithm database.
 
 To fix list:
 ------------
 
+July 03 2019, Release version 0.9.6
+===================================
+  FIXED:
+    - requests was imported without a try: except: code in egads_update function. It has been fixed.
+	- when missing values exist in a netcdf or nasa ames file and if the option 'read_as_float' is True, it is not possible to convert those missing values to float (numpy masked array). It has been fixed.
+
+
 June 12 2019, Release version 0.9.5
 ===================================
 In order to follow the EUFAR convention, and NetCDF classes examples, the NasaAmes class has been divided into two classes: NasaAmes and EgadsNasaAmes. EgadsNasaAmes class returns EgadsData instance when reading data, and it asks for EgadsData instance when writing data.

INSTALL.txt

@@ -19,8 +19,6 @@ To use EGADS Lineage, the following packages must be installed:
 
  2. Numpy 1.14 or newer.
 
- 3. Scipy 1.00 or newer.
-
  4. Python netCDF4 libraries 1.3.0 or newer
 
  5. Quantities 0.12.1 or newer

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: egads-lineage
-Version: 0.9.5
+Version: 0.9.6
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
 Author: Olivier Henry
@@ -20,7 +20,6 @@ Platform: Windows
 Platform: Linux
 Platform: MacOS
 Requires: numpy (>=1.14)
-Requires: scipy (>=1.00)
 Requires: netCDF4 (>=1.3.0)
 Requires: python_dateutil (>=2.6.1)
 Requires: quantities (>=0.12.1)

README.md

@@ -1,7 +1,7 @@
 Version:
 -------
 
-EGADS Lineage 0.9.5
+EGADS Lineage 0.9.6
 
 
 Developments:

doc/source/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.5'
+version = '0.9.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.5'
+release = '0.9.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

egads/__init__.py

@@ -15,7 +15,6 @@
 from .utils.egads_utils import _create_log_system
 from xml.dom import minidom
 from numpy import __version__ as np_version
-from scipy import __version__ as sy_version
 from netCDF4 import __version__ as nc_version
 from dateutil import __version__ as du_version
 try:
@@ -37,7 +36,6 @@
 logging.debug('egads - __init__.py - python version: ' + str(platform.python_version()))
 logging.debug('egads - __init__.py - numpy version: ' + np_version)
 logging.debug('egads - __init__.py - quantities version: ' + quantities.__version__)
-logging.debug('egads - __init__.py - scipy version: ' + sy_version)
 logging.debug('egads - __init__.py - netcdf4 version: ' + nc_version)
 logging.debug('egads - __init__.py - python_dateutil version: ' + du_version)
 logging.debug('egads - __init__.py - requests version: ' + rq_version)

egads/_version.py

@@ -1,2 +1,2 @@
-__version__ = '0.9.5'
+__version__ = '0.9.6'
 __branch__ = 'Lineage'

egads/core/egads_core.py

@@ -32,10 +32,6 @@ def __new__(cls, value, units='', variable_metadata={}, dtype=None, **attrs):
             units = variable_metadata.get('units', '')
             if not units:
                 units = variable_metadata.get('Units', '')
-
-        # quantities can't handle the CF time unit 'time since epoch'
-        # to allow a proper operation of EGADS, a new attribute has been added,
-        # transparent to the user, if the epoch is needed.
         true_units = None
         if ' since ' in units or 'after' in units:
             true_units = units

egads/core/egads_update.py

@@ -4,7 +4,10 @@
 __all__ = ["CheckEgadsUpdate"]
 
 import logging
-import requests
+try:
+    from requests import __version__ as rq_version
+except ImportError:
+    print('requests is not available')
 from distutils.version import LooseVersion
 from threading import Thread
 

egads/input/nasa_ames_io.py

@@ -119,7 +119,7 @@ def read_variable(self, varname, na_dict=None, read_as_float=False, replace_fill
                 varnum = var_list.index(varname)
             values = np.array(na_dict['V'][varnum])
             if read_as_float:
-                values = [float(item) for item in values]
+                values = values.astype('float')
             try:
                 if replace_fill_value:
                     miss = self.get_attribute_value('_FillValue', varname)
@@ -809,7 +809,7 @@ def read_variable(self, varname, na_dict=None, read_as_float=False, replace_fill
             scale = na_dict['VSCAL'][varnum]
             values = np.array(na_dict['V'][varnum])
             if read_as_float:
-                values = [float(item) for item in values]
+                values = values.astype('float')
             try:
                 if replace_fill_value:
                     values[values == miss] = np.nan

egads/input/netcdf_io.py

@@ -157,8 +157,9 @@ def read_variable(self, varname, input_range=None, read_as_float=False, replace_
             for i in range(2, len(input_range), 2):
                 obj = obj + ', slice(input_range[%i], input_range[%i])' % (i, i + 1)
             value = varin[eval(obj)]
-            if read_as_float:
-                value = [float(item) for item in value]
+        value = numpy.array(value)
+        if read_as_float:
+            value = value.astype('float')
         if replace_fill_value:
             _fill_value = None
             try:
@@ -696,10 +697,10 @@ def read_variable(self, varname, input_range=None, read_as_float=False, replace_
             for i in range(2, len(input_range), 2):
                 obj = obj + ', slice(input_range[%i], input_range[%i])' % (i, i + 1)
             value = varin[eval(obj)]
-        if read_as_float:
-            value = [float(item) for item in value]
         variable_attrs = self.get_attribute_list(varname)
         value = numpy.array(value)
+        if read_as_float:
+            value = value.astype('float')
         if replace_fill_value:
             if '_FillValue' in variable_attrs.keys():
                 _fill_value = variable_attrs['_FillValue']

egads_lineage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: egads-lineage
-Version: 0.9.5
+Version: 0.9.6
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
 Author: Olivier Henry
@@ -29,7 +29,6 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Requires: numpy (>=1.14)
-Requires: scipy (>=1.00)
 Requires: netCDF4 (>=1.3.0)
 Requires: python_dateutil (>=2.6.1)
 Requires: quantities (>=0.12.1)

egads_lineage.egg-info/SOURCES.txt

@@ -3,8 +3,8 @@ MANIFEST.in
 README.md
 setup.cfg
 setup.py
-Documentation/EGADS Lineage Algorithm Handbook - v0.9.5.pdf
-Documentation/EGADS Lineage Documentation - v0.9.5.pdf
+Documentation/EGADS Lineage Algorithm Handbook - v0.9.6.pdf
+Documentation/EGADS Lineage Documentation - v0.9.6.pdf
 Documentation/changelog.txt
 Documentation/EGADS Algorithm Handbook - LATEX/EGADS_alg_doc.tex
 Documentation/EGADS Algorithm Handbook - LATEX/example.py

egads_lineage.egg-info/requires.txt

@@ -1,5 +1,4 @@
 numpy >= 1.14
-scipy >=1.00
 netCDF4 >= 1.3.0
 python_dateutil >= 2.6.1
 quantities >= 0.12.1

setup.py

@@ -30,7 +30,7 @@
 doclines = __doc__.split('\n')
 
 setup(name='egads-lineage',
-      version='0.9.5',
+      version='0.9.6',
       description=doclines[0],
       long_description='\n'.join(doclines[2:]),
       author='EUFAR, Olivier Henry',
@@ -94,6 +94,6 @@
           'doc.source._static': ['*.*']
           },
       classifiers=filter(None, classifiers.split("\n")),
-      requires=['numpy (>=1.14)', 'scipy (>=1.00)', 'netCDF4 (>=1.3.0)', 'python_dateutil (>=2.6.1)', 'quantities (>=0.12.1)'],
-      install_requires=['numpy >= 1.14', 'scipy >=1.00', 'netCDF4 >= 1.3.0', 'python_dateutil >= 2.6.1', 'quantities >= 0.12.1'],
+      requires=['numpy (>=1.14)', 'netCDF4 (>=1.3.0)', 'python_dateutil (>=2.6.1)', 'quantities (>=0.12.1)'],
+      install_requires=['numpy >= 1.14', 'netCDF4 >= 1.3.0', 'python_dateutil >= 2.6.1', 'quantities >= 0.12.1'],
       )