Merge branch 'main' into dependabot/pip/pytest-8.2.2

ansys · Aug 19, 2024 · 36c3cf9 · 36c3cf9
2 parents 533f34e + 3b4de47
commit 36c3cf9
Show file tree

Hide file tree

Showing 21 changed files with 527 additions and 437 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: ansys/actions/doc-deploy-changelog@v6
+      - uses: ansys/actions/doc-deploy-changelog@v7
         with:
           token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
 
@@ -35,14 +35,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Run PyAnsys code style checks"
-        uses: ansys/actions/code-style@v6
+        uses: ansys/actions/code-style@v7
 
   doc-style:
     name: Doc style
     runs-on: ubuntu-latest
     steps:
       - name: "Run Ansys documentation style checks"
-        uses: ansys/actions/doc-style@v6
+        uses: ansys/actions/doc-style@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -52,7 +52,7 @@ jobs:
     needs: doc-style
     steps:
       - name: "Run Ansys documentation building action"
-        uses: ansys/actions/doc-build@v6
+        uses: ansys/actions/doc-build@v7
 
   wheelhouse:
     name: Wheelhouse Python ${{ matrix.os }}
@@ -70,7 +70,7 @@ jobs:
             os: macos-latest
     steps:
       - name: "Build wheelhouse and perform smoke test"
-        uses: ansys/actions/build-wheelhouse@v6
+        uses: ansys/actions/build-wheelhouse@v7
         with:
           library-name: ${{ env.LIBRARY_NAME }}
           operating-system: ${{ matrix.os }}
@@ -113,7 +113,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Build library source and wheel artifacts"
-        uses: ansys/actions/build-library@v6
+        uses: ansys/actions/build-library@v7
         with:
           library-name: ${{ env.LIBRARY_NAME }}
 
@@ -124,7 +124,7 @@ jobs:
     needs: build-library
     steps:
       - name: "Deploy developers documentation"
-        uses: ansys/actions/doc-deploy-dev@v6
+        uses: ansys/actions/doc-deploy-dev@v7
         with:
             cname: ${{ env.DOCUMENTATION_CNAME }}
             token: ${{ secrets.GITHUB_TOKEN }}
@@ -137,21 +137,21 @@ jobs:
     steps:
 
       - name: "Release to the private PyPI repository"
-        uses: ansys/actions/release-pypi-private@v6
+        uses: ansys/actions/release-pypi-private@v7
         with:
           library-name: ${{ env.LIBRARY_NAME }}
           twine-username: "__token__"
           twine-token: ${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}
 
       - name: "Release to the public PyPI repository"
-        uses: ansys/actions/release-pypi-public@v6
+        uses: ansys/actions/release-pypi-public@v7
         with:
           library-name: ${{ env.LIBRARY_NAME }}
           twine-username: "__token__"
           twine-token: ${{ secrets.PYPI_TOKEN }}
 
       - name: "Release to GitHub"
-        uses: ansys/actions/release-github@v6
+        uses: ansys/actions/release-github@v7
         with:
           library-name: ${{ env.LIBRARY_NAME }}
 
@@ -162,7 +162,7 @@ jobs:
     needs: release
     steps:
       - name: "Deploy stable documentation"
-        uses: ansys/actions/doc-deploy-stable@v6
+        uses: ansys/actions/doc-deploy-stable@v7
         with:
             cname: ${{ env.DOCUMENTATION_CNAME }}
             token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -95,6 +95,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: ansys/actions/doc-changelog@v6
