update 1.2.5

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 1.2.4}
+\title{EUFAR, Olivier Henry}{}{EGADS Lineage Algorithm Handbook}{Version 1.2.5}
 %\author{}{}
 
 

Documentation/changelog.txt

@@ -12,6 +12,15 @@ To fix list:
 ------------
 
 
+May 6 2020, Release version 1.2.5
+=================================
+  MODIFIED:
+	- consistency was improved between get_dimension_list() function in NetCdf and Hdf classes.
+
+  FIXED:
+    - few mistakes in the documentation.
+
+
 April 20 2020, Release version 1.2.4
 ====================================
   FIXED:

INSTALL.txt

@@ -74,6 +74,8 @@ Just run the following command from your terminal:
 or
   remove manually all folders in you Python site-packages folder containing egads name.
 
+In the $HOME directory, delete .egads_lineage directory if you don't want to keep options and logs of EGADS Lineage.
+
 
 Issues with NetCDF4 and/or H5py on a Linux distribution
 =======================================================
@@ -82,5 +84,5 @@ If NetCDF4 and H5py libraries are installed through Pypi, a crash can occure whe
  1. Uninstall entirely NetCDF4
  2. Download NetCDF4 sources corresponding to the same version
  3. Unzip the package, launch a terminal and build NetCDF4 module -> python setup.py build
- 4. Finally install NetCDF4 moudle -> python setup.py install
+ 4. Finally install NetCDF4 module -> python setup.py install
  5. Check NetCDF4 integration into EGADS with EGADS test function

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: egads-lineage
-Version: 1.2.4
+Version: 1.2.5
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
 Author: EUFAR, Olivier Henry

README.md

@@ -1,7 +1,7 @@
 Version:
 -------
 
-EGADS Lineage 1.2.4
+EGADS Lineage 1.2.5
 
 
 Developments:

doc/source/conf.py

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

doc/source/install.rst

@@ -93,6 +93,17 @@ If the ``check_update`` option is set on True in the egads.ini file, EGADS will
 The module Requests is optional for EGADS but is mandatory to check for an update.
 
 
+Uninstallation
+**************
+Just run the following command from your terminal:
+
+   >>> pip uninstall egads-lineage
+or
+  remove manually all folders in your Python site-packages folder containing egads name.
+
+In the $HOME directory, delete .egads_lineage directory if you don't want to keep options and logs of EGADS Lineage.
+
+
 Issues with NetCDF4 and/or H5py on a Linux distribution
 *******************************************************
 If NetCDF4 and H5py libraries are installed through Pypi, a crash can occure when trying to read/write a netcdf or an hdf file. Here are the different steps to fix that particular issue:

doc/source/tutorial-hdf.inc

@@ -62,7 +62,7 @@ Getting info
 
 .. function:: f.get_variable_list([groupname=None, group_walk=False, details=False])
 
-   Returns a list of all variables at the root of the Hdf file if *groupname* is None, otherwise a list of all variables in the group *groupname*. If *groupwalk* is True, the the function will explore all the file or from *groupname* if *groupname* is provided. If *details* is True, the function returns a list of dictionary containing the name of the variable and its path in the Hdf file. By default, details is False and the function returns a simple list of variable names.
+   Returns a list of all variables at the root of the Hdf file if *groupname* is None, otherwise a list of all variables in the group *groupname*. If *group_walk* is True, the the function will explore all the file or from *groupname* if *groupname* is provided. If *details* is True, the function returns a list of dictionary containing the name of the variable and its path in the Hdf file. By default, details is False and the function returns a simple list of variable names.
 
    :param groupname: the name of the group to get the list from ; optional
    :type groupname: string

egads/_version.py

@@ -1,2 +1,2 @@
-__version__ = '1.2.4'
+__version__ = '1.2.5'
 __branch__ = 'Lineage'

egads/input/hdf_io.py

@@ -415,6 +415,8 @@ def _get_variable_list(self, groupname, group_walk, details):
         if self.f is not None:
             orig_group = self.f
             if groupname is not None:
+                if groupname[-1] == '/':
+                    groupname = groupname[: -1]
                 if groupname[0] != '/':
                     groupname = '/' + groupname
                 orig_group = orig_group[groupname]
@@ -495,12 +497,21 @@ def _get_dimension_list(self, varname, group_walk, details):
                 for dim in unique_data:
                     if dim[0] in not_unique:
                         if details:
-                            dim_dict[dim[0] + ' (' + dim[2] + ')'] = (dim[1], dim[2])
+                            if not dim[2]:
+                                dim_dict[dim[0] + ' (/)'] = (dim[1], '/')
+                            else:
+                                dim_dict[dim[0] + ' (' + dim[2] + ')'] = (dim[1], dim[2])
                         else:
