Updating version management and minor corrections

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index 923be6815b3755c9e527f81f6420224328d64af0..82751d0c5ab525ac7a747143681e23129b93f83e 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -243,7 +243,7 @@ AlgorithmParametersInNS.info = u"The Python file has to contain explicitly an \\
 def F_AlgorithmParameters(statut, algos_names, fv=NoCheckInNS) : return FACT(
     statut = statut,
     Algorithm = SIMP(statut="o", typ = "TXM", into = algos_names ),
-    Parameters = SIMP(statut="f", typ = "TXM", into=("Defaults", "Dict") ),
+    Parameters = SIMP(statut="f", typ = "TXM", into=("Defaults", "Dict"), defaut="Defaults"),
     Dict = BLOC ( condition = " Parameters == 'Dict' ",
         statut="f",
         data = F_Dict("o", fv),

diff --git a/bin/module_version.py b/bin/module_version.py
index 362dbc6e84910bc82d1c1c1f47c1b60bccf19fb1..17e6c9916c8e275cec3ed834c6350fd076acc19e 100644 (file)
--- a/bin/module_version.py
+++ b/bin/module_version.py
@@ -23,6 +23,6 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 name    = "ADAO"
-version = "V8_4_0" # Version pour catalogue, avec des "_" entre les numeros
+version = "V8_5_0" # Version pour catalogue, avec des "_" entre les numeros
 date    = ""
-year    = "2017" # Annee de copyright
+year    = "2018" # Annee de copyright

diff --git a/doc/en/conf.py b/doc/en/conf.py
index e5c2326fe6dfddc3fe49f660fb2916ec87b1e7f4..4e93a174612263b11ae063c5ff955a36418c8f39 100644 (file)
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+#
 # Copyright (C) 2008-2017 EDF R&D
 #
 # This file is part of SALOME ADAO module
@@ -90,7 +91,7 @@ language = 'en'
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = []
+exclude_trees = ['snippets',]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None

diff --git a/doc/fr/conf.py b/doc/fr/conf.py
index c1b7007095165b38150653c734ffb50939c22712..aba114fd3f5f7464b2a8d15e86b88356afb468c9 100644 (file)
--- a/doc/fr/conf.py
+++ b/doc/fr/conf.py
@@ -91,7 +91,7 @@ language = 'fr'
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = []
+exclude_trees = ['snippets',]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 198b61ecdf7a6c23f3ade9500948e72f6a5c4f1d..e7d6e3ce38f2b0b2c4d5e4a9ff5346d036522c2d 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -28,7 +28,7 @@
     <parameter name="icon"          value="ADAO.png"/>
     <parameter name="library"       value="SalomePyQtGUI"/>
     <parameter name="documentation" value="adao_help"/>
-    <parameter name="version"       value="8.4.0"/>
+    <parameter name="version"       value="8.5.0"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py
index 4931b99d181839ea345c9b336df8adc319f38b98..7b480af5b2176601e068872381829cd36094eda8 100644 (file)
--- a/src/daComposant/daCore/Aidsm.py
+++ b/src/daComposant/daCore/Aidsm.py
@@ -566,7 +566,7 @@ class Aidsm(object):
         else:
             allvariables = {}
             allvariables.update( {"AlgorithmParameters":self.__adaoObject["AlgorithmParameters"].get()} )
-            allvariables.update( self.__adaoObject["AlgorithmParameters"].get() )
+            # allvariables.update( self.__adaoObject["AlgorithmParameters"].get() )
             allvariables.update( self.__StoredInputs )
             allvariables.pop('Diagnostic', None)
             allvariables.pop('Observer', None)
@@ -745,8 +745,9 @@ class Aidsm(object):
                 if self.__adaoObject['AlgorithmParameters'].hasObserver( k ):
                     self.__adaoObject['AlgorithmParameters'].removeObserver( k, "", True )
                 self.__StoredInputs[k] = self.__adaoObject['AlgorithmParameters'].pop(k, None)
-        del self.__adaoObject # Because it breaks pickle in Python 2. Not required for Python 3
-        del self.__case       # Because it breaks pickle in Python 2. Not required for Python 3
+        if sys.version_info[0] == 2:
+            del self.__adaoObject # Because it breaks pickle in Python 2. Not required for Python 3
+            del self.__case       # Because it breaks pickle in Python 2. Not required for Python 3
         return 0
 
 # ==============================================================================

diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index 6b182f03c714d12f340e46f0b907c07d2bfc514a..2e16fca78f21fb8a1a175b626e72d565558a17bf 100644 (file)
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -27,5 +27,5 @@ __author__ = "Jean-Philippe ARGAUD"
 __all__ = []
 
 name    = "Data Assimilation Package"
-version = "2017.09.30"
-date    = "samedi 30 septembre 2017, 12:12:12 (UTC+0100)"
+version = "2018.03.27"
+date    = "mardi 27 mars 2018, 12:12:12 (UTC+0100)"