From e1b3ee6f788f64c6af31c55d94e8f936a6863e31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:52:13 +0000 Subject: [PATCH 1/5] Build(deps): Bump ansys/actions from 7 to 8 in the actions group Bumps the actions group with 1 update: [ansys/actions](https://github.com/ansys/actions). Updates `ansys/actions` from 7 to 8 - [Release notes](https://github.com/ansys/actions/releases) - [Commits](https://github.com/ansys/actions/compare/v7...v8) --- updated-dependencies: - dependency-name: ansys/actions dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 584e897e..f579037c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -27,7 +27,7 @@ jobs: steps: - name: PyAnsys Vulnerability Check (on PRs) if: github.event_name == 'pull_request' - uses: ansys/actions/check-vulnerabilities@v7 + uses: ansys/actions/check-vulnerabilities@v8 with: python-version: ${{ env.MAIN_PYTHON_VERSION }} python-package-name: ${{ env.PACKAGE_NAME }} @@ -36,7 +36,7 @@ jobs: - name: PyAnsys Vulnerability Check (any other case) if: github.event_name != 'pull_request' - uses: ansys/actions/check-vulnerabilities@v7 + uses: ansys/actions/check-vulnerabilities@v8 with: python-version: ${{ env.MAIN_PYTHON_VERSION }} python-package-name: ${{ env.PACKAGE_NAME }} @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest steps: - name: PyAnsys documentation style checks - uses: ansys/actions/doc-style@v7 + uses: ansys/actions/doc-style@v8 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -127,7 +127,7 @@ jobs: steps: - name: Build wheelhouse and perform smoke test - uses: ansys/actions/build-wheelhouse@v7 + uses: ansys/actions/build-wheelhouse@v8 with: library-name: ${{ env.PACKAGE_NAME }} operating-system: ${{ runner.os }} @@ -153,7 +153,7 @@ jobs: steps: - name: Build documentation - uses: ansys/actions/doc-build@v7 + uses: ansys/actions/doc-build@v8 with: python-version: ${{ env.MAIN_PYTHON_VERSION }} dependencies: "build-essential zip pandoc texlive-latex-extra latexmk texlive-pstricks" @@ -165,7 +165,7 @@ jobs: needs: [package] steps: - name: Deploy the latest documentation - uses: ansys/actions/doc-deploy-dev@v7 + uses: ansys/actions/doc-deploy-dev@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} @@ -182,7 +182,7 @@ jobs: needs: [doc-deploy-dev] steps: - name: "Deploy the dev documentation index" - uses: ansys/actions/doc-deploy-index@v7 + uses: ansys/actions/doc-deploy-index@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev index-name: pyansys-vdev @@ -195,7 +195,7 @@ jobs: needs: [docs-build, smoke-tests-core] steps: - name: Build library source and wheel artifacts - uses: ansys/actions/build-library@v7 + uses: ansys/actions/build-library@v8 with: library-name: ${{ env.PACKAGE_NAME }} python-version: ${{ env.MAIN_PYTHON_VERSION }} @@ -207,14 +207,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Release to PyPI repository - uses: ansys/actions/release-pypi-public@v7 + uses: ansys/actions/release-pypi-public@v8 with: library-name: ${{ env.PACKAGE_NAME }} twine-username: __token__ twine-token: ${{ secrets.PYPI_TOKEN }} - name: Release to GitHub - uses: ansys/actions/release-github@v7 + uses: ansys/actions/release-github@v8 with: library-name: ${{ env.PACKAGE_NAME }} additional-artifacts: 'all-deps-Linux-3.10 all-deps-Linux-3.11 all-deps-Linux-3.12 all-deps-Windows-3.10 all-deps-Windows-3.11 all-deps-Windows-3.12 all-deps-macOS-3.10 all-deps-macOS-3.11 all-deps-macOS-3.12' @@ -225,7 +225,7 @@ jobs: needs: [release] steps: - name: Deploy the latest release documentation - uses: ansys/actions/doc-deploy-stable@v7 + uses: ansys/actions/doc-deploy-stable@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} @@ -258,7 +258,7 @@ jobs: echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV - name: "Deploy the latest documentation index" - uses: ansys/actions/doc-deploy-index@v7 + uses: ansys/actions/doc-deploy-index@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }} index-name: pyansys-v${{ env.VERSION_MEILI }} From 9befee6ae915f56276755001639392e296dd47b5 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:03:40 +0200 Subject: [PATCH 2/5] Update ci-build.yml --- .github/workflows/ci-build.yml | 54 ++++------------------------------ 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f579037c..1fe0777c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -17,8 +17,6 @@ env: PACKAGE_NAMESPACE: pyansys MAIN_PYTHON_VERSION: '3.11' DOCUMENTATION_CNAME: "docs.pyansys.com" - MEILISEARCH_API_KEY: ${{ secrets.MEILISEARCH_API_KEY }} - MEILISEARCH_PUBLIC_API_KEY: ${{ secrets.MEILISEARCH_PUBLIC_API_KEY }} jobs: check-vulnerabilities: @@ -168,27 +166,15 @@ jobs: uses: ansys/actions/doc-deploy-dev@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} + bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }} + bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }} adapt-landing-page-dev: uses: ./.github/workflows/update-gh-pages.yml needs: [doc-deploy-dev] secrets: inherit - doc-index-dev: - name: "Deploy dev docs index" - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - needs: [doc-deploy-dev] - steps: - - name: "Deploy the dev documentation index" - uses: ansys/actions/doc-deploy-index@v8 - with: - cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev - index-name: pyansys-vdev - host-url: ${{ vars.MEILISEARCH_HOST_URL }} - api-key: ${{ env.MEILISEARCH_API_KEY }} - package: name: Package library runs-on: ubuntu-latest @@ -228,39 +214,11 @@ jobs: uses: ansys/actions/doc-deploy-stable@v8 with: cname: ${{ env.DOCUMENTATION_CNAME }} - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} + bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }} + bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }} adapt-landing-page-release: uses: ./.github/workflows/update-gh-pages.yml needs: [docs-release] secrets: inherit - - doc-index-release: - name: "Deploy release docs index" - runs-on: ubuntu-latest - needs: docs-release - steps: - - name: "Install Git and clone project" - uses: actions/checkout@v4 - - - name: "Install the library to get the version" - shell: bash - run: | - python -m pip install -e . - - - name: "Get the version of the library" - run: | - VERSION=$(python -c "from ${{ env.PACKAGE_NAMESPACE }} import __version__; print('.'.join(__version__.split('.')[:2]))") - VERSION_MEILI=$(python -c "from ${{ env.PACKAGE_NAMESPACE }} import __version__; print('-'.join(__version__.split('.')[:2]))") - echo "Calculated VERSION: $VERSION" - echo "Calculated VERSION_MEILI: $VERSION_MEILI" - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV - - - name: "Deploy the latest documentation index" - uses: ansys/actions/doc-deploy-index@v8 - with: - cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }} - index-name: pyansys-v${{ env.VERSION_MEILI }} - host-url: ${{ vars.MEILISEARCH_HOST_URL }} - api-key: ${{ env.MEILISEARCH_API_KEY }} From 3fb04fdc7cb34b2a5eb49fa8d70c2861daab8f32 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:05:21 +0200 Subject: [PATCH 3/5] Update conf.py --- doc/source/conf.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 4246a60a..ed0f3e9f 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -65,11 +65,10 @@ "version_match": switcher_version, }, "check_switcher": False, - "use_meilisearch": { - "api_key": os.getenv("MEILISEARCH_PUBLIC_API_KEY", ""), - "index_uids": { - f"pyansys-v{meilisearch_version}": "PyAnsys", - }, + "static_search": { + "threshold": 0.5, + "min_chars_for_search": 2, + "ignoreLocation": True, }, } From d57cf500dfc1ae5f9068222bcbf9a5fc9e64f539 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:06:15 +0200 Subject: [PATCH 4/5] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5c92c8ec..0eec3e65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,7 +94,7 @@ all = [ ] doc = [ "Sphinx==8.0.2", - "ansys-sphinx-theme==1.0.11", + "ansys-sphinx-theme==1.1.1", "Jinja2 ==3.1.4", "Pillow==10.4.0", "PyGithub==2.4.0", From 10cd2285e36b13c3968704dc607e149b1b1ff375 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:25:57 +0200 Subject: [PATCH 5/5] fix: remove meilisearch refs --- doc/source/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index ed0f3e9f..4ea68793 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -4,7 +4,7 @@ import os import subprocess -from ansys_sphinx_theme import ansys_favicon, convert_version_to_pymeilisearch, get_version_match +from ansys_sphinx_theme import ansys_favicon, get_version_match import sphinx from sphinx.builders.latex import LaTeXBuilder @@ -17,7 +17,6 @@ author = "ANSYS Inc." cname = os.getenv("DOCUMENTATION_CNAME", default="nocname.com") switcher_version = get_version_match(pyansys_version) -meilisearch_version = convert_version_to_pymeilisearch(pyansys_version) # get the PyAnsys version release = version = pyansys_version