Skip to content

Commit 239ea05

Browse files
RobPasMueRobPasMue
authored
Merge branch 'main' into feat/-implement-import-rules
2 parents 41d24ad + 7730a78 commit 239ea05

File tree

14 files changed

+364
-363
lines changed

14 files changed

+364
-363
lines changed

‎.github/dependabot.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ updates:
55
schedule:
66
interval: "daily"
77
cooldown:
8-
default-days: 5 # Fallback cooldown if no specific rule applies
9-
semver-major-days: 30 # Cooldown for major version updates
10-
semver-minor-days: 7 # Cooldown for minor version updates
11-
semver-patch-days: 3 # Cooldown for patch updates
8+
default-days: 5 # Fallback cooldown if no specific rule applies
9+
semver-major-days: 30 # Cooldown for major version updates
10+
semver-minor-days: 7 # Cooldown for minor version updates
11+
semver-patch-days: 3 # Cooldown for patch updates
1212
exclude:
1313
- "ansys-api-geometry"
1414
- "ansys-platform-instancemanagement"
@@ -23,43 +23,43 @@ updates:
2323
commit-message:
2424
prefix: "build"
2525
groups:
26-
grpc-deps:
27-
patterns:
28-
- "grpc*"
29-
- "protobuf"
30-
docs-deps:
31-
patterns:
32-
- "ansys-sphinx-theme*"
33-
- "ipyvtklink"
34-
- "jupyter_sphinx"
35-
- "jupytext"
36-
- "myst-parser"
37-
- "nbconvert"
38-
- "nbsphinx"
39-
- "notebook"
40-
- "numpydoc"
41-
- "sphinx"
42-
- "sphinx*"
26+
grpc-deps:
27+
patterns:
28+
- "grpc*"
29+
- "protobuf"
30+
docs-deps:
31+
patterns:
32+
- "ansys-sphinx-theme*"
33+
- "ipyvtklink"
34+
- "jupyter_sphinx"
35+
- "jupytext"
36+
- "myst-parser"
37+
- "nbconvert"
38+
- "nbsphinx"
39+
- "notebook"
40+
- "numpydoc"
41+
- "sphinx"
42+
- "sphinx*"
4343

4444
- package-ecosystem: "github-actions"
4545
directory: "/"
4646
schedule:
4747
interval: "daily"
48-
# TODO: This should be activated once it's supported
49-
# cooldown:
50-
# default-days: 5 # Fallback cooldown if no specific rule applies
51-
# semver-major-days: 30 # Cooldown for major version updates
52-
# semver-minor-days: 7 # Cooldown for minor version updates
53-
# semver-patch-days: 3 # Cooldown for patch updates
54-
# exclude:
55-
# - "ansys/actions/*"
48+
# TODO: This should be activated once it's supported
49+
# cooldown:
50+
# default-days: 5 # Fallback cooldown if no specific rule applies
51+
# semver-major-days: 30 # Cooldown for major version updates
52+
# semver-minor-days: 7 # Cooldown for minor version updates
53+
# semver-patch-days: 3 # Cooldown for patch updates
54+
# exclude:
55+
# - "ansys/actions/*"
5656
labels:
5757
- "maintenance"
5858
assignees:
5959
- "pyansys-ci-bot"
6060
commit-message:
6161
prefix: "ci"
6262
groups:
63-
actions:
64-
patterns:
65-
- "*"
63+
actions:
64+
patterns:
65+
- "*"

‎.github/labeler.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
documentation:
2-
- changed-files:
3-
- any-glob-to-any-file: 'doc/source/**/*'
4-
- any-glob-to-any-file: 'README.rst'
2+
- changed-files:
3+
- any-glob-to-any-file: 'doc/source/**/*'
4+
- any-glob-to-any-file: 'README.rst'
55
maintenance:
6-
- changed-files:
7-
- any-glob-to-any-file: '.github/**/*'
8-
- any-glob-to-any-file: 'pyproject.toml'
6+
- changed-files:
7+
- any-glob-to-any-file: '.github/**/*'
8+
- any-glob-to-any-file: 'pyproject.toml'
99
testing:
10-
- changed-files:
11-
- any-glob-to-any-file: 'tests/*'
10+
- changed-files:
11+
- any-glob-to-any-file: 'tests/*'

