Skip to content
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
903dd14
CHORE: Update install targets and use dependency groups
SMoraisAnsys Apr 29, 2025
17ff602
CI: Use dependency groups
SMoraisAnsys Apr 30, 2025
2478e00
TBR: Test ansys action update
SMoraisAnsys Apr 30, 2025
a15b118
TBR: extend testing
SMoraisAnsys Apr 30, 2025
4b3fd82
TBR: test changelog-fragment
SMoraisAnsys Apr 30, 2025
0c3dfd8
CI: Update wrong ref
SMoraisAnsys Apr 30, 2025
aa1887d
chore: adding changelog file 6093.maintenance.md [dependabot-skip]
pyansys-ci-bot Apr 30, 2025
d3b92d7
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 2, 2025
ffeaf79
WIP: Revert test branch
SMoraisAnsys May 5, 2025
2ffa3d2
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 14, 2025
15ea4a9
TBR: Test with branch
SMoraisAnsys May 14, 2025
364984f
BUILD: Update vtk upper bound
SMoraisAnsys May 14, 2025
5ae77bc
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 14, 2025
06ecc5a
CI: Fix wrong action call
SMoraisAnsys May 14, 2025
2918f97
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 15, 2025
4bd5260
CHORE: Revert ref to dev branch
SMoraisAnsys May 15, 2025
8652ad8
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 22, 2025
dec3c78
CI: test new refactoring
SMoraisAnsys May 22, 2025
b3f83d8
TESTS: Use both group and optional
SMoraisAnsys May 26, 2025
7f3f388
Merge branch 'main' into chore/use-dependency-groups
SMoraisAnsys May 26, 2025
4588abe
test
SMoraisAnsys May 26, 2025
9b204b2
test dev branch
SMoraisAnsys May 26, 2025
7278b06
tests
SMoraisAnsys May 26, 2025
59dd01c
ref to dev rbanch
SMoraisAnsys May 26, 2025
ab947f9
wip
SMoraisAnsys Jun 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
needs: [pr-title]
steps:
- name: Check documentation style
uses: ansys/actions/doc-style@v9
uses: ansys/actions/doc-style@feat/work-with-dependency-groups
with:
token: ${{ secrets.GITHUB_TOKEN }}
fail-level: 'warning'
Expand All @@ -104,7 +104,7 @@ jobs:
needs: [doc-style]
steps:
- name: Documentation build
uses: ansys/actions/doc-build@v9
uses: ansys/actions/doc-build@feat/work-with-dependency-groups
with:
dependencies: "graphviz texlive-latex-extra latexmk texlive-xetex texlive-fonts-extra"
python-version: ${{ env.MAIN_PYTHON_VERSION }}
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run unit tests
uses: ansys/actions/tests-pytest@v9
uses: ansys/actions/tests-pytest@feat/work-with-dependency-groups
with:
pytest-postargs: 'tests/unit'
pytest-extra-args: ${{ env.PYTEST_ARGUMENTS }}
Expand All @@ -171,7 +171,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run integration tests
uses: ansys/actions/tests-pytest@v9
uses: ansys/actions/tests-pytest@feat/work-with-dependency-groups
with:
pytest-postargs: 'tests/integration'
pytest-extra-args: ${{ env.PYTEST_ARGUMENTS }}
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
- name: Install pyaedt and tests dependencies
run: |
.venv\Scripts\Activate.ps1
pip install .[tests]
pip install --group tests .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
run: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT251 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
source .venv/bin/activate
pip install .[tests]
pip install --group tests .

- name: Run tests marked with 'solvers'
run: |
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
- name: Install pyaedt and tests dependencies
run: |
.venv\Scripts\Activate.ps1
pip install .[tests]
pip install --group tests .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
Expand Down Expand Up @@ -402,7 +402,7 @@ jobs:
run: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT251 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
source .venv/bin/activate
pip install .[tests]
pip install --group tests .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
- name: Install pyaedt and tests dependencies
run: |
.venv\Scripts\Activate.ps1
pip install .[tests]
pip install --group tests .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
Expand Down Expand Up @@ -533,7 +533,7 @@ jobs:
run: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT251 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
source .venv/bin/activate
pip install .[tests]
pip install --group tests .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: ansys/actions/doc-changelog@v9
- uses: ansys/actions/doc-changelog@feat/work-with-dependency-groups
with:
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
use-conventional-commits: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Install pyaedt and tests dependencies
run: |
.venv\Scripts\Activate.ps1
pip install .[tests]
pip install --group tests .
pip install pytest-azurepipelines

- name: Install CI dependencies (e.g. vtk-osmesa)
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
run: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT251 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
source .venv/bin/activate
pip install .[tests]
pip install --group tests .
pip install pytest-azurepipelines

- name: Run tests marked with 'solvers'
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- name: Install pyaedt and tests dependencies
run: |
.venv\Scripts\Activate.ps1
pip install .[tests]
pip install --group tests .
pip install pytest-azurepipelines

