Skip to content

Commit d661e1a

Browse files
committed
Merge branch 'main' into release/0.6
2 parents 281deb7 + 9acf705 commit d661e1a

File tree

14 files changed

+500
-160
lines changed

14 files changed

+500
-160
lines changed

.github/workflows/ci_cd.yml

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -267,28 +267,9 @@ jobs:
267267
group: pyansys-self-hosted
268268
labels: [Windows, pygeometry]
269269
steps:
270-
- uses: actions/checkout@v4
271-
272-
- name: Set up Python
273-
uses: actions/setup-python@v5
274-
with:
275-
python-version: ${{ env.MAIN_PYTHON_VERSION }}
276-
277270
- name: Set up headless display
278271
uses: pyvista/setup-headless-display-action@v2
279272

280-
- name: Create Python venv
281-
run: |
282-
python -m venv .venv
283-
.\.venv\Scripts\Activate.ps1
284-
285-
- name: Install packages for documentation build
286-
run: |
287-
.\.venv\Scripts\Activate.ps1
288-
python -m pip install --upgrade pip
289-
pip install --upgrade build wheel
290-
pip install .[doc]
291-
292273
- name: Login to GitHub Container Registry
293274
uses: docker/login-action@v3
294275
with:
@@ -304,43 +285,14 @@ jobs:
304285
run:
305286
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
306287

307-
- name: Start Geometry service and verify start
308-
run: |
309-
.\.venv\Scripts\Activate.ps1
310-
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_WINDOWS_TAG }}
311-
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
312-
313-
- name: Build the documentation (HTML)
314-
run: |
315-
.\.venv\Scripts\Activate.ps1
316-
cd doc
317-
.\make.bat html
318-
319-
- name: Build the documentation (PDF)
320-
run: |
321-
.\.venv\Scripts\Activate.ps1
322-
cd doc
323-
.\make.bat pdf
324-
325-
- name: Add assets to HTML docs
326-
run: |
327-
zip -r documentation-html.zip .\doc\_build\html
328-
mv documentation-html.zip .\doc\_build\html\_static\assets\download\
329-
cp doc/_build/latex/ansys-geometry-core.pdf .\doc\_build\html\_static\assets\download\
288+
- name: Start Geometry service
289+
run: 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_WINDOWS_TAG }}
330290

331-
- name: Upload HTML documentation
332-
uses: actions/upload-artifact@v4
291+
- name: Run Ansys documentation building action
292+
uses: ansys/actions/doc-build@v6
333293
with:
334-
name: documentation-html
335-
path: doc/_build/html
336-
retention-days: 7
337-
338-
- name: Upload PDF documentation
339-
uses: actions/upload-artifact@v4
340-
with:
341-
name: documentation-pdf
342-
path: doc/_build/latex/ansys-geometry-core*.pdf
343-
retention-days: 7
294+
python-version: ${{ env.MAIN_PYTHON_VERSION }}
295+
add-pdf-html-docs-as-assets: true
344296

345297
- name: Stop the Geometry service
346298
if: always()

doc/changelog.d/1256.changed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore: update CHANGELOG for v0.6.1

doc/changelog.d/1257.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix: Rename built in shadowing variables

doc/changelog.d/1260.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
feat: deprecating log_level and logs_folder + adding client log control

doc/changelog.d/1261.added.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
feat: adding deprecation support for args and methods

doc/changelog.d/1262.changed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ci: simplify doc build using ansys/actions

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
dependencies = [
2727
"ansys-api-geometry==0.4.4",
2828
"ansys-tools-path>=0.3,<1",
29-
"ansys-tools-visualization-interface>=0.2.4,<1",
29+
"ansys-tools-visualization-interface>=0.2.6,<1",
3030
"beartype>=0.11.0,<0.19",
3131
"grpcio>=1.35.0,<2",
3232
"grpcio-health-checking>=1.45.0,<2",
@@ -50,7 +50,7 @@ all = [
5050
tests = [
5151
"ansys-platform-instancemanagement==1.1.2",
5252
"ansys-tools-path==0.6.0",
53-
"ansys-tools-visualization-interface==0.2.4",
53+
"ansys-tools-visualization-interface==0.2.6",
5454
"beartype==0.18.5",
5555
"docker==7.1.0",
5656
"grpcio==1.64.1",
@@ -77,7 +77,7 @@ tests-minimal = [
7777
]
7878
doc = [
7979
"ansys-sphinx-theme[autoapi]==0.16.5",
80-
"ansys-tools-visualization-interface==0.2.4",
80+
"ansys-tools-visualization-interface==0.2.6",
8181
"beartype==0.18.5",
8282
"docker==7.1.0",
8383
"ipyvtklink==0.2.3",

0 commit comments

Comments
 (0)