From dc3094735b85e52595e825a7c2df4b7ae78c19b5 Mon Sep 17 00:00:00 2001 From: qc784398 Date: Wed, 17 Feb 2021 20:44:47 +0100 Subject: [PATCH] sat #19980 : Remove obsolete use of sphinxcontrib_napoleon and pockets products --- applications/SALOME-master-MPI.pyconf | 2 -- applications/SALOME-master-int32.pyconf | 2 -- applications/SALOME-master-windows.pyconf | 2 -- applications/SALOME-master.pyconf | 2 -- products/GUI.pyconf | 4 +-- products/SHAPER.pyconf | 3 +- products/SMESH.pyconf | 10 +++---- .../patches/SHAPER_sphinx_ext_napoleon.patch | 15 ++++++++++ .../patches/SMESH_sphinx_ext_napoleon.patch | 28 +++++++++++++++++++ 9 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 products/patches/SHAPER_sphinx_ext_napoleon.patch create mode 100644 products/patches/SMESH_sphinx_ext_napoleon.patch diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index b0bd8e6..aee0fc5 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -77,7 +77,6 @@ APPLICATION : petsc : '3.14.0' Pillow : '7.1.1' planegcs : '0.18-3cb6890' - pockets : '0.6.2' Pygments : '2.0.2' pyparsing : '2.0.3' PyQt : '5.9' @@ -95,7 +94,6 @@ APPLICATION : six : '1.10.0' snowballstemmer : '1.2.1' Sphinx : '1.7.6' - sphinxcontrib_napoleon : '0.6.1' sphinxcontrib_websupport : '1.1.0' sphinx_rtd_theme : '0.4.3' sphinxintl: '0.9.10' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 3d1b2b2..27107cd 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -75,7 +75,6 @@ APPLICATION : petsc : '3.14.0' Pillow : '7.1.1' planegcs : '0.18-3cb6890' - pockets : '0.6.2' Pygments : '2.0.2' pyparsing : '2.0.3' PyQt : '5.9' @@ -93,7 +92,6 @@ APPLICATION : six : '1.10.0' snowballstemmer : '1.2.1' Sphinx : '1.7.6' - sphinxcontrib_napoleon : '0.6.1' sphinxcontrib_websupport : '1.1.0' sphinx_rtd_theme : '0.4.3' sphinxintl: '0.9.10' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 7d86044..e9ae0d0 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -85,7 +85,6 @@ APPLICATION : perl : '5.28.1.1' Pillow : '7.1.1' planegcs : '0.18-3cb6890' - pockets : '0.7.2' pthreads : '2.9.1' Pygments : '2.4.2' pyparsing : '2.4.0' @@ -108,7 +107,6 @@ APPLICATION : sphinxcontrib_devhelp : '1.0.1' sphinxcontrib_jsmath : '1.0.1' sphinxcontrib_htmlhelp : '1.0.2' - sphinxcontrib_napoleon : '0.7' sphinxcontrib_qthelp : '1.0.2' sphinxcontrib_serializinghtml :'1.1.3' sphinxcontrib_websupport : '1.1.2' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 0e812eb..b329dac 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -77,7 +77,6 @@ APPLICATION : petsc : '3.14.0' Pillow : '7.1.1' planegcs : '0.18-3cb6890' - pockets : '0.6.2' Pygments : '2.0.2' pyparsing : '2.0.3' PyQt : '5.9' @@ -95,7 +94,6 @@ APPLICATION : six : '1.10.0' snowballstemmer : '1.2.1' Sphinx : '1.7.6' - sphinxcontrib_napoleon : '0.6.1' sphinxcontrib_websupport : '1.1.0' sphinx_rtd_theme : '0.4.3' sphinxintl: '0.9.10' diff --git a/products/GUI.pyconf b/products/GUI.pyconf index db4b15c..98e0a66 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -28,8 +28,7 @@ default : "omniORB", "docutils", "libxml2", - "sphinxintl", - "sphinxcontrib_napoleon" + "sphinxintl" ] opt_depend : ["sphinx_rtd_theme"] build_depend : ["cmake", "swig", "doxygen", "cppunit"] @@ -66,7 +65,6 @@ default_win : "sphinxcontrib_websupport", "sphinxcontrib_applehelp", "sphinxcontrib_serializinghtml", - "sphinxcontrib_napoleon", "graphviz" ] opt_depend : ["sphinx_rtd_theme"] diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index e242c65..75ac6ab 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -34,6 +34,7 @@ default : 'eigen' ] build_depend : ["cmake", "swig", "doxygen"] + opt_depend : ["sphinxcontrib_napoleon"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name properties: @@ -44,7 +45,7 @@ default : has_unit_tests : "yes" } cmake_options : "-DCMAKE_CXX_FLAGS=-fpermissive -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON" - patches : ['patch_shaper_cursor_cross.diff'] + patches : ['patch_shaper_cursor_cross.diff', 'SHAPER_sphinx_ext_napoleon.patch'] } default_win : diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf index 5230be8..0ae2354 100644 --- a/products/SMESH.pyconf +++ b/products/SMESH.pyconf @@ -39,12 +39,10 @@ default : "six", "pytz", "sphinxintl", - "sphinxcontrib_napoleon", "tbb" ] build_depend : ["cmake", "swig", "doxygen", "cppunit"] - opt_depend : [] - patches : [] + patches : ["SMESH_sphinx_ext_napoleon.patch"] check_install : ["share/doc/salome/gui/SMESH/yams/index.html"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name @@ -60,7 +58,6 @@ default : default_win : { cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF -DSALOME_SMESH_USE_TBB=ON" - patches : [] depend : ["KERNEL", "GUI", "GEOM", @@ -86,7 +83,6 @@ default_win : "pytz", "Sphinx", "sphinxintl", - "sphinxcontrib_napoleon", "tbb" ] build_depend : ["cmake", "swig", "doxygen", "cppunit", "f2c"] @@ -118,7 +114,6 @@ default_MPI : "six", "pytz", "sphinxintl", - "sphinxcontrib_napoleon", "tbb", "openmpi" ] @@ -154,6 +149,7 @@ version_8_5_0_to_9_3_0 : "sphinxintl", "sphinxcontrib_napoleon" ] + patches : [] } # OP 19/04/2018 Add section for SALOME 7.8.0 to 8.4.0 due to new dependencies in SALOME 8.5.0 @@ -188,6 +184,7 @@ version_7_8_0_to_8_4_0 : "pytz" ] nb_proc : 8 + patches : [] } version_V6_6_0 : @@ -219,4 +216,5 @@ version_V6_6_0 : "Pygments" ] check_install : [] + patches : [] } diff --git a/products/patches/SHAPER_sphinx_ext_napoleon.patch b/products/patches/SHAPER_sphinx_ext_napoleon.patch new file mode 100644 index 0000000..9abdd9d --- /dev/null +++ b/products/patches/SHAPER_sphinx_ext_napoleon.patch @@ -0,0 +1,15 @@ +diff --git a/doc/gui/conf.py.in b/doc/gui/conf.py.in +index d1327b144..e5e040494 100644 +--- a/doc/gui/conf.py.in ++++ b/doc/gui/conf.py.in +@@ -33,8 +33,8 @@ import sphinx + # ones. + extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary'] + try: +- import sphinxcontrib.napoleon +- extensions += ['sphinxcontrib.napoleon'] ++ import sphinx.ext.napoleon ++ extensions += ['sphinx.ext.napoleon'] + except: + pass + try: diff --git a/products/patches/SMESH_sphinx_ext_napoleon.patch b/products/patches/SMESH_sphinx_ext_napoleon.patch new file mode 100644 index 0000000..b2a5acc --- /dev/null +++ b/products/patches/SMESH_sphinx_ext_napoleon.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6796fcfe9..522790eac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,7 +130,7 @@ IF(SALOME_BUILD_TESTS) + ENDIF() + IF(SALOME_BUILD_DOC) + FIND_PACKAGE(SalomeDoxygen) +- SET(Sphinx_EXTENSIONS sphinxcontrib.napoleon) ++ SET(Sphinx_EXTENSIONS sphinx.ext.napoleon) + FIND_PACKAGE(SalomeSphinx) + SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) +diff --git a/doc/salome/gui/SMESH/conf.py.in b/doc/salome/gui/SMESH/conf.py.in +index 66efe32d3..f86270ab8 100644 +--- a/doc/salome/gui/SMESH/conf.py.in ++++ b/doc/salome/gui/SMESH/conf.py.in +@@ -26,8 +26,8 @@ import sphinx + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. + extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary'] + try: +- import sphinxcontrib.napoleon +- extensions += ['sphinxcontrib.napoleon'] ++ import sphinx.ext.napoleon ++ extensions += ['sphinx.ext.napoleon'] + except: + pass + try: -- 2.39.2