update 1.0.0

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

Documentation/changelog.txt

@@ -9,6 +9,16 @@ To do list:
 To fix list:
 ------------
 
+July 17 2019, Release version 1.0.0
+===================================
+EGADS is now mature enough to leave the beta phase and be released as a stable module.
+
+  ADDED:
+    - if an error occurres during the loading of an algorithm, the reason is now displayed in the log file.
+	- an attribute has been added to inform if the module has been frozen by PyInstaller.
+	- if EGADS is frozen, the update system is disabled.
+
+
 July 03 2019, Release version 0.9.6
 ===================================
   FIXED:

PKG-INFO

@@ -1,12 +1,15 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: egads-lineage
-Version: 0.9.6
+Version: 1.0.0
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
-Author: Olivier Henry
+Author: EUFAR, Olivier Henry
 Author-email: [email protected]
+Maintainer: Olivier Henry
+Maintainer-email: [email protected]
 License: GNU General Public License v3 (GPLv3)
 Download-URL: https://github.com/EUFAR/egads/tree/Lineage
+Project-URL: Documentation, https://egads.readthedocs.io/en/lineage/
 Description: EGADS (EUFAR General Airborne Data-processing Software) is a Python-based
         toolbox for processing airborne atmospheric data. EGADS provides a framework
         for researchers to apply expert-contributed algorithms to data files, and acts

README.md

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

doc/source/conf.py

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

egads/__init__.py

@@ -8,6 +8,7 @@
 import platform
 import quantities
 import configparser
+import sys
 from ._version import __version__
 from ._version import __branch__
 from .utils.egads_utils import _create_user_algorithms_structure
@@ -22,6 +23,10 @@
 except ImportError:
     rq_version = 'requests is not available'
 
+if getattr(sys, 'frozen', False):
+    frozen = True
+else:
+    frozen = False
 
 path = os.path.abspath(os.path.dirname(__file__))
 _create_option_dictionary(path)
@@ -31,6 +36,7 @@
 logging.info('*****************************************')
 logging.info('EGADS ' + __version__ + ' is starting ...')
 logging.info('*****************************************')
+logging.debug('egads - __init__.py - egads frozen ? ' + str(frozen))
 system, release, version = platform.system_alias(platform.system(), platform.release(), platform.version())
 logging.debug('egads - __init__.py - operating system: ' + system + ' ' + release + ' (' + version + ')')
 logging.debug('egads - __init__.py - python version: ' + str(platform.python_version()))
@@ -88,16 +94,22 @@ def print_options():
 
 
 def check_update():
-    logging.debug('egads - __init__.py - check_update - egads_version ' + __version__)
-    check_update_thread = CheckEgadsUpdate(__version__)
-    check_update_thread.start()
+    if not frozen:
+        logging.debug('egads - __init__.py - check_update - egads_version ' + __version__)
+        check_update_thread = CheckEgadsUpdate(__version__)
+        check_update_thread.start()
+    else:
+        logging.debug('egads - __init__.py - check_update - app is frozen, no update check')
 
 
 if rq_version != 'requests is not available':
-    if config_dict.getboolean('OPTIONS', 'check_update'):
-        check_update()
+    if not frozen:
+        if config_dict.getboolean('OPTIONS', 'check_update'):
+            check_update()
+        else:
+            logging.debug('egads - __init__.py - check_update on False, no update check')
     else:
-        logging.debug('egads - __init__.py - check_update on False, no update check')
+        logging.debug('egads - __init__.py - app is frozen, no update check')
 else:
     logging.debug('egads - __init__.py - no requests module, no update check')
 

egads/_version.py

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

egads/algorithms/comparisons/__init__.py

@@ -10,5 +10,6 @@
 try:
     from .compare_param_lcss import *
     logging.info('egads [comparisons] algorithms have been loaded')
+    logging.debug('egads [comparisons] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [comparisons] algorithm')

egads/algorithms/corrections/__init__.py

@@ -10,5 +10,6 @@
 try:
     from .correction_spike_simple_cnrm import *
     logging.info('egads [corrections] algorithms have been loaded')
+    logging.debug('egads [corrections] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [corrections] algorithm')

egads/algorithms/mathematics/__init__.py

@@ -11,5 +11,6 @@
     from .derivative_wrt_time import *
     from .limit_angle_range import *
     logging.info('egads [mathematics] algorithms have been loaded')
+    logging.debug('egads [mathematics] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [mathematics] algorithm')

egads/algorithms/microphysics/__init__.py

@@ -21,5 +21,6 @@
     from .sample_volume_general_raf import *
     from .surface_area_conc_dmt import *
     logging.info('egads [microphysics] algorithms have been loaded')