‎.github/workflows/backwards_compatibility.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
.\.venv\Scripts\Activate.ps1
6868
python -m pip install --upgrade pip
6969
pip install --upgrade build wheel
70-
pip install .[tests]
70+
pip install . --group tests
7171
7272
- name: Login to GitHub Container Registry
7373
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -87,7 +87,7 @@ jobs:
8787
if: runner.name == 'pygeometry-ci-2'
8888
env:
8989
LICENSE_SERVER_INTERNAL: ${{ secrets.LICENSE_SERVER_INTERNAL }}
90-
run:
90+
run: |
9191
echo "ANSRV_GEO_LICENSE_SERVER=$env:LICENSE_SERVER_INTERNAL" | Out-File -FilePath $env:GITHUB_ENV -Append
9292
9393
- name: Stop any running containers
@@ -121,7 +121,7 @@ jobs:
121121
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
122122
123123
- name: Testing
124-
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
124+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
125125
env:
126126
BACKEND_VERSION: ${{ matrix.backend-version }}
127127
run: |
@@ -151,10 +151,9 @@ jobs:
151151
docker rm $dockerContainers
152152
}
153153
154-
# =================================================================================================
155-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
156-
# =================================================================================================
157-
154+
# =================================================================================================
155+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
156+
# =================================================================================================
158157

159158
testing-backwards-compatibility-windows:
160159
name: Windows ${{ matrix.backend-version }}
@@ -190,7 +189,7 @@ jobs:
190189
run: |
191190
python -m pip install --upgrade pip
192191
pip install --upgrade build wheel
193-
pip install -e .[tests]
192+
pip install -e . --group tests
194193
195194
- name: Download Geometry service container (if needed)
196195
env:
@@ -214,7 +213,7 @@ jobs:
214213
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
215214
216215
- name: Testing
217-
timeout-minutes: 20 # Sometimes hangs...
216+
timeout-minutes: 20 # Sometimes hangs...
218217
env:
219218
BACKEND_VERSION: ${{ matrix.backend-version }}
220219
run: |

‎.github/workflows/ci_cd.yml‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: PyAnsys documentation style checks
8383
uses: ansys/actions/doc-style@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
8484
with:
85-
token: ${{ secrets.GITHUB_TOKEN }}
85+
token: ${{ secrets.GITHUB_TOKEN }}
8686

8787
smoke-tests:
8888
name: Build and Smoke tests
@@ -157,7 +157,6 @@ jobs:
157157
touch ${CONTAINER_UNSTABLE}.json
158158
fi
159159
160-
161160
# Check if the manifests are the same (and if so, create an output that will skip the next job)
162161
if diff ${CONTAINER_STABLE}.json ${CONTAINER_UNSTABLE}.json; then
163162
echo "${SERVICE_NAME} container manifests are the same... skipping"
@@ -229,7 +228,7 @@ jobs:
229228
run: |
230229
python -m pip install --upgrade pip
231230
pip install --upgrade build wheel
232-
pip install -e .[tests]
231+
pip install -e . --group tests
233232
234233
- name: Login to GitHub Container Registry
235234
if: env.SKIP_UNSTABLE == 'false'
@@ -269,11 +268,11 @@ jobs:
269268
path: .\tests\integration\image_cache
270269
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
271270
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
272-
lookup-only: false # zizmor: ignore[cache-poisoning]
271+
lookup-only: false # zizmor: ignore[cache-poisoning]
273272

274273
- name: Testing
275274
if: env.SKIP_UNSTABLE == 'false'
276-
timeout-minutes: 20 # Sometimes hangs...
275+
timeout-minutes: 20 # Sometimes hangs...
277276
run: |
278277
pytest -v
279278
@@ -350,6 +349,7 @@ jobs:
350349
needs-quarto: true
351350
dependencies: 'pandoc'
352351
sphinxopts: '-j 1 -W --color'
352+
group-dependencies-name: "doc"
353353

354354
- name: Stop the Geometry service
355355
if: always()
@@ -380,7 +380,7 @@ jobs:
380380
env:
381381
DOCKER_IMAGE: ${{ matrix.docker-image }}
382382
SKIP_CORE_LINUX: ${{ needs.manifests.outputs.skip_core_linux }}
383-
VARS_SKIP_UNSTABLE_CONTAINERS_TEMPORARILY: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY }}
383+
VARS_SKIP_UNSTABLE_CONTAINERS_TEMPORARILY: ${{ vars.SKIP_UNSTABLE_CONTAINERS_TEMPORARILY}}
384384
run: |
385385
# Choose the manifests output to consider (for Core service)
386386
# based on the matrix value
@@ -436,7 +436,7 @@ jobs:
436436
path: tests/integration/image_cache
437437
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
438438
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
439-
lookup-only: false # zizmor: ignore[cache-poisoning]
439+
lookup-only: false # zizmor: ignore[cache-poisoning]
440440

