Merge branch 'main' into feat/driving-dimensions

ansys · Jan 15, 2025 · 82b46b0 · 82b46b0
2 parents 31045e1 + 1481c36
commit 82b46b0
Show file tree

Hide file tree

Showing 169 changed files with 860 additions and 256 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -102,20 +102,71 @@ jobs:
           directory: docker
           recursive: true
 
+  manifests:
+    name: Check Docker manifests
+    runs-on: ubuntu-latest
+    outputs:
+      skip_dms: ${{ steps.services.outputs.skip_dms }}
+      skip_core_windows: ${{ steps.services.outputs.skip_core_windows }}
+      skip_core_linux: ${{ steps.services.outputs.skip_core_linux }}
+    strategy:
+      matrix:
+        include:
+          - container-stable: "windows-latest"
+            container-unstable: "windows-latest-unstable"
+            service: "dms"
+            service-name: "Windows DMS"
+          - container-stable: "core-windows-latest"
+            container-unstable: "core-windows-latest-unstable"
+            service: "core_windows"
+            service-name: "Windows Core Service"
+          - container-stable: "core-linux-latest"
+            container-unstable: "core-linux-latest-unstable"
+            service: "core_linux"
+            service-name: "Linux Core Service"
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check ${{ matrix.service-name }} manifest
+        id: services
+        run: |
+          docker manifest inspect ghcr.io/ansys/geometry:${{ matrix.container-stable }} > ${{ matrix.container-stable }}.json
+          docker manifest inspect ghcr.io/ansys/geometry:${{ matrix.container-unstable }} > ${{ matrix.container-unstable }}.json || true
+
+          # Verify that the unstable manifest exists - otherwise create an empty file
+          if [ ! -f ${{ matrix.container-unstable }}.json ]; then
+            touch ${{ matrix.container-unstable }}.json
+          fi
+
+
+          # Check if the manifests are the same (and if so, create an output that will skip the next job)
+          if diff ${{ matrix.container-stable }}.json ${{ matrix.container-unstable }}.json; then
+            echo "${{ matrix.service-name }} container manifests are the same... skipping"
+            echo "skip_${{ matrix.service }}=1" >> "$GITHUB_OUTPUT"
+          else
+            echo "${{ matrix.service-name }} container manifests are different"
+            echo "skip_${{ matrix.service }}=0" >> "$GITHUB_OUTPUT"
+          fi
+
 # =================================================================================================
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv    RUNNING ON SELF-HOSTED RUNNER    vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 # =================================================================================================
 
   testing-windows:
     name: Testing and coverage (Windows)
-    needs: [smoke-tests]
+    needs: [smoke-tests, manifests]
     # runs-on: [self-hosted, Windows, pygeometry]
     runs-on: # TODO: Waiting for ansys-network runner to be updated
       group: pyansys-self-hosted
       labels:  [self-hosted, Windows, pygeometry]
     continue-on-error: ${{ matrix.experimental }}
     env:
-      SKIP_UNSTABLE: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY == 1 && matrix.experimental }}
+      SKIP_UNSTABLE: false
       PYVISTA_OFF_SCREEN: true
     strategy:
       fail-fast: false
@@ -131,6 +182,30 @@ jobs:
             experimental: true
 
     steps:
+      - name: Calculate SKIP_UNSTABLE
+        if: matrix.experimental
+        run: |
+          # Choose the manifests output to consider (for DMS or Core service)
+          # based on the matrix value
+          if ("${{ matrix.docker-image }}" -eq "windows-latest-unstable") {
+            $ImagesAreEqual = ${{ needs.manifests.outputs.skip_dms }}
+          } elseif ("${{ matrix.docker-image }}" -eq "core-windows-latest-unstable") {
+            $ImagesAreEqual = ${{ needs.manifests.outputs.skip_core_windows }}
+          } else {
+            Write-Output "Unknown docker image"
+            exit 1
+          }
+
+          $A = $env:SKIP_UNSTABLE_CONTAINERS_TEMPORARILY -eq 1
+          $B = $ImagesAreEqual -eq 1
+
+          # Calculate the logical expression
+          $Result = ($A -or $B).ToString().ToLower()
+
+          # Export it as an environment variable with true/false value
+          Write-Output "SKIP_UNSTABLE=$Result" | Out-File -FilePath $env:GITHUB_ENV -Append
+          Write-Output "SKIP_UNSTABLE will be: $Result"
+
       - uses: actions/checkout@v4
         if: env.SKIP_UNSTABLE == 'false'
 
