Skip to content

Commit 9963b8a

Browse files
authored
Merge branch 'main' into fix/upload-nested-dirs
2 parents ad84a20 + f9ce7dd commit 9963b8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+795
-32
lines changed

.github/workflows/ci_cd.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,58 @@ jobs:
526526
docker logs ${{ env.GEO_CONT_NAME }}
527527
docker rm ${{ env.GEO_CONT_NAME }}
528528
529+
testing-min-reqs-tracker:
530+
name: Testing with minimum requirements with tracker
531+
needs: [smoke-tests]
532+
runs-on: ubuntu-latest
533+
env:
534+
ANSRV_GEO_IMAGE_MINREQS: 'ghcr.io/ansys/geometry:core-linux-latest'
535+
strategy:
536+
fail-fast: false
537+
matrix:
538+
python-version: ['3.10', '3.13']
539+
steps:
540+
- name: Set up headless display
541+
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
542+
543+
- name: Login in Github Container registry
544+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
545+
with:
546+
registry: ghcr.io
547+
username: ${{ github.actor }}
548+
password: ${{ secrets.GITHUB_TOKEN }}
549+
550+
- name: Checkout repository
551+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
552+
553+
- name: Setup Python ${{ matrix.python-version }}
554+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
555+
with:
556+
python-version: ${{ matrix.python-version }}
557+
558+
- name: Install minimum requirements with tracker
559+
run: |
560+
python -m pip install --upgrade pip
561+
pip install -e .[all,tests-minimal]
562+
pip install pytest
563+
564+
- name: Start Geometry service and verify start
565+
run: |
566+
docker pull ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
567+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_MINREQS }}
568+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
569+
570+
- name: Run pytest
571+
run: |
572+
pytest -v --use-tracker=yes
573+
574+
- name: Stop the Geometry service
575+
if: always()
576+
run: |
577+
docker stop ${{ env.GEO_CONT_NAME }}
578+
docker logs ${{ env.GEO_CONT_NAME }}
579+
docker rm ${{ env.GEO_CONT_NAME }}
580+
529581
testing-no-graphics:
530582
name: Testing with minimum requirements (no graphics)
531583
needs: [smoke-tests]

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
25+
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
2626
with:
2727
languages: 'python'
2828
config-file: ./.github/codeql-config.yml
2929

3030
- name: Autobuild
31-
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
31+
uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
3232

3333
# If the Autobuild fails above, remove it and uncomment the following three lines.
3434
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
@@ -38,6 +38,6 @@ jobs:
3838
# ./location_of_script_within_repo/buildscript.sh
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
41+
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
4242
with:
4343
category: "/language:python"

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exclude: "tests/integration/files"
77
repos:
88

99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.12.3
10+
rev: v0.12.4
1111
hooks:
1212
- id: ruff-check
1313
- id: ruff-format

doc/changelog.d/2104.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Nurbs sketching and surface support

doc/changelog.d/2108.test.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adding test coverage for modeler, plotting, logger, and parameters

doc/changelog.d/2109.test.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Internalize external documents

doc/changelog.d/2117.dependencies.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump ansys-api-geometry from 0.4.65 to 0.4.66

doc/changelog.d/2118.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Surface body unit test fix

doc/changelog.d/2119.maintenance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump minor version in main

doc/changelog.d/2120.test.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add fixture for running with tracker

0 commit comments

Comments
 (0)