Skip to content

Commit aeab0d5

Browse files
authored
Merge branch 'main' into dependabot/pip/numpy-2.0.0
2 parents 500e8d8 + 25a6a4c commit aeab0d5

31 files changed

+232
-42
lines changed

.github/workflows/ci_cd.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ name: GitHub CI
33
on:
44
pull_request:
55
workflow_dispatch:
6+
inputs:
7+
revn:
8+
type: choice
9+
options:
10+
- '251'
11+
- '242'
12+
- '241'
13+
description: 'The Mechanical revision number to run tests on.'
14+
default: '241' #stable version is 241, must match $stable_container
615
schedule:
716
- cron: '00 22 * * *' # UTC time, may start 5-15 mins later than scheduled time
817
# registry_package:
@@ -15,6 +24,8 @@ on:
1524
- main
1625
- release/*
1726

27+
28+
1829
env:
1930
PYMECHANICAL_PORT: 10000 # default won't work on GitHub runners
2031
PYMECHANICAL_START_INSTANCE: false
@@ -23,9 +34,6 @@ env:
2334
PACKAGE_NAME: ansys-mechanical-core
2435
DOCUMENTATION_CNAME: mechanical.docs.pyansys.com
2536
MAIN_PYTHON_VERSION: '3.10'
26-
# LATEST_STABLE_REVN and its Docker image are used in pull requests
27-
LATEST_STABLE_REVN: '241'
28-
LATEST_STABLE_DOCKER_IMAGE_VERSION: '24.1.0'
2937
# DEV_REVN & its Docker image are used in scheduled or registry package runs
3038
DEV_REVN: '242'
3139
DEV_DOCKER_IMAGE_VERSION: '24.2_candidate'
@@ -109,21 +117,26 @@ jobs:
109117
run: |
110118
if ${{ github.event_name == 'schedule' }}; then
111119
# 242
112-
echo "test_revn=${{ env.DEV_REVN }}" >> $GITHUB_OUTPUT
120+
echo "test_revn=${{ inputs.mech_revn }}" >> $GITHUB_OUTPUT
113121
# ghcr.io/ansys/mechanical:24.2_candidate
114122
echo "test_container=${{ env.DOCKER_PACKAGE }}:${{ env.DEV_DOCKER_IMAGE_VERSION }}" >> $GITHUB_OUTPUT
115123
# 24.2_candidate
116124
echo "test_docker_image_version=${{ env.DEV_DOCKER_IMAGE_VERSION }}" >> $GITHUB_OUTPUT
117125
else
118-
# 241
126+
if [[ -z "${{inputs.revn}}" ]]; then
127+
export mech_revn=241
128+
else
129+
export mech_revn=${{inputs.revn}}
130+
fi
131+
export mech_image_version=${mech_revn:0:2}.${mech_revn:2}.0
119132
echo "test_revn=${{ env.LATEST_STABLE_REVN }}" >> $GITHUB_OUTPUT
120133
# ghcr.io/ansys/mechanical:24.1.0
121-
echo "test_container=${{ env.DOCKER_PACKAGE }}:${{ env.LATEST_STABLE_DOCKER_IMAGE_VERSION }}" >> $GITHUB_OUTPUT
134+
echo "test_container=${{ env.DOCKER_PACKAGE }}:$mech_image_version" >> $GITHUB_OUTPUT
122135
# 24.1.0
123-
echo "test_docker_image_version=${{ env.LATEST_STABLE_DOCKER_IMAGE_VERSION }}" >> $GITHUB_OUTPUT
136+
echo "test_docker_image_version=$mech_image_version" >> $GITHUB_OUTPUT
124137
fi
125138
126-
echo "stable_container=${{ env.DOCKER_PACKAGE }}:${{ env.LATEST_STABLE_DOCKER_IMAGE_VERSION }}" >> $GITHUB_OUTPUT
139+
echo "stable_container=${{ env.DOCKER_PACKAGE }}:24.1.0" >> $GITHUB_OUTPUT
127140
128141
config-matrix:
129142
runs-on: ubuntu-latest

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,13 @@ doc/source/examples/gallery_examples/*/*.rst
197197
doc/source/examples/gallery_examples/*/*.pickle
198198
doc/source/examples/gallery_examples/**/*.png
199199
doc/source/sg_execution_times.rst
200+
# Ignore everything in the doc/source/api/ directory
201+
doc/source/api/*
202+
# This file is for the ansys-tools-path
203+
!doc/source/api/path.rst
204+
205+
# Examples files downloaded when building docs
206+
examples/embedding_n_remote/download/*
200207

201208
# pymechanical-specific
202209
mylocal.ip

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repos:
2222
- id: isort
2323

2424
- repo: https://github.com/PyCQA/flake8
25-
rev: 7.0.0
25+
rev: 7.1.0
2626
hooks:
2727
- id: flake8
2828
additional_dependencies: [flake8-pyproject]
@@ -34,7 +34,7 @@ repos:
3434
args: ["--ignore-words", "doc/styles/config/vocabularies/ANSYS/accept.txt", "-w"]
3535

3636
- repo: https://github.com/ansys/pre-commit-hooks
37-
rev: v0.3.1
37+
rev: v0.3.2
3838
hooks:
3939
- id: add-license-headers
4040
args:
@@ -66,7 +66,7 @@ repos:
6666
- id: check-added-large-files
6767

6868
- repo: https://github.com/python-jsonschema/check-jsonschema
69-
rev: 0.28.4
69+
rev: 0.28.5
7070
hooks:
7171
- id: check-github-workflows
7272

doc/changelog.d/749.changed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/750.changed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/751.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/752.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/753.added.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/755.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/757.added.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)