- name: Install CI dependencies (e.g. vtk-osmesa)
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/6093.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update install targets and use dependency groups
90 changes: 50 additions & 40 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,53 @@ dependencies = [
]

[project.optional-dependencies]
dotnet = [
"ansys-pythonnet>=3.1.0rc3",
"cffi==1.17.1; platform_system=='Linux' and python_version == '3.7'",
"cffi>=1.16.0,<1.18; platform_system=='Linux' and python_version > '3.7'",
"dotnetcore2==3.1.23; platform_system=='Linux'",
"pywin32>=303; platform_system=='Windows'",
]
jupyter = [
"jupyterlab>=3.6.0,<4.4",
"ipython>=7.30.0,<9.1",
"ipyvtklink>=0.2.0,<0.2.4",
]
graphics = [
"ansys-tools-visualization-interface; python_version >= '3.10'",
"pyvista[io]>=0.38.0,<0.45",
"matplotlib>=3.5.0,<3.11",
"vtk>=9.0,<9.4",
]
analysis = [
"fast-simplification>=0.1.7",
"numpy>=1.20.0,<2.3",
"osmnx>=1.1.0,<2.1",
"pandas>=1.1.0,<2.3",
"scikit-rf>=0.30.0,<1.7",
]
io = [
"openpyxl>=3.1.0,<3.3",
"tables; python_version >= '3.10'",
]
all = [
"pyaedt[analysis,graphics,io,jupyter]",
]
examples = [
"imageio>=2.34.0,<2.38",
"matplotlib>=3.5.0,<3.11",
"numpy>=1.20.0,<2.3",
"openpyxl>=3.1.0,<3.3",
"osmnx>=1.1.0,<2.1",
"pandas>=1.1.0,<2.3",
"pyvista>=0.38.0,<0.45",
"fast-simplification>=0.1.7",
"joblib>=1.4.0,<1.5",
"plotly>=6.0,<6.1",
"scikit-rf>=0.30.0,<1.7",
]

[dependency-groups]
unit-tests = [
"pytest>=7.4.0,<8.4",
"pytest-cov>=4.0.0,<6.2",
Expand All @@ -56,25 +103,18 @@ integration-tests = [
"matplotlib>=3.5.0,<3.11",
"numpy>=1.20.0,<2.3",
"pandas>=1.1.0,<2.3",
"pyaedt[unit-tests]",
{include-group = "unit-tests"},
]
tests = [
"ansys-tools-visualization-interface; python_version >= '3.10'",
"openpyxl>=3.1.0,<3.3",
"osmnx>=1.1.0,<2.1",
"pyaedt[integration-tests]",
"pytest-timeout>=2.3.0,<2.4",
"pytest-xdist>=3.5.0,<3.7",
"pyvista[io]>=0.38.0,<0.45",
"scikit-rf>=0.30.0,<1.7",
"tables; python_version >= '3.10'",
]
dotnet = [
"ansys-pythonnet>=3.1.0rc3",
"cffi==1.17.1; platform_system=='Linux' and python_version == '3.7'",
"cffi>=1.16.0,<1.18; platform_system=='Linux' and python_version > '3.7'",
"dotnetcore2==3.1.23; platform_system=='Linux'",
"pywin32>=303; platform_system=='Windows'",
{include-group = "integration-tests"},
]
doc = [
"ansys-sphinx-theme>=1.0.0,<1.4",
Expand All @@ -91,37 +131,7 @@ doc = [
"pyvista[io]>=0.38.0,<0.45",
"ansys-tools-visualization-interface; python_version >= '3.10'",
]
jupyter = [
"jupyterlab>=3.6.0,<4.4",
"ipython>=7.30.0,<9.1",
"ipyvtklink>=0.2.0,<0.2.4",
]
all = [
"matplotlib>=3.5.0,<3.11",
"numpy>=1.20.0,<2.3",
"openpyxl>=3.1.0,<3.3",
"osmnx>=1.1.0,<2.1",
"pandas>=1.1.0,<2.3",
"pyvista[io]>=0.38.0,<0.45",
"fast-simplification>=0.1.7",
"ansys-tools-visualization-interface; python_version >= '3.10'",
"tables; python_version >= '3.10'",
"scikit-rf>=0.30.0,<1.7",
"pyaedt[jupyter]",
]
examples = [
"imageio>=2.34.0,<2.38",
"matplotlib>=3.5.0,<3.11",
"numpy>=1.20.0,<2.3",
"openpyxl>=3.1.0,<3.3",
"osmnx>=1.1.0,<2.1",
"pandas>=1.1.0,<2.3",
"pyvista>=0.38.0,<0.45",
"fast-simplification>=0.1.7",
"joblib>=1.4.0,<1.5",
"plotly>=6.0,<6.1",
"scikit-rf>=0.30.0,<1.7",
]


[tool.setuptools.dynamic]
version = {attr = "ansys.aedt.core.__version__"}
Expand Down
Loading