Skip to content

Commit b790d53

Browse files
committed
Merge branch 'main' into release/0.10
2 parents 229f259 + d632f25 commit b790d53

Some content is hidden

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

42 files changed

+4994
-95
lines changed

.github/workflows/ci_cd.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: PyAnsys code style checks
31-
uses: ansys/actions/code-style@v9.0
31+
uses: ansys/actions/code-style@v10
3232
with:
3333
python-version: ${{ env.MAIN_PYTHON_VERSION }}
3434
show-diff-on-failure: false
@@ -43,31 +43,38 @@ jobs:
4343
# token: ${{ secrets.GITHUB_TOKEN }}
4444

4545
smoketest:
46-
name: Build and smoke tests
46+
name: Smoke test
4747
runs-on: ${{ matrix.os }}
48-
needs: [ style ]
4948
strategy:
5049
fail-fast: false
5150
matrix:
5251
os: [ ubuntu-latest, windows-latest ]
5352
python-version: [ '3.10', '3.11', '3.12', '3.13' ]
53+
5454
steps:
55+
- name: Checkout code
56+
uses: actions/checkout@v4
57+
58+
- name: Set up Python
59+
uses: actions/setup-python@v5
60+
with:
61+
python-version: ${{ matrix.python-version }}
62+
5563
- name: Build wheelhouse
56-
uses: ansys/actions/build-wheelhouse@v9.0
64+
uses: ansys/actions/build-wheelhouse@v10
5765
with:
5866
library-name: ${{ env.PACKAGE_NAME }}
5967
operating-system: ${{ matrix.os }}
6068
python-version: ${{ matrix.python-version }}
6169

62-
- name: Install library
63-
run: python --version && python -m pip install ${{ env.install_target }}
70+
- name: Install from wheelhouse
71+
run: python -m pip install --no-index --find-links=wheelhouse ${{ env.PACKAGE_NAME }}
6472

6573
- name: Run smoketest
6674
run: make smoketest
6775

6876
test:
6977
name: Testing
70-
needs: [ smoketest ]
7178
runs-on: ${{ matrix.os }}
7279
strategy:
7380
matrix:
@@ -112,10 +119,10 @@ jobs:
112119
docs:
113120
name: Build docs
114121
runs-on: ubuntu-latest
115-
# needs: [docs-style]
122+
# needs: [docs-style]
116123
steps:
117124
- name: Run Ansys documentation building action
118-
uses: ansys/actions/doc-build@v9.0
125+
uses: ansys/actions/doc-build@v10
119126
with:
120127
python-version: ${{ env.MAIN_PYTHON_VERSION }}
121128
check-links: false
@@ -127,7 +134,7 @@ jobs:
127134
runs-on: ubuntu-latest
128135
steps:
129136
- name: Build library source and wheel artifacts
130-
uses: ansys/actions/build-library@v9.0
137+
uses: ansys/actions/build-library@v10
131138
with:
132139
library-name: ${{ env.PACKAGE_NAME }}
133140
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -170,7 +177,7 @@ jobs:
170177
needs: [ docs, package ]
171178
steps:
172179
- name: Deploy the latest documentation
173-
uses: ansys/actions/doc-deploy-dev@v9.0
180+
uses: ansys/actions/doc-deploy-dev@v10
174181
if: ${{ !env.ACT }}
175182
with:
176183
cname: ${{ env.DOCUMENTATION_CNAME }}
@@ -185,15 +192,15 @@ jobs:
185192
needs: [ docs, release ]
186193
steps:
187194
- name: Deploy the stable documentation
188-
uses: ansys/actions/doc-deploy-stable@v9.0
195+
uses: ansys/actions/doc-deploy-stable@v10
189196
if: ${{ !env.ACT }}
190197
with:
191198
cname: ${{ env.DOCUMENTATION_CNAME }}
192199
token: ${{ secrets.GITHUB_TOKEN }}
193200
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
194201
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
195202

196-
build-failure:
203+
ci-failure:
197204
name: Teams notify on failure
198205
if: failure() && (github.event_name == 'pull_request' || github.ref == 'refs/heads/main' || github.ref_type == 'tag')
199206
needs: [ package ]