+    logging.debug('egads [microphysics] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [microphysics] algorithm')

egads/algorithms/radiation/__init__.py

@@ -16,5 +16,6 @@
     from .solar_vector_reda import *
     from .temp_blackbody import *
     logging.info('egads [radiation] algorithms have been loaded')
+    logging.debug('egads [radiation] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [radiation] algorithm')

egads/algorithms/thermodynamics/__init__.py

@@ -23,5 +23,6 @@
     from .velocity_tas_raf import *
     from .wind_vector_3d_raf import *
     logging.info('egads [thermodynamics] algorithms have been loaded')
+    logging.debug('egads [thermodynamics] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [thermodynamics] algorithm')

egads/algorithms/transforms/__init__.py

@@ -14,5 +14,6 @@
     from .seconds_to_isotime import *
     from .time_to_decimal_year import *
     logging.info('egads [transforms] algorithms have been loaded')
+    logging.debug('egads [transforms] path: ' + str(__path__))
 except Exception:
     logging.exception('an error occurred during the loading of a [transforms] algorithm')

egads/core/egads_update.py

@@ -5,7 +5,7 @@
 
 import logging
 try:
-    from requests import __version__ as rq_version
+    import requests
 except ImportError:
     print('requests is not available')
 from distutils.version import LooseVersion

egads/utils/egads_utils.py

@@ -1,6 +1,6 @@
 __author__ = "ohenry"
 __date__ = "2019-06-11 15:30"
-__version__ = "1.0"
+__version__ = "1.1"
 
 import logging
 import os
@@ -14,7 +14,7 @@ def _create_option_dictionary(main_path):
         ini_file = open(os.path.join(main_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', 'INFO')
         config_dict.set('LOG', 'path', main_path)
         config_dict.set('OPTIONS', 'check_update', 'False')
         config_dict.write(ini_file)
@@ -67,9 +67,9 @@ def _create_user_algorithms_structure(main_path):
                            + 'import logging\n\n'
                            + 'try:\n'
                            + "    logging.info('egads [user/" + folder + "] algorithms have been loaded')\n"
-                           + 'except Exception:\n'
+                           + 'except Exception as e:\n'
                            + "    logging.error('an error occured during the loading of a [user/" + folder
-                           + "] algorithm')\n")
+                           + "] algorithm: ' + str(e)\n")
             init_file = open(os.path.join(user_path, folder) + '/__init__.py', 'w')
             init_file.write(init_string)
             init_file.close()

egads_lineage.egg-info/PKG-INFO

@@ -1,12 +1,15 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: egads-lineage
-Version: 0.9.6
+Version: 1.0.0
 Summary: EGADS: EUFAR General Airborne Data-processing Software
 Home-page: https://github.com/EUFAR/egads/tree/Lineage
-Author: Olivier Henry
+Author: EUFAR, Olivier Henry
 Author-email: [email protected]
+Maintainer: Olivier Henry
+Maintainer-email: [email protected]
 License: GNU General Public License v3 (GPLv3)
 Download-URL: https://github.com/EUFAR/egads/tree/Lineage
+Project-URL: Documentation, https://egads.readthedocs.io/en/lineage/
 Description: EGADS (EUFAR General Airborne Data-processing Software) is a Python-based
         toolbox for processing airborne atmospheric data. EGADS provides a framework
         for researchers to apply expert-contributed algorithms to data files, and acts
@@ -19,7 +22,7 @@ Keywords: airbornescience,netcdf,nasa-ames,eufar,science,microphysics,thermodyna
 Platform: Windows
 Platform: Linux
 Platform: MacOS
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education

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.6.pdf
-Documentation/EGADS Lineage Documentation - v0.9.6.pdf
+Documentation/EGADS Lineage Algorithm Handbook - v1.0.0.pdf
+Documentation/EGADS Lineage Documentation - v1.0.0.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,4 +1,4 @@
-numpy >= 1.14
-netCDF4 >= 1.3.0
-python_dateutil >= 2.6.1
-quantities >= 0.12.1
+numpy>=1.14
+netCDF4>=1.3.0
+python_dateutil>=2.6.1
+quantities>=0.12.1

setup.py

@@ -16,7 +16,7 @@
     from distutils.core import setup
 
 classifiers = """\
-Development Status :: 4 - Beta
+Development Status :: 5 - Production/Stable
 Environment :: Console
 Intended Audience :: Developers
 Intended Audience :: Education
@@ -30,7 +30,7 @@
 doclines = __doc__.split('\n')
 
 setup(name='egads-lineage',
-      version='0.9.6',
+      version='1.0.0',
       description=doclines[0],
       long_description='\n'.join(doclines[2:]),
       author='EUFAR, Olivier Henry',