-                            dim_dict[dim[0] + ' (' + dim[2] + ')'] = dim[1]
+                            if not dim[2]:
+                                dim_dict[dim[0] + ' (/)'] = dim[1]
+                            else:
+                                dim_dict[dim[0] + ' (' + dim[2] + ')'] = dim[1]
                     else:
                         if details:
-                            dim_dict[dim[0]] = (dim[1], dim[2])
+                            if not dim[2]:
+                                dim_dict[dim[0]] = (dim[1], '/')
+                            else:
+                                dim_dict[dim[0]] = (dim[1], dim[2])
                         else:
                             dim_dict[dim[0]] = dim[1]
             else:
@@ -544,7 +555,7 @@ def _get_dimension_list(self, varname, group_walk, details):
                         dim_list.append([dim.label, orig_group[dim.label].shape[0]])
                 for dim in [sublist for sublist, _ in itertools.groupby(dim_list)]:
                     if details:
-                        dim_dict[dim[0]] = (dim[1], '')
+                        dim_dict[dim[0]] = (dim[1], '/')
                     else:
                         dim_dict[dim[0]] = dim[1]
             else:
@@ -565,6 +576,11 @@ def _get_dimension_list(self, varname, group_walk, details):
                             dim_list.append([dim.label, var[dim.label].shape[0]])
                     for dim in [sublist for sublist, _ in itertools.groupby(dim_list)]:
                         if details:
+
+                            if varname[0] != '/':
+                                varname = '/' + varname
+                            # print(varname)
+
                             dim_dict[dim[0]] = (dim[1], varname)
                         else:
                             dim_dict[dim[0]] = dim[1]

egads/input/netcdf_io.py

@@ -389,7 +389,7 @@ def _get_dimension_list(self, var, group_walk, details):
                 if not group_walk:
                     for dimname, dimobj in reversed(sorted(self.f.dimensions.items())):
                         if details:
-                            dimdict[dimname] = (len(dimobj), '')
+                            dimdict[dimname] = (len(dimobj), '/')
                         else:
                             dimdict[dimname] = len(dimobj)
                 else:
@@ -414,12 +414,21 @@ def _get_dimension_list(self, var, group_walk, details):
                     for dim in dim_list:
                         if dim[0] in not_unique:
                             if details:
-                                dimdict[dim[0] + ' (' + dim[2] + ')'] = (dim[1], dim[2])
+                                if not dim[2]:
+                                    dimdict[dim[0] + ' (/)'] = (dim[1], '/')
+                                else:
+                                    dimdict[dim[0] + ' (' + dim[2] + ')'] = (dim[1], dim[2])
                             else:
-                                dimdict[dim[0] + ' (' + dim[2] + ')'] = dim[1]
+                                if not dim[2]:
+                                    dimdict[dim[0] + ' (/)'] = dim[1]
+                                else:
+                                    dimdict[dim[0] + ' (' + dim[2] + ')'] = dim[1]
                         else:
                             if details:
-                                dimdict[dim[0]] = (dim[1], dim[2])
+                                if not dim[2]:
+                                    dimdict[dim[0]] = (dim[1], '/')
+                                else:
+                                    dimdict[dim[0]] = (dim[1], dim[2])
                             else:
                                 dimdict[dim[0]] = dim[1]
             else:
@@ -449,7 +458,10 @@ def _get_dimension_list(self, var, group_walk, details):
                     for dimname in orig_group[var_name].dimensions:
                         idx = [sublist[0] for sublist in dim_list].index(dimname)
                         if details:
-                            dimdict[dim_list[idx][0]] = (dim_list[idx][1], dim_list[idx][2])
+                            if not dim_list[idx][2]:
+                                dimdict[dim_list[idx][0]] = (dim_list[idx][1], '/')
+                            else:
+                                dimdict[dim_list[idx][0]] = (dim_list[idx][1], dim_list[idx][2])
                         else:
                             dimdict[dim_list[idx][0]] = dim_list[idx][1]
                 else:

egads/utils/egads_utils.py

@@ -17,7 +17,7 @@ def _create_option_dictionary(user_path):
         ini_file = open(os.path.join(user_path, 'egads.ini'), 'w')
         config_dict.add_section('LOG')
         config_dict.add_section('OPTIONS')
-        config_dict.set('LOG', 'level', 'DEBUG')
+        config_dict.set('LOG', 'level', 'WARNING')
         config_dict.set('LOG', 'path', user_path)
         config_dict.set('OPTIONS', 'check_update', 'False')
         config_dict.write(ini_file)

egads_lineage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: egads-lineage
-Version: 1.2.4
+Version: 1.2.5
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
 Author: EUFAR, Olivier Henry

egads_lineage.egg-info/SOURCES.txt

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

setup.py

@@ -30,7 +30,7 @@
 doclines = __doc__.split('\n')
 
 setup(name='egads-lineage',
-      version='1.2.4',
+      version='1.2.5',
       description=doclines[0],
       long_description='\n'.join(doclines[2:]),
       author='EUFAR, Olivier Henry',