+    - uses: ansys/actions/doc-changelog@v7
       with:
         token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,18 +1,18 @@
 repos:
 
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 24.8.0
   hooks:
   - id: black
     exclude: ^src/ansys/templates/python/
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.12.0
+  rev: 5.13.2
   hooks:
   - id: isort
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 6.0.0
+  rev: 7.1.1
   hooks:
   - id: flake8
     args: [
@@ -32,7 +32,7 @@ repos:
     exclude: ^src/ansys/templates/python/|^tests
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.6.0
   hooks:
   - id: check-merge-conflict
   - id: check-yaml
@@ -42,12 +42,12 @@ repos:
 
 # Validates github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.22.0
+  rev: 0.29.1
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.3.1
+  rev: v0.4.3
   hooks:
   - id: add-license-headers
     args:

diff --git a/doc/changelog.d/490.dependencies.md b/doc/changelog.d/490.dependencies.md
@@ -0,0 +1 @@
+Build(deps): Bump ansys-sphinx-theme from 0.16.0 to 0.16.5
diff --git a/doc/changelog.d/495.fixed.md b/doc/changelog.d/495.fixed.md
@@ -0,0 +1 @@
+fix: updating poetry.lock before local wheels are used in solution template
diff --git a/doc/changelog.d/498.miscellaneous.md b/doc/changelog.d/498.miscellaneous.md
@@ -0,0 +1 @@
+Replace AWC Tree by Dash Tree in the default UI mode of the solution template
diff --git a/doc/changelog.d/499.maintenance.md b/doc/changelog.d/499.maintenance.md
@@ -0,0 +1 @@
+Build(deps): Bump ansys/actions from 6 to 7
diff --git a/doc/changelog.d/501.fixed.md b/doc/changelog.d/501.fixed.md
@@ -0,0 +1 @@
+maint: update theme version, actions and logo
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -25,7 +25,7 @@
 from datetime import datetime
 import os
 
-from ansys_sphinx_theme import ansys_favicon, ansys_logo_black, get_version_match
+from ansys_sphinx_theme import ansys_favicon, get_version_match
 
 from ansys.templates import __version__
 
@@ -38,7 +38,6 @@
 switcher_version = get_version_match(__version__)
 
 # use the default pyansys logo
-html_logo = ansys_logo_black
 html_favicon = ansys_favicon
 html_theme = "ansys_sphinx_theme"
 html_short_title = html_title = project  # necessary for proper breadcrumb title
@@ -58,7 +57,7 @@
         "json_url": f"https://{cname}/versions.json",
         "version_match": get_version_match(__version__),
     },
-    "check_switcher": False,
+    "logo": "ansys",
 }
 
 # Sphinx extensions