.github/workflows/docs.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Release Docs
2+
3+
on:
4+
workflow_dispatch:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
10+
env:
11+
DOCUMENTATION_CNAME: 'dynamicreporting.docs.pyansys.com'
12+
MAIN_PYTHON_VERSION: '3.13'
13+
PACKAGE_NAME: 'ansys-dynamicreporting-core'
14+
PACKAGE_NAMESPACE: 'ansys.dynamicreporting.core'
15+
16+
jobs:
17+
docs:
18+
name: Build docs
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Run Ansys documentation building action
22+
uses: ansys/actions/doc-build@v10
23+
with:
24+
python-version: ${{ env.MAIN_PYTHON_VERSION }}
25+
check-links: false
26+
sphinxopts: '-j auto'
27+
28+
upload_docs_release:
29+
name: Upload release documentation
30+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
31+
runs-on: ubuntu-latest
32+
needs: [ docs ]
33+
steps:
34+
- name: Deploy the stable documentation
35+
uses: ansys/actions/doc-deploy-stable@v10
36+
if: ${{ !env.ACT }}
37+
with:
38+
cname: ${{ env.DOCUMENTATION_CNAME }}
39+
token: ${{ secrets.GITHUB_TOKEN }}
40+
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
41+
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
42+
43+
ci-failure:
44+
name: Teams notify on failure
45+
if: failure() && (github.event_name == 'pull_request' || github.ref == 'refs/heads/main' || github.ref_type == 'tag')
46+
needs: [ docs, upload_docs_release ]
47+
runs-on: ubuntu-latest
48+
steps:
49+
- uses: actions/checkout@v4
50+
- name: Microsoft Teams Notification
51+
uses: jdcargile/[email protected]
52+
with:
53+
github-token: ${{ github.token }}
54+
ms-teams-webhook-uri: ${{ secrets.MS_TEAMS_WEBHOOK_URI_CI }}
55+
notification-summary: Release documentation build failure
56+
notification-color: dc3545
57+
timezone: America/New_York

.github/workflows/nightly-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Run Ansys documentation building action
22-
uses: ansys/actions/doc-build@v8
22+
uses: ansys/actions/doc-build@v10
2323
with:
2424
python-version: ${{ env.MAIN_PYTHON_VERSION }}
2525
check-links: false
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Deploy development documentation
33-
uses: ansys/actions/doc-deploy-dev@v8
33+
uses: ansys/actions/doc-deploy-dev@v10
3434
with:
3535
cname: ${{ env.DOCUMENTATION_CNAME }}
3636
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Build library source and wheel artifacts
54-
uses: ansys/actions/build-library@v8
54+
uses: ansys/actions/build-library@v10
5555
with:
5656
library-name: ${{ env.PACKAGE_NAME }}
5757
python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -69,7 +69,7 @@ jobs:
6969
TWINE_PASSWORD: ${{ secrets.PYANSYS_PYPI_PRIVATE_PAT }}
7070
TWINE_REPOSITORY_URL: ${{ secrets.PRIVATE_PYPI_URL }}
7171

72-
build-failure:
72+
ci-failure:
7373
name: Teams notify on failure
7474
if: failure()
7575
needs: [ nightly_and_upload ]

CONTRIBUTORS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
* [JennaPaikowsky](https://github.com/JennaPaikowsky)
1313
* [Kathy Pippert](https://github.com/PipKat)
1414
* [Mario Ostieri](https://github.com/mariostieriansys)
15+
* [Om Patel](https://github.com/ompat5)
1516
* [Phillip Chen](https://github.com/phchen95)
1617
* [Randy Frank](https://github.com/randallfrank)
18+
* [Revathy Venugopal](https://github.com/Revathyvenugopal162)
1719
* [Roberto Pastor Muela](https://github.com/RobPasMue)
1820
* [Visesh Rajendraprasad](https://github.com/viseshrp)
1921
* [Yuanrui Zhang](https://github.com/zhang-yuanrui)

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,10 @@ clean:
5252
test_clean:
5353
python test_cleanup.py
5454

55-
all: clean build install
55+
docs:
56+
$(MAKE) -C doc html
57+
58+
docs-clean:
59+
$(MAKE) -C doc clean
60+
61+
all: clean build install

codegen/all_test_prop.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

codegen/pyadritem.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Item:
114114
def url(self):
115115
"""URL corresponding to the item"""
116116
if self.serverobj.get_URL() is not None and self.item.guid is not None:
117-
self._url = self.serverobj.get_URL() + "/reports/report_display/?usemenus=off&query=A%7Ci_guid%7C%eq%7C"
117+
self._url = self.serverobj.get_URL() + "/reports/report_display/?usemenus=off&query=A%7Ci_guid%7Ceq%7C"
118118
self._url += str(self.item.guid)
119119
else:
120120
self._url = None
File renamed without changes.

0 commit comments

Comments
 (0)