Skip to content

Commit c5f690d

Browse files
committed
Merge branch 'main' into release/0.2
2 parents 5c2ec44 + da6b6c8 commit c5f690d

21 files changed

+376
-36
lines changed

.github/labeler.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
documentation:
2-
- doc/source/**/*
2+
- changed-files:
3+
- any-glob-to-any-file: ['doc/source/**/*']
34
maintenance:
4-
- .github/**/*
5-
- .flake8
6-
- pyproject.toml
5+
- changed-files:
6+
- any-glob-to-any-file: ['.github/**/*', '.flake8', 'pyproject.toml']
77
dependencies:
8-
- requirements/*
8+
- changed-files:
9+
- any-glob-to-any-file: ['requirements/*']

.github/workflows/ci_cd.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: "Documentation style"
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: ansys/actions/doc-style@v4
27+
- uses: ansys/actions/doc-style@v5
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030

@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup headless display
4747
uses: pyvista/setup-headless-display-action@v2
4848

49-
- uses: ansys/actions/tests-pytest@v4
49+
- uses: ansys/actions/tests-pytest@v5
5050
with:
5151
python-version: ${{ matrix.python-version }}
5252

@@ -56,7 +56,7 @@ jobs:
5656
needs: [doc-style]
5757
steps:
5858
- name: Build project documentation
59-
uses: ansys/actions/doc-build@v4
59+
uses: ansys/actions/doc-build@v5
6060
with:
6161
python-version: ${{ env.MAIN_PYTHON_VERSION }}
6262
dependencies: "libegl1"
@@ -67,7 +67,7 @@ jobs:
6767
needs: [doc-build]
6868
if: github.ref == 'refs/heads/main'
6969
steps:
70-
- uses: ansys/actions/doc-deploy-dev@v4
70+
- uses: ansys/actions/doc-deploy-dev@v5
7171
with:
7272
cname: ${{ env.DOCUMENTATION_CNAME }}
7373
token: ${{ secrets.GITHUB_TOKEN }}
@@ -78,7 +78,7 @@ jobs:
7878
steps:
7979
- uses: actions/checkout@v4
8080

81-
- uses: actions/setup-python@v4
81+
- uses: actions/setup-python@v5
8282
with:
8383
python-version: ${{ env.MAIN_PYTHON_VERSION }}
8484

@@ -105,7 +105,7 @@ jobs:
105105
- name: List output
106106
run: ls -R dist
107107

108-
- uses: actions/upload-artifact@v3
108+
- uses: actions/upload-artifact@v4
109109
with:
110110
name: Python-Installer
111111
path: dist/*Setup*.exe
@@ -123,7 +123,7 @@ jobs:
123123
repository: ansys-internal/signtool-ansys-apps
124124
token: ${{ secrets.SIGNTOOL_ACCESS_TOKEN }}
125125

126-
- uses: actions/download-artifact@v3
126+
- uses: actions/download-artifact@v4
127127
with:
128128
name: Python-Installer
129129
path: signtool/installer
@@ -143,7 +143,7 @@ jobs:
143143
-n $jobname `
144144
-i installer/$filename
145145
146-
- uses: actions/upload-artifact@v3
146+
- uses: actions/upload-artifact@v4
147147
with:
148148
name: Python-Installer-Signed
149149
path: signtool/installer/*Setup*.exe
@@ -154,12 +154,12 @@ jobs:
154154
needs: [sign-application]
155155
runs-on: ubuntu-latest
156156
steps:
157-
- uses: actions/download-artifact@v3
157+
- uses: actions/download-artifact@v4
158158
with:
159159
name: Python-Installer-Signed
160160
path: installer-signed
161161

162-
- uses: actions/download-artifact@v3
162+
- uses: actions/download-artifact@v4
163163
with:
164164
name: Python-Installer
165165
path: installer
@@ -188,7 +188,7 @@ jobs:
188188
needs: [release, doc-build]
189189
steps:
190190
- name: Deploy the stable documentation
191-
uses: ansys/actions/doc-deploy-stable@v4
191+
uses: ansys/actions/doc-deploy-stable@v5
192192
with:
193193
cname: ${{ env.DOCUMENTATION_CNAME }}
194194
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ jobs:
3232

3333
# Label based on modified files
3434
- name: Label based on changed files
35-
uses: actions/labeler@v4
35+
uses: actions/labeler@v5
3636
with:
3737
repo-token: ${{ secrets.GITHUB_TOKEN }}
38-
sync-labels: ''
3938

4039
# Label based on branch name
4140
- uses: actions-ecosystem/action-add-labels@v1
@@ -70,7 +69,7 @@ jobs:
7069
runs-on: ubuntu-latest
7170
steps:
7271
- name: Suggest to add labels
73-
uses: peter-evans/create-or-update-comment@v3
72+
uses: peter-evans/create-or-update-comment@v4
7473
# Execute only when no labels have been applied to the pull request
7574
if: toJSON(github.event.pull_request.labels.*.name) == '{}'
7675
with:

.pre-commit-config.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ci:
66

77
repos:
88
- repo: https://github.com/pycqa/isort
9-
rev: 5.12.0
9+
rev: 5.13.2
1010
hooks:
1111
- id: isort
1212
args:
1313
- --line-length=88
1414

1515
- repo: https://github.com/psf/black
16-
rev: 23.11.0
16+
rev: 24.1.1
1717
hooks:
1818
- id: black
1919
args:
@@ -26,7 +26,7 @@ repos:
2626
files: '\.py$'
2727

2828
- repo: https://github.com/PyCQA/flake8
29-
rev: 6.1.0
29+
rev: 7.0.0
3030
hooks:
3131
- id: flake8
3232

@@ -54,6 +54,13 @@ repos:
5454

5555
# this validates our github workflow files
5656
- repo: https://github.com/python-jsonschema/check-jsonschema
57-
rev: 0.27.1
57+
rev: 0.27.4
5858
hooks:
5959
- id: check-github-workflows
60+
61+
- repo: https://github.com/ansys/pre-commit-hooks
62+
rev: v0.2.8
63+
hooks:
64+
- id: add-license-headers
65+
args:
66+
- --start_year=2023

doc/source/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Sphinx documentation configuration file."""
2+
23
from datetime import datetime
34
import os
45
import shutil
@@ -19,7 +20,7 @@
1920
# Select desired logo, theme, and declare the html title
2021
html_logo = logo
2122
html_theme = "ansys_sphinx_theme"
22-
html_short_title = html_title = "Python GUI Installer"
23+
html_short_title = html_title = "Ansys Python Manager"
2324

2425
# specify the location of your github repo
2526
html_context = {

pyproject.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,28 @@ dynamic = ["version"]
4040
[project.optional-dependencies]
4141
tests = [
4242
"packaging==23.2",
43-
"PyGithub==2.1.1",
43+
"PyGithub==2.2.0",
4444
"appdirs==1.4.4",
4545
"requests==2.31.0",
46-
"PySide6==6.6.0",
47-
"ansys-tools-path==0.3.2",
48-
"pytest==7.4.3",
46+
"PySide6==6.6.1",
47+
"ansys-tools-path==0.4.1",
48+
"pytest==8.0.0",
4949
"pytest-cov==4.1.0",
50-
"pytest-qt==4.2.0",
50+
"pytest-qt==4.4.0",
5151
]
5252
doc = [
5353
"Sphinx==7.2.6",
54-
"ansys-sphinx-theme==0.12.5",
54+
"ansys-sphinx-theme==0.13.3",
5555
"sphinx-copybutton==0.5.2",
5656
]
5757
freeze = [
58-
"pyinstaller==6.2.0",
58+
"pyinstaller==6.4.0",
5959
"packaging==23.2",
60-
"PyGithub==2.1.1",
60+
"PyGithub==2.2.0",
6161
"appdirs==1.4.4",
6262
"requests==2.31.0",
63-
"PySide6==6.6.0",
64-
"ansys-tools-path==0.3.2",
63+
"PySide6==6.6.1",
64+
"ansys-tools-path==0.4.1",
6565
]
6666

6767
[tool.flit.module]

src/ansys/tools/installer/__init__.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
2+
# SPDX-License-Identifier: MIT
3+
#
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in all
13+
# copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
# SOFTWARE.
22+
123
"""Ansys Python Manager."""
224

325
import os

src/ansys/tools/installer/__main__.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
2+
# SPDX-License-Identifier: MIT
3+
#
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in all
13+
# copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
# SOFTWARE.
22+
123
"""Main entrypoint for this module."""
224

325
from ansys.tools.installer.main import open_gui

src/ansys/tools/installer/auto_updater.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
2+
# SPDX-License-Identifier: MIT
3+
#
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in all
13+
# copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
# SOFTWARE.
22+
123
"""Check for updates."""
224

325
from github import Github

src/ansys/tools/installer/common.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
2+
# SPDX-License-Identifier: MIT
3+
#
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in all
13+
# copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
# SOFTWARE.
22+
123
"""Common module for Ansys Python Manager."""
224

325
from functools import wraps

0 commit comments

Comments
 (0)