@@ -329,11 +404,11 @@ jobs:
 
   testing-linux:
     name: Testing and coverage (Linux)
-    needs: [smoke-tests]
+    needs: [smoke-tests, manifests]
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental }}
     env:
-      SKIP_UNSTABLE: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY == 1 && matrix.experimental }}
+      SKIP_UNSTABLE: false
     strategy:
       fail-fast: false
       matrix:
@@ -344,6 +419,28 @@ jobs:
             experimental: true
 
     steps:
+      - name: Calculate SKIP_UNSTABLE
+        if: matrix.experimental
+        run: |
+          # Choose the manifests output to consider (for Core service)
+          # based on the matrix value
+          if [[ "${{ matrix.docker-image }}" == "core-linux-latest-unstable" ]]; then
+            ImagesAreEqual=${{ needs.manifests.outputs.skip_core_linux }}
+          else
+            echo "Unknown docker image"
+            exit 1
+          fi
+
+          A=$([[ "$SKIP_UNSTABLE_CONTAINERS_TEMPORARILY" == "1" ]] && echo true || echo false)
+          B=$([[ "$ImagesAreEqual" == "1" ]] && echo true || echo false)
+
+          # Calculate the logical expression
+          Result=$([[ "$A" == true || "$B" == true ]] && echo true || echo false)
+
+          # Export it as an environment variable with true/false value
+          echo "SKIP_UNSTABLE=$Result" >> $GITHUB_ENV
+          echo "SKIP_UNSTABLE will be: $Result"
+
       - name: Login in Github Container registry
         if: env.SKIP_UNSTABLE == 'false'
         uses: docker/login-action@v3

diff --git a/.github/workflows/docker_cleanup.yml b/.github/workflows/docker_cleanup.yml
@@ -26,4 +26,4 @@ jobs:
       with:
         package-name: 'geometry'
         token: ${{ secrets.GITHUB_TOKEN }}
-        tags-kept: 'windows-latest, windows-latest-unstable, core-windows-latest, core-windows-latest-unstable, core-linux-latest, core-linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, windows-25.2, core-windows-25.2, linux-24.1, linux-24.2, linux-25.1, core-linux-25.2'
+        tags-kept: 'windows-latest, windows-latest-unstable, core-windows-latest, core-windows-latest-unstable, core-linux-latest, core-linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, windows-25.2, core-windows-25.2, core-linux-25.2'
diff --git a/.github/workflows/nightly_docker_test.yml b/.github/workflows/nightly_docker_test.yml
@@ -1,4 +1,4 @@
-name: Nightly Server test - Latest build
+name: Unstable build tests and promotion
 on:
   workflow_dispatch:
     inputs:
@@ -35,13 +35,65 @@ concurrency:
 
 jobs:
 
+  manifests:
+    name: Check Docker manifests
+    runs-on: ubuntu-latest
+    outputs:
+      skip_dms: ${{ steps.services.outputs.skip_dms }}
+      skip_core_windows: ${{ steps.services.outputs.skip_core_windows }}
+      skip_core_linux: ${{ steps.services.outputs.skip_core_linux }}
+    strategy:
+      matrix:
+        include:
+          - container-stable: "windows-latest"
+            container-unstable: "windows-latest-unstable"
+            service: "dms"
+            service-name: "Windows DMS"
+          - container-stable: "core-windows-latest"
+            container-unstable: "core-windows-latest-unstable"
+            service: "core_windows"
+            service-name: "Windows Core Service"
+          - container-stable: "core-linux-latest"
+            container-unstable: "core-linux-latest-unstable"
+            service: "core_linux"
+            service-name: "Linux Core Service"
+    steps:
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check ${{ matrix.service-name }} manifest
+        id: services
+        run: |
+          docker manifest inspect ghcr.io/ansys/geometry:${{ matrix.container-stable }} > ${{ matrix.container-stable }}.json
+          docker manifest inspect ghcr.io/ansys/geometry:${{ matrix.container-unstable }} > ${{ matrix.container-unstable }}.json || true
+
+          # Verify that the unstable manifest exists - otherwise create an empty file
+          if [ ! -f ${{ matrix.container-unstable }}.json ]; then
+            touch ${{ matrix.container-unstable }}.json
+          fi
+
+
+          # Check if the manifests are the same (and if so, create an output that will skip the next job)
+          if diff ${{ matrix.container-stable }}.json ${{ matrix.container-unstable }}.json; then
+            echo "${{ matrix.service-name }} container manifests are the same... skipping"
+            echo "skip_${{ matrix.service }}=1" >> "$GITHUB_OUTPUT"
+          else
+            echo "${{ matrix.service-name }} container manifests are different"
+            echo "skip_${{ matrix.service }}=0" >> "$GITHUB_OUTPUT"
+          fi
+
 # =================================================================================================
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    RUNNING ON SELF-HOSTED RUNNER    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 # =================================================================================================
 
   windows-dms-tests:
