From 991b626f9e1711913b94ea5ec54262b92048f1e8 Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Tue, 6 Feb 2024 09:38:29 +0100 Subject: [PATCH 01/20] ci: investigations --- doc/source/conf.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 05169d6363..1e69f0afa7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,4 +1,5 @@ import os +import sys from glob import glob from datetime import datetime @@ -313,3 +314,13 @@ def reset_servers(gallery_conf, fname, when): # A list of files that should not be packed into the epub file. epub_exclude_files = ["search.html"] + + +def verify_meilisearch_is_active(app): + MEILISEARCH_PUBLIC_API_KEY = os.getenv("MEILISEARCH_PUBLIC_API_KEY", None) + if not MEILISEARCH_PUBLIC_API_KEY: + sys.stderr.write("Could not find MEILISEARCH_PUBLIC_API_KEY") + sys.exit(1) + +def setup(app): + app.connect("builder-inited", verify_meilisearch_is_active) From 1be0e77b7bef214bbfe73e516638e705c9acc308 Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Tue, 6 Feb 2024 10:24:01 +0100 Subject: [PATCH 02/20] dbg: use verbose --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e49a9db137..7ccb7d2eca 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -138,7 +138,7 @@ jobs: run: pip list - name: "Build HTML Documentation" - shell: cmd + shell: cmd /D /E:ON /V:OFF /C "CALL "{0}"" working-directory: .ci run: | build_doc.bat > ..\doc\log.txt && type ..\doc\log.txt 2>&1 From 9736bc7edd8258ea6f8f7de1898dcc7bfbcd26f4 Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Tue, 6 Feb 2024 10:58:40 +0100 Subject: [PATCH 03/20] feat: update requirements_docs.txt --- requirements/requirements_docs.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 079a81efab..812024bcbb 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -1,4 +1,4 @@ -ansys_sphinx_theme==0.13.1 +ansys_sphinx_theme==0.13.3 enum-tools[sphinx]==0.9.0.post1 graphviz==0.20.1 imageio==2.28.0 @@ -7,7 +7,7 @@ nbsphinx==0.9.3 pypandoc==1.11 pytest-sphinx==0.5.0 pyvista==0.36.1 -sphinx==5.3.0 +sphinx==7.2.6 sphinx-autobuild==2021.3.14 sphinx-copybutton==0.5.0 sphinx-gallery==0.11.0 From 270b35ea2499b35c8db06c72288659b15e29d183 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 15:54:32 +0100 Subject: [PATCH 04/20] SKIP other jobs in ci.yml Signed-off-by: paul.profizi --- .github/workflows/ci.yml | 294 +++++++++++++++++++-------------------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3931a90946..46e5fcd475 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,90 +60,90 @@ jobs: fi echo "branch suffix is: >$suffix<" - style: - name: "Style Check" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: "Setup Python" - uses: actions/setup-python@v4.6.0 - with: - python-version: ${{ env.MAIN_PYTHON_VERSION }} - - - name: "Install pre-commit" - run: pip install pre-commit - - - name: "Run pre-commit" - run: pre-commit run --all-files --show-diff-on-failure - - build_linux1: - name: "Build linux1 wheel" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: "Install requirements" - run: pip install -r requirements/requirements_build.txt - - - name: "Build the manylinux1 wheel" - shell: bash - id: wheel - run: | - python .ci/build_wheel.py -p manylinux1 - cd dist - export name=`ls ansys_dpf_core*.whl` - echo ${name} - echo "wheel_name=${name[0]}" >> $GITHUB_OUTPUT - cd .. - - - name: "Upload wheel any as artifact" - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.wheel.outputs.wheel_name }} - path: dist/${{ steps.wheel.outputs.wheel_name }} - - tests: - uses: ./.github/workflows/tests.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - python_versions: '["3.9"]' - wheel: true - wheelhouse: false - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - secrets: inherit - - tests_any: - uses: ./.github/workflows/tests.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - python_versions: '["3.9"]' - wheel: true - wheelhouse: false - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - test_any: true - secrets: inherit - - docker_tests: - name: "Build and Test on Docker" - uses: ./.github/workflows/test_docker.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - secrets: inherit - - docker_examples: - name: "Run examples on Docker" - uses: ./.github/workflows/examples_docker.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - python_versions: '["3.9"]' - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - secrets: inherit +# style: +# name: "Style Check" +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# +# - name: "Setup Python" +# uses: actions/setup-python@v4.6.0 +# with: +# python-version: ${{ env.MAIN_PYTHON_VERSION }} +# +# - name: "Install pre-commit" +# run: pip install pre-commit +# +# - name: "Run pre-commit" +# run: pre-commit run --all-files --show-diff-on-failure + +# build_linux1: +# name: "Build linux1 wheel" +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# +# - name: "Install requirements" +# run: pip install -r requirements/requirements_build.txt +# +# - name: "Build the manylinux1 wheel" +# shell: bash +# id: wheel +# run: | +# python .ci/build_wheel.py -p manylinux1 +# cd dist +# export name=`ls ansys_dpf_core*.whl` +# echo ${name} +# echo "wheel_name=${name[0]}" >> $GITHUB_OUTPUT +# cd .. +# +# - name: "Upload wheel any as artifact" +# uses: actions/upload-artifact@v3 +# with: +# name: ${{ steps.wheel.outputs.wheel_name }} +# path: dist/${{ steps.wheel.outputs.wheel_name }} + +# tests: +# uses: ./.github/workflows/tests.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# python_versions: '["3.9"]' +# wheel: true +# wheelhouse: false +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# secrets: inherit +# +# tests_any: +# uses: ./.github/workflows/tests.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# python_versions: '["3.9"]' +# wheel: true +# wheelhouse: false +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# test_any: true +# secrets: inherit +# +# docker_tests: +# name: "Build and Test on Docker" +# uses: ./.github/workflows/test_docker.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# secrets: inherit +# +# docker_examples: +# name: "Run examples on Docker" +# uses: ./.github/workflows/examples_docker.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# python_versions: '["3.9"]' +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# secrets: inherit docs: if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft @@ -183,66 +183,66 @@ jobs: doc-artifact-name: HTML-doc-ansys-dpf-core.zip decompress-artifact: true - examples: - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/examples.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - python_versions: '["3.9"]' - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - secrets: inherit - - retro_241: - name: "retro 241" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "241" - python_versions: '["3.9"]' - DOCSTRING: false - standalone_suffix: '.sp01' - secrets: inherit - - retro_232: - name: "retro 232" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "232" - python_versions: '["3.9"]' - DOCSTRING: false - standalone_suffix: '' - secrets: inherit - - retro_231: - name: "retro 231" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "231" - python_versions: '["3.9"]' - DOCSTRING: false - secrets: inherit - - retro_222: - name: "retro 222" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "222" - python_versions: '["3.9"]' - DOCSTRING: false - secrets: inherit - - pydpf-post: - name: "PyDPF-Post" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/pydpf-post.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: "242" - post_branch: "master" - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - test_docstrings: "true" - secrets: inherit +# examples: +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/examples.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# python_versions: '["3.9"]' +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# secrets: inherit +# +# retro_241: +# name: "retro 241" +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/tests.yml +# with: +# ANSYS_VERSION: "241" +# python_versions: '["3.9"]' +# DOCSTRING: false +# standalone_suffix: '.sp01' +# secrets: inherit +# +# retro_232: +# name: "retro 232" +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/tests.yml +# with: +# ANSYS_VERSION: "232" +# python_versions: '["3.9"]' +# DOCSTRING: false +# standalone_suffix: '' +# secrets: inherit +# +# retro_231: +# name: "retro 231" +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/tests.yml +# with: +# ANSYS_VERSION: "231" +# python_versions: '["3.9"]' +# DOCSTRING: false +# secrets: inherit +# +# retro_222: +# name: "retro 222" +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/tests.yml +# with: +# ANSYS_VERSION: "222" +# python_versions: '["3.9"]' +# DOCSTRING: false +# secrets: inherit +# +# pydpf-post: +# name: "PyDPF-Post" +# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft +# uses: ./.github/workflows/pydpf-post.yml +# needs: pick_server_suffix +# with: +# ANSYS_VERSION: "242" +# post_branch: "master" +# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} +# test_docstrings: "true" +# secrets: inherit From dd0ab5df6ca471120f789df9dd74d96025d793f3 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 15:56:18 +0100 Subject: [PATCH 05/20] SKIP examples run in doc generation in conf.py Signed-off-by: paul.profizi --- doc/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 1e69f0afa7..c62e2dde55 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,6 +62,7 @@ ignored_pattern += f"|{example_name}" ignored_pattern += "|11-server_types.py" ignored_pattern += "|06-distributed_stress_averaging.py" +ignored_pattern += "|*.py" ignored_pattern += r")" # -- General configuration --------------------------------------------------- From fcafdc048eb533ba122fa3d0b231ea1aab98c301 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 18:33:36 +0100 Subject: [PATCH 06/20] Update other sphinx requirements in requirements_docs.txt Signed-off-by: paul.profizi --- requirements/requirements_docs.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 812024bcbb..671fe8715c 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -1,5 +1,5 @@ ansys_sphinx_theme==0.13.3 -enum-tools[sphinx]==0.9.0.post1 +enum-tools[sphinx]==0.11.0 graphviz==0.20.1 imageio==2.28.0 imageio-ffmpeg==0.4.7 @@ -8,9 +8,9 @@ pypandoc==1.11 pytest-sphinx==0.5.0 pyvista==0.36.1 sphinx==7.2.6 -sphinx-autobuild==2021.3.14 -sphinx-copybutton==0.5.0 -sphinx-gallery==0.11.0 +sphinx-autobuild==2024.2.4 +sphinx-copybutton==0.5.2 +sphinx-gallery==0.15.0 sphinx-notfound-page==1.0.0 sphinx_design==0.5.0 sphinxcontrib-napoleon==0.7 From b1468cd430f3ce3c5056ce411b5d3949dd79c042 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 18:57:29 +0100 Subject: [PATCH 07/20] Ignore all but the first example Signed-off-by: paul.profizi --- doc/source/conf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index c62e2dde55..bf5042d7ec 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -54,15 +54,19 @@ ignored_pattern = r"(ignore" header_flag = "\"\"\"" note_flag = r".. note::" +ignore = False for example in glob(r"../../examples/**/*.py"): minimum_version_str = get_example_required_minimum_dpf_version(example) if float(server_version) - float(minimum_version_str) < -0.05: example_name = example.split(os.path.sep)[-1] print(f"Example {example_name} skipped as it requires DPF {minimum_version_str}.") ignored_pattern += f"|{example_name}" + if ignore: + example_name = example.split(os.path.sep)[-1] + ignored_pattern += f"|{example_name}" + ignore = True ignored_pattern += "|11-server_types.py" ignored_pattern += "|06-distributed_stress_averaging.py" -ignored_pattern += "|*.py" ignored_pattern += r")" # -- General configuration --------------------------------------------------- From 2c81cd1ddb65adb17bd2f95a23cdf59f1afab37e Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 19:14:43 +0100 Subject: [PATCH 08/20] Fix link in Field docstring Signed-off-by: paul.profizi --- src/ansys/dpf/core/field.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ansys/dpf/core/field.py b/src/ansys/dpf/core/field.py index bedc946a40..1592bd1d51 100644 --- a/src/ansys/dpf/core/field.py +++ b/src/ansys/dpf/core/field.py @@ -36,8 +36,8 @@ class Field(_FieldBase): ``scoping`` identifies to which entity the first ``entity data`` belongs. For more information, see the `Fields container and fields - - `_ documentation section. + `_ + documentation section. Parameters From ac49c3ea609a991e9a18c5b1e09a8385c0442071 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 19:15:20 +0100 Subject: [PATCH 09/20] Fix link in FieldsContainer docstring Signed-off-by: paul.profizi --- src/ansys/dpf/core/fields_container.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ansys/dpf/core/fields_container.py b/src/ansys/dpf/core/fields_container.py index 7be4842fb0..1c569c3153 100644 --- a/src/ansys/dpf/core/fields_container.py +++ b/src/ansys/dpf/core/fields_container.py @@ -24,8 +24,8 @@ class FieldsContainer(Collection): to be separated from imaginary parts (``id=1``). For more information, see the `Fields container and fields - - `_ documentation section. + `_ + documentation section. Parameters ---------- From 4e2cf215e79294cbc21d7727a0ad074bf23f8ee1 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 19:21:20 +0100 Subject: [PATCH 10/20] Suppress autosectionlabel warnings (duplicate labels) Signed-off-by: paul.profizi --- doc/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index bf5042d7ec..2f5c22fe81 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -97,6 +97,7 @@ typehints_defaults = "comma" typehints_use_signature = True simplify_optional_unions = False +suppress_warnings = ['autosectionlabel.*'] # Intersphinx mapping intersphinx_mapping = { From 2858bc230e04f47d02cb8f5b97f4ae45bb123085 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 19:21:42 +0100 Subject: [PATCH 11/20] Fix FieldsContainer.plot docstring Signed-off-by: paul.profizi --- src/ansys/dpf/core/fields_container.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ansys/dpf/core/fields_container.py b/src/ansys/dpf/core/fields_container.py index 1c569c3153..c60d76665c 100644 --- a/src/ansys/dpf/core/fields_container.py +++ b/src/ansys/dpf/core/fields_container.py @@ -490,8 +490,8 @@ def plot(self, label_space: dict = None, **kwargs): A dictionary (LabelSpace) of labels of the :class:`FieldsContainer` with associated values to select for plotting. This is used to filter the data to plot, for example: - - if ``label_space={'time': 10}``: a single time step (mandatory for transient) - - if ``label_space={'complex': 0, 'part': 12}``: real part of complex data for a part + - if ``label_space={'time': 10}``: a single time step (mandatory for transient) + - if ``label_space={'complex': 0, 'part': 12}``: real part of complex data for a part See :func:`~fields_container.FieldsContainer.get_fields`. If None is given, it renders all fields available, which may not make sense. **kwargs: From 855d2425ccdf00c509dcef85e4467603c7906cab Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 11:19:23 +0100 Subject: [PATCH 12/20] debug: revert th requirement test --- requirements/requirements_docs.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 671fe8715c..526745128d 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -1,5 +1,7 @@ -ansys_sphinx_theme==0.13.3 -enum-tools[sphinx]==0.11.0 +# ansys_sphinx_theme==0.13.3 +# enum-tools[sphinx]==0.11.0 +ansys_sphinx_theme==0.13.1 +enum-tools[sphinx]==0.9.0.post1 graphviz==0.20.1 imageio==2.28.0 imageio-ffmpeg==0.4.7 @@ -7,10 +9,14 @@ nbsphinx==0.9.3 pypandoc==1.11 pytest-sphinx==0.5.0 pyvista==0.36.1 -sphinx==7.2.6 -sphinx-autobuild==2024.2.4 -sphinx-copybutton==0.5.2 -sphinx-gallery==0.15.0 +# sphinx==7.2.6 +# sphinx-autobuild==2024.2.4 +# sphinx-copybutton==0.5.2 +# sphinx-gallery==0.15.0 +sphinx==5.3.0 +sphinx-autobuild==2021.3.14 +sphinx-copybutton==0.5.0 +sphinx-gallery==0.11.0 sphinx-notfound-page==1.0.0 sphinx_design==0.5.0 sphinxcontrib-napoleon==0.7 From 576a7454bda8153c39362309c450b05809b3468c Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 11:48:13 +0100 Subject: [PATCH 13/20] debug: fix with sphinx version --- requirements/requirements_docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 526745128d..bc7d798fae 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -13,7 +13,7 @@ pyvista==0.36.1 # sphinx-autobuild==2024.2.4 # sphinx-copybutton==0.5.2 # sphinx-gallery==0.15.0 -sphinx==5.3.0 +sphinx==6.2.0 sphinx-autobuild==2021.3.14 sphinx-copybutton==0.5.0 sphinx-gallery==0.11.0 From 362ad1a92e168b1eb1c4e242e4b18703f6906334 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 13:54:00 +0100 Subject: [PATCH 14/20] debug: fix with sphinx version --- requirements/requirements_docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index bc7d798fae..a0f2267947 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -13,7 +13,7 @@ pyvista==0.36.1 # sphinx-autobuild==2024.2.4 # sphinx-copybutton==0.5.2 # sphinx-gallery==0.15.0 -sphinx==6.2.0 +sphinx==7.1.0 sphinx-autobuild==2021.3.14 sphinx-copybutton==0.5.0 sphinx-gallery==0.11.0 From 464706ed40f0a538dadbd777c8f2e50df4ad7e38 Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 14:13:16 +0100 Subject: [PATCH 15/20] debug: change the nav end from doc --- doc/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 2f5c22fe81..3b118e13ef 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -207,7 +207,6 @@ def reset_servers(gallery_conf, fname, when): "json_url": f"https://{cname}/versions.json", "version_match": get_version_match(__version__), }, - "navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"], "use_meilisearch": { "api_key": os.getenv("MEILISEARCH_PUBLIC_API_KEY", ""), "index_uids": { From 4dcc08c8be23b191dbcfb4c154f4a81a88748a6b Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 14:21:27 +0100 Subject: [PATCH 16/20] debug: change pydata sphinx theme --- doc/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 3b118e13ef..8db654f6da 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -81,7 +81,6 @@ extensions = [ "enum_tools.autoenum", "nbsphinx", - "pydata_sphinx_theme", "sphinx.ext.autosectionlabel", "sphinx.ext.autodoc", "sphinx.ext.graphviz", From 9c0529c5e849925ac359ce4ae4959ca968f7939e Mon Sep 17 00:00:00 2001 From: Revathyvenugopal162 Date: Fri, 16 Feb 2024 14:47:01 +0100 Subject: [PATCH 17/20] fix: requirement --- requirements/requirements_docs.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index a0f2267947..649d5701c1 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -1,7 +1,5 @@ -# ansys_sphinx_theme==0.13.3 -# enum-tools[sphinx]==0.11.0 -ansys_sphinx_theme==0.13.1 -enum-tools[sphinx]==0.9.0.post1 +ansys_sphinx_theme==0.13.3 +enum-tools[sphinx]==0.11.0 graphviz==0.20.1 imageio==2.28.0 imageio-ffmpeg==0.4.7 @@ -9,14 +7,10 @@ nbsphinx==0.9.3 pypandoc==1.11 pytest-sphinx==0.5.0 pyvista==0.36.1 -# sphinx==7.2.6 -# sphinx-autobuild==2024.2.4 -# sphinx-copybutton==0.5.2 -# sphinx-gallery==0.15.0 sphinx==7.1.0 -sphinx-autobuild==2021.3.14 -sphinx-copybutton==0.5.0 -sphinx-gallery==0.11.0 +sphinx-autobuild==2024.2.4 +sphinx-copybutton==0.5.2 +sphinx-gallery==0.15.0 sphinx-notfound-page==1.0.0 sphinx_design==0.5.0 sphinxcontrib-napoleon==0.7 From f785f58ae2b6dfd2f60b62e8277b01b5fa4194b7 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Fri, 16 Feb 2024 15:10:35 +0100 Subject: [PATCH 18/20] Revert "Ignore all but the first example" This reverts commit b1468cd430f3ce3c5056ce411b5d3949dd79c042. --- doc/source/conf.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 8db654f6da..a4f09e1bcb 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -54,19 +54,15 @@ ignored_pattern = r"(ignore" header_flag = "\"\"\"" note_flag = r".. note::" -ignore = False for example in glob(r"../../examples/**/*.py"): minimum_version_str = get_example_required_minimum_dpf_version(example) if float(server_version) - float(minimum_version_str) < -0.05: example_name = example.split(os.path.sep)[-1] print(f"Example {example_name} skipped as it requires DPF {minimum_version_str}.") ignored_pattern += f"|{example_name}" - if ignore: - example_name = example.split(os.path.sep)[-1] - ignored_pattern += f"|{example_name}" - ignore = True ignored_pattern += "|11-server_types.py" ignored_pattern += "|06-distributed_stress_averaging.py" +ignored_pattern += "|*.py" ignored_pattern += r")" # -- General configuration --------------------------------------------------- From 2d3d34576b265493eea4978672a7f577af2e8fb2 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Fri, 16 Feb 2024 15:10:36 +0100 Subject: [PATCH 19/20] Revert "SKIP examples run in doc generation in conf.py" This reverts commit dd0ab5df6ca471120f789df9dd74d96025d793f3. --- doc/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index a4f09e1bcb..2c18f594bf 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,7 +62,6 @@ ignored_pattern += f"|{example_name}" ignored_pattern += "|11-server_types.py" ignored_pattern += "|06-distributed_stress_averaging.py" -ignored_pattern += "|*.py" ignored_pattern += r")" # -- General configuration --------------------------------------------------- From dfe79954bf763018441c829e96e6e9036941d429 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Fri, 16 Feb 2024 15:10:38 +0100 Subject: [PATCH 20/20] Revert "SKIP other jobs in ci.yml" This reverts commit 270b35ea2499b35c8db06c72288659b15e29d183. --- .github/workflows/ci.yml | 294 +++++++++++++++++++-------------------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46e5fcd475..3931a90946 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,90 +60,90 @@ jobs: fi echo "branch suffix is: >$suffix<" -# style: -# name: "Style Check" -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# -# - name: "Setup Python" -# uses: actions/setup-python@v4.6.0 -# with: -# python-version: ${{ env.MAIN_PYTHON_VERSION }} -# -# - name: "Install pre-commit" -# run: pip install pre-commit -# -# - name: "Run pre-commit" -# run: pre-commit run --all-files --show-diff-on-failure - -# build_linux1: -# name: "Build linux1 wheel" -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# -# - name: "Install requirements" -# run: pip install -r requirements/requirements_build.txt -# -# - name: "Build the manylinux1 wheel" -# shell: bash -# id: wheel -# run: | -# python .ci/build_wheel.py -p manylinux1 -# cd dist -# export name=`ls ansys_dpf_core*.whl` -# echo ${name} -# echo "wheel_name=${name[0]}" >> $GITHUB_OUTPUT -# cd .. -# -# - name: "Upload wheel any as artifact" -# uses: actions/upload-artifact@v3 -# with: -# name: ${{ steps.wheel.outputs.wheel_name }} -# path: dist/${{ steps.wheel.outputs.wheel_name }} - -# tests: -# uses: ./.github/workflows/tests.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# python_versions: '["3.9"]' -# wheel: true -# wheelhouse: false -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# secrets: inherit -# -# tests_any: -# uses: ./.github/workflows/tests.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# python_versions: '["3.9"]' -# wheel: true -# wheelhouse: false -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# test_any: true -# secrets: inherit -# -# docker_tests: -# name: "Build and Test on Docker" -# uses: ./.github/workflows/test_docker.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# secrets: inherit -# -# docker_examples: -# name: "Run examples on Docker" -# uses: ./.github/workflows/examples_docker.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# python_versions: '["3.9"]' -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# secrets: inherit + style: + name: "Style Check" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: "Setup Python" + uses: actions/setup-python@v4.6.0 + with: + python-version: ${{ env.MAIN_PYTHON_VERSION }} + + - name: "Install pre-commit" + run: pip install pre-commit + + - name: "Run pre-commit" + run: pre-commit run --all-files --show-diff-on-failure + + build_linux1: + name: "Build linux1 wheel" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: "Install requirements" + run: pip install -r requirements/requirements_build.txt + + - name: "Build the manylinux1 wheel" + shell: bash + id: wheel + run: | + python .ci/build_wheel.py -p manylinux1 + cd dist + export name=`ls ansys_dpf_core*.whl` + echo ${name} + echo "wheel_name=${name[0]}" >> $GITHUB_OUTPUT + cd .. + + - name: "Upload wheel any as artifact" + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.wheel.outputs.wheel_name }} + path: dist/${{ steps.wheel.outputs.wheel_name }} + + tests: + uses: ./.github/workflows/tests.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + python_versions: '["3.9"]' + wheel: true + wheelhouse: false + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + secrets: inherit + + tests_any: + uses: ./.github/workflows/tests.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + python_versions: '["3.9"]' + wheel: true + wheelhouse: false + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + test_any: true + secrets: inherit + + docker_tests: + name: "Build and Test on Docker" + uses: ./.github/workflows/test_docker.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + secrets: inherit + + docker_examples: + name: "Run examples on Docker" + uses: ./.github/workflows/examples_docker.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + python_versions: '["3.9"]' + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + secrets: inherit docs: if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft @@ -183,66 +183,66 @@ jobs: doc-artifact-name: HTML-doc-ansys-dpf-core.zip decompress-artifact: true -# examples: -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/examples.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# python_versions: '["3.9"]' -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# secrets: inherit -# -# retro_241: -# name: "retro 241" -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/tests.yml -# with: -# ANSYS_VERSION: "241" -# python_versions: '["3.9"]' -# DOCSTRING: false -# standalone_suffix: '.sp01' -# secrets: inherit -# -# retro_232: -# name: "retro 232" -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/tests.yml -# with: -# ANSYS_VERSION: "232" -# python_versions: '["3.9"]' -# DOCSTRING: false -# standalone_suffix: '' -# secrets: inherit -# -# retro_231: -# name: "retro 231" -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/tests.yml -# with: -# ANSYS_VERSION: "231" -# python_versions: '["3.9"]' -# DOCSTRING: false -# secrets: inherit -# -# retro_222: -# name: "retro 222" -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/tests.yml -# with: -# ANSYS_VERSION: "222" -# python_versions: '["3.9"]' -# DOCSTRING: false -# secrets: inherit -# -# pydpf-post: -# name: "PyDPF-Post" -# if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft -# uses: ./.github/workflows/pydpf-post.yml -# needs: pick_server_suffix -# with: -# ANSYS_VERSION: "242" -# post_branch: "master" -# standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} -# test_docstrings: "true" -# secrets: inherit + examples: + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/examples.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + python_versions: '["3.9"]' + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + secrets: inherit + + retro_241: + name: "retro 241" + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "241" + python_versions: '["3.9"]' + DOCSTRING: false + standalone_suffix: '.sp01' + secrets: inherit + + retro_232: + name: "retro 232" + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "232" + python_versions: '["3.9"]' + DOCSTRING: false + standalone_suffix: '' + secrets: inherit + + retro_231: + name: "retro 231" + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "231" + python_versions: '["3.9"]' + DOCSTRING: false + secrets: inherit + + retro_222: + name: "retro 222" + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "222" + python_versions: '["3.9"]' + DOCSTRING: false + secrets: inherit + + pydpf-post: + name: "PyDPF-Post" + if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft + uses: ./.github/workflows/pydpf-post.yml + needs: pick_server_suffix + with: + ANSYS_VERSION: "242" + post_branch: "master" + standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} + test_docstrings: "true" + secrets: inherit