diff --git a/pyproject.toml b/pyproject.toml
@@ -42,7 +42,6 @@ maintainers = [
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -64,9 +63,9 @@ tests = [
     "pytest-cov==4.1.0",
 ]
 doc = [
-    "ansys-sphinx-theme==0.16.0",
-    "numpydoc==1.6.0",
-    "sphinx==7.3.7",
+    "ansys-sphinx-theme==1.0.5",
+    "numpydoc==1.8.0",
+    "Sphinx==8.0.2",
     "sphinx-copybutton==0.5.2",
 ]
 
@@ -134,4 +133,18 @@ showcontent = true
 [[tool.towncrier.type]]
 directory = "miscellaneous"
 name = "Miscellaneous"
-showcontent = true
+showcontent = true
+[[tool.towncrier.type]]
+directory = "documentation"
+name = "Documentation"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "maintenance"
+name = "Maintenance"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "test"
+name = "Test"
+showcontent = true
diff --git a/.../templates/python/common/{{cookiecutter.__project_name_slug}}/.github/workflows/ci_cd.yml b/.../templates/python/common/{{cookiecutter.__project_name_slug}}/.github/workflows/ci_cd.yml
@@ -28,15 +28,15 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: ansys/actions/doc-deploy-changelog@v6
+      - uses: ansys/actions/doc-deploy-changelog@v7
         with:
           token: {{ '${{ secrets.PYANSYS_CI_BOT_TOKEN }}' }}
 
   code-style:
     name: "Code style"
     runs-on: ubuntu-latest
     steps:
-      - uses: ansys/actions/code-style@v6
+      - uses: ansys/actions/code-style@v7
         with:
           python-version: {{ '${{ env.MAIN_PYTHON_VERSION }}' }}
 
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: PyAnsys documentation style checks
-        uses: ansys/actions/doc-style@v6
+        uses: ansys/actions/doc-style@v7
         with:
           token: {{ '${{ secrets.GITHUB_TOKEN }}' }}
 
@@ -66,7 +66,7 @@ jobs:
         {%- endfor -%}
         python-version: {{ python_versions }}
     steps:
-      - uses: ansys/actions/build-wheelhouse@v6
+      - uses: ansys/actions/build-wheelhouse@v7
         with:
           library-name: {{ '${{ env.LIBRARY_NAME }}' }}
           operating-system: {{ '${{ matrix.os }}' }}
@@ -90,7 +90,7 @@ jobs:
       fail-fast: false
     steps:
       - name: PyAnsys tests check
-        uses: ansys/actions/tests-pytest@v6
+        uses: ansys/actions/tests-pytest@v7
         with:
           pytest-extra-args: "--cov=ansys --cov-report=term --cov-report=html:.cov/html"
           python-version: {{ '${{ matrix.python-version }}' }}
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [doc-style]
     steps:
-      - uses: ansys/actions/doc-build@v6
+      - uses: ansys/actions/doc-build@v7
         with:
           python-version: {{ '${{ env.MAIN_PYTHON_VERSION }}' }}
 
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Build library source and wheel artifacts"
-        uses: ansys/actions/build-library@v6
+        uses: ansys/actions/build-library@v7
         with:
           library-name: {{ '${{ env.LIBRARY_NAME }}' }}
 
@@ -135,7 +135,7 @@ jobs:
     needs: [doc-build, build-library]
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: ansys/actions/doc-deploy-dev@v6
+      - uses: ansys/actions/doc-deploy-dev@v7
         with:
           cname: {{ '${{ env.DOCUMENTATION_CNAME }}' }}
           token: {{ '${{ secrets.GITHUB_TOKEN }}' }}
@@ -146,7 +146,7 @@ jobs:
     needs: [doc-build, build-library]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
     steps:
-      - uses: ansys/actions/doc-deploy-stable@v6
+      - uses: ansys/actions/doc-deploy-stable@v7
         with:
           cname: {{ '${{ env.DOCUMENTATION_CNAME }}' }}
           token: {{ '${{ secrets.GITHUB_TOKEN }}' }}
@@ -159,7 +159,7 @@ jobs:
   #   needs: doc-deploy-dev
   #   steps:
   #     - name: "Deploy the latest documentation index"
-  #       uses: ansys/actions/doc-deploy-index@v6
+  #       uses: ansys/actions/doc-deploy-index@v7
   #       with:
   #         cname: "{{ '${{ env.DOCUMENTATION_CNAME }}' }}/version/dev"
   #         index-name: "{{ '${{ env.LIBRARY_NAME }}'}}-vdev"
@@ -188,7 +188,7 @@ jobs:
   #         echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
 
   #     - name: "Deploy the latest documentation index"
-  #       uses: ansys/actions/doc-deploy-index@v6
+  #       uses: ansys/actions/doc-deploy-index@v7
   #       with:
   #         cname: "{{ '${{ env.DOCUMENTATION_CNAME }}' }}/version/{{ '${{ env.VERSION }}' }}"
   #         index-name: "{{ '${{ env.LIBRARY_NAME }}' }}-v{{ '${{ env.VERSION_MEILI }}' }}"
@@ -203,7 +203,7 @@ jobs:
     steps:
       - name: "Release to the private PyPI repository"
         if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
-        uses: ansys/actions/release-pypi-private@v6
+        uses: ansys/actions/release-pypi-private@v7
         with:
           library-name: {{ '${{ env.LIBRARY_NAME }}' }}
           twine-username: "__token__"
@@ -216,7 +216,7 @@ jobs:
   #   steps:
   #     - name: "Release to the public PyPI repository"
   #       if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
-  #       uses: ansys/actions/release-pypi-public@v6
+  #       uses: ansys/actions/release-pypi-public@v7
   #       with:
   #         library-name: {{ '${{ env.DOCUMENTATION_CNAME }}' }}
   #         twine-username: "__token__"
@@ -229,6 +229,6 @@ jobs:
     steps:
       - name: "Release to GitHub"
         if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
-        uses: ansys/actions/release-github@v6
+        uses: ansys/actions/release-github@v7
         with:
           library-name: {{ '${{ env.DOCUMENTATION_CNAME }}' }}
diff --git a/...nsys/templates/python/common/{{cookiecutter.__project_name_slug}}/.pre-commit-config.yaml b/...nsys/templates/python/common/{{cookiecutter.__project_name_slug}}/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 repos:
 
 - repo: https://github.com/psf/black
-  rev: 24.4.2
+  rev: 24.8.0
   hooks:
   - id: black
 
@@ -11,12 +11,12 @@ repos:
   - id: isort
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 7.0.0
+  rev: 7.1.1
   hooks:
   - id: flake8
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.6
+  rev: v2.3.0
   hooks:
   - id: codespell
 
@@ -35,11 +35,11 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.28.2
+  rev: 0.29.1
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/ansys/pre-commit-hooks
-  rev: v0.3.1
+  rev: v0.4.3
   hooks:
   - id: add-license-headers