441441
- name: Run pytest
442442
if: env.SKIP_UNSTABLE == 'false'
@@ -447,6 +447,7 @@ jobs:
447447
python-version: ${{ env.MAIN_PYTHON_VERSION }}
448448
checkout: false
449449
randomize: true
450+
group-dependencies-name: "tests"
450451

451452
- name: Upload coverage to Codecov
452453
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
@@ -516,8 +517,7 @@ jobs:
516517
- name: Install minimum requirements
517518
run: |
518519
python -m pip install --upgrade pip
519-
pip install -e .[all,tests-minimal]
520-
pip install pytest
520+
pip install -e .[all] --group tests-minimal
521521
522522
- name: Start Geometry service and verify start
523523
env:
@@ -569,7 +569,7 @@ jobs:
569569
- name: Install minimum requirements
570570
run: |
571571
python -m pip install --upgrade pip
572-
pip install -e .[tests-minimal]
572+
pip install -e . --group tests-minimal
573573
# Uninstall pytest-pyvista (not needed for these tests)
574574
pip uninstall -y pytest-pyvista
575575
# Installing docker (needed for the tests)
@@ -610,9 +610,9 @@ jobs:
610610
python-version: ${{ env.MAIN_PYTHON_VERSION }}
611611
attest-provenance: true
612612

613-
# =================================================================================================
614-
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv RUNNING ON SELF-HOSTED RUNNER vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
615-
# =================================================================================================
613+
# =================================================================================================
614+
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv RUNNING ON SELF-HOSTED RUNNER vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
615+
# =================================================================================================
616616

617617
fetch-release-artifacts:
618618
name: Fetch release artifacts
@@ -734,23 +734,23 @@ jobs:
734734
if: runner.name == 'pygeometry-ci-2'
735735
env:
736736
LICENSE_SERVER_INTERNAL: ${{ secrets.LICENSE_SERVER_INTERNAL }}
737-
run:
737+
run: |
738738
echo "ANSRV_GEO_LICENSE_SERVER=$env:LICENSE_SERVER_INTERNAL" | Out-File -FilePath $env:GITHUB_ENV -Append
739739
740740
- name: Validate connection using PyAnsys Geometry
741741
run: |
742742
python -m venv .venv
743743
.\.venv\Scripts\Activate.ps1
744744
python -m pip install --upgrade pip
745-
pip install -e .[tests]
745+
pip install -e . --group tests
746746
747747
- name: Restore images cache
748748
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
749749
with:
750750
path: .\tests\integration\image_cache
751751
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
752752
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
753-
lookup-only: false # zizmor: ignore[cache-poisoning]
753+
lookup-only: false # zizmor: ignore[cache-poisoning]
754754

755755
- name: Start Geometry service and verify start
756756
env:
@@ -767,7 +767,7 @@ jobs:
767767
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
768768
769769
- name: Testing
770-
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
770+
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
771771
run: |
772772
.\.venv\Scripts\Activate.ps1
773773
pytest -v --use-existing-service=yes
@@ -807,9 +807,9 @@ jobs:
807807
docker image rm ghcr.io/ansys/geometry:windows-tmp
808808
docker system prune -f
809809
810-
# =================================================================================================
811-
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
812-
# =================================================================================================
810+
# =================================================================================================
811+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUNNING ON SELF-HOSTED RUNNER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
812+
# =================================================================================================
813813

814814
build-linux-container:
815815
name: Building Geometry Service - Linux
@@ -843,7 +843,7 @@ jobs:
843843
- name: Validate connection using PyAnsys Geometry
844844
run: |
845845
python -m pip install --upgrade pip
846-
pip install -e .[tests]
846+
pip install -e . --group tests
847847
848848
- name: Start Geometry service and verify start
849849
env:
@@ -858,7 +858,7 @@ jobs:
858858
path: .\tests\integration\image_cache
859859
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
860860
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
861-
lookup-only: false # zizmor: ignore[cache-poisoning]
861+
lookup-only: false # zizmor: ignore[cache-poisoning]
862862

863863
- name: Run pytest
864864
uses: ansys/actions/tests-pytest@c2fa7c93f6883114e0e643599431b33d29f0b13f # v10.1.4
@@ -869,6 +869,7 @@ jobs:
869869
pytest-extra-args: "--use-existing-service=yes"
870870
checkout: false
871871
randomize: true
872+
group-dependencies-name: "tests"
872873

873874
- name: "Compressing Linux Dockerfile"
874875
uses: vimtor/action-zip@1379ea20d4c5705669ba81fd626dd01b1c738f26 # v1.2

0 commit comments

Comments
 (0)