-    name: Nightly unstable testing - Windows DMS
-    if: vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY != 1
+    name: Windows DMS
+    needs: manifests
+    if: needs.manifests.outputs.skip_dms == 0
     runs-on: [self-hosted, Windows, pygeometry]
     env:
       PYVISTA_OFF_SCREEN: true
@@ -127,12 +179,12 @@ jobs:
             {
               "@type": "MessageCard",
               "@context": "http://schema.org/extensions",
-              "summary": "Nightly Tests for Windows DMS failing",
+              "summary": "Unstable build tests for Windows DMS failing",
               "themeColor": "f44336",
-              "title": "PyAnsys Geometry Nightly Tests - Windows DMS failing",
+              "title": "PyAnsys Geometry unstable build tests - Windows DMS failing",
               "sections": [
                 {
-                  "activityTitle": "Windows DMS nightly tests are failing",
+                  "activityTitle": "Windows DMS unstable build tests are failing",
                   "activitySubtitle": "Check the run for more details: https://github.com/ansys/pyansys-geometry/actions/runs/${{ github.run_id }}",
                   "facts": [
                     {
@@ -145,8 +197,9 @@ jobs:
             }
 
   windows-core-tests:
-    name: Nightly unstable testing - Windows Core Service
-    if: vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY != 1
+    name: Windows Core Service
+    needs: manifests
+    if: needs.manifests.outputs.skip_core_windows == 0
     # runs-on: [self-hosted, Windows, pygeometry]
     runs-on: # TODO: Waiting for ansys-network runner to be updated
       group: pyansys-self-hosted
@@ -235,12 +288,12 @@ jobs:
             {
               "@type": "MessageCard",
               "@context": "http://schema.org/extensions",
-              "summary": "Nightly Tests for Windows Core Service failing",
+              "summary": "Unstable build tests for Windows Core Service failing",
               "themeColor": "f44336",
-              "title": "PyAnsys Geometry Nightly Tests - Windows Core Service failing",
+              "title": "PyAnsys Geometry unstable build tests - Windows Core Service failing",
               "sections": [
                 {
-                  "activityTitle": "Windows Core Service nightly tests are failing",
+                  "activityTitle": "Windows Core Service unstable build tests are failing",
                   "activitySubtitle": "Check the run for more details: https://github.com/ansys/pyansys-geometry/actions/runs/${{ github.run_id }}",
                   "facts": [
                     {
@@ -258,8 +311,9 @@ jobs:
 # =================================================================================================
 
   linux-tests:
-    name: Nightly unstable testing - Linux
-    if: vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY != 1
+    name: Linux Core Service
+    needs: manifests
+    if: needs.manifests.outputs.skip_core_linux == 0
     runs-on: ubuntu-latest
 
     steps:
@@ -300,12 +354,12 @@ jobs:
             {
               "@type": "MessageCard",
               "@context": "http://schema.org/extensions",
-              "summary": "Nightly Tests for Linux failing",
+              "summary": "Unstable build tests for Linux Core Service failing",
               "themeColor": "f44336",
-              "title": "PyAnsys Geometry Nightly Tests - Linux failing",
+              "title": "PyAnsys Geometry unstable build tests - Linux Core Service failing",
               "sections": [
                 {
-                  "activityTitle": "Linux nightly tests are failing",
+                  "activityTitle": "Linux Core Service unstable build tests are failing",
                   "activitySubtitle": "Check the run for more details: https://github.com/ansys/pyansys-geometry/actions/runs/${{ github.run_id }}",
                   "facts": [
                     {
@@ -318,9 +372,9 @@ jobs:
             }
 
   promote-windows-dms:
-    needs: [windows-dms-tests, windows-core-tests, linux-tests]
+    needs: windows-dms-tests
     runs-on: windows-latest
-    name: Promote Windows container
+    name: Promote Windows DMS container
     if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
     env:
       WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
@@ -343,9 +397,9 @@ jobs:
         run: docker push ${{ env.WINDOWS_STABLE_GHCR }}
 
   promote-windows-core:
-    needs: [windows-dms-tests, windows-core-tests, linux-tests]
+    needs: windows-core-tests
     runs-on: windows-latest
-    name: Promote Windows container
+    name: Promote Windows Core Service container
     if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
     env:
       WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:core-windows-latest-unstable
@@ -368,9 +422,9 @@ jobs:
         run: docker push ${{ env.WINDOWS_STABLE_GHCR }}
 
   promote-linux:
-    needs: [windows-dms-tests, windows-core-tests, linux-tests]
+    needs: linux-tests
     runs-on: ubuntu-latest
-    name: Promote Linux container
+    name: Promote Linux Core Service container
     if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
     env:
       LINUX_UNSTABLE: ghcr.io/ansys/geometry:core-linux-latest-unstable

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ exclude: "tests/integration/files"
 repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.2
+  rev: v0.9.1
   hooks:
     - id: ruff
     - id: ruff-format
@@ -35,7 +35,7 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.30.0
+  rev: 0.31.0
   hooks:
     - id: check-github-workflows
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
+Copyright (c) 2023 - 2025 ANSYS, Inc. and/or its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/SECURITY.md b/SECURITY.md
@@ -36,5 +36,15 @@ SOFTWARE.
 
 ## Reporting a Vulnerability
 
+> [!CAUTION]
+> Please do not report any security vulnerabilities through GitHub issues.
+
 If you detect a vulnerability, contact the [PyAnsys Core team](mailto:[email protected])
 mentioning the repository and the details of your finding. The team will address it as soon as possible.
+
+Please provide us with the following information:
+
+- Any specific configuration settings needed to reproduce the problem
+- Step-by-step guidance to reproduce the problem
+- The exact location of the problematic source code, including tag, branch, commit, or a direct URL
+- The potential consequences of the vulnerability, along with a description of how an attacker could take advantage of the issue
diff --git a/doc/changelog.d/1495.added.md b/doc/changelog.d/1495.added.md
@@ -0,0 +1 @@
+add chamfer tool
diff --git a/doc/changelog.d/1580.added.md b/doc/changelog.d/1580.added.md
@@ -0,0 +1 @@
+enable (partially) prepare and repair tools in Core Service
diff --git a/doc/changelog.d/1586.dependencies.md b/doc/changelog.d/1586.dependencies.md
@@ -0,0 +1 @@
+bump ansys-tools-visualization-interface from 0.6.1 to 0.6.2
diff --git a/doc/changelog.d/1587.added.md b/doc/changelog.d/1587.added.md
@@ -0,0 +1 @@
+create launcher for core services
diff --git a/doc/changelog.d/1588.maintenance.md b/doc/changelog.d/1588.maintenance.md
@@ -0,0 +1 @@
+pre-commit automatic update
diff --git a/doc/changelog.d/1589.dependencies.md b/doc/changelog.d/1589.dependencies.md
@@ -0,0 +1 @@
+avoid the usage of attrs 24.3.0 (temporary)
diff --git a/doc/changelog.d/1590.dependencies.md b/doc/changelog.d/1590.dependencies.md
@@ -0,0 +1 @@
+bump jupytext from 1.16.4 to 1.16.5 in the docs-deps group
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		enable (partially) prepare and repair tools in Core Service
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		bump ansys-tools-visualization-interface from 0.6.1 to 0.6.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		bump jupytext from 1.16.4 to 1.16.5 in the docs-deps group