From dc33ac01c441d5c93f8b7635a71ece7451c9bdb4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 17 Jan 2018 07:48:25 +0100 Subject: [PATCH] Updating version management and minor corrections --- bin/AdaoCatalogGenerator.py | 2 +- bin/module_version.py | 4 ++-- doc/en/conf.py | 3 ++- doc/fr/conf.py | 2 +- resources/SalomeApp.xml | 2 +- src/daComposant/daCore/Aidsm.py | 7 ++++--- src/daComposant/daCore/version.py | 4 ++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index 923be68..82751d0 100644 --- 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 362dbc6..17e6c99 100644 --- 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 e5c2326..4e93a17 100644 --- 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 c1b7007..aba114f 100644 --- 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 198b61e..e7d6e3c 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -28,7 +28,7 @@ - +
diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py index 4931b99..7b480af 100644 --- 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 6b182f0..2e16fca 100644 --- 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)" -- 2.39.2