Skip to content

Commit

Permalink
Merge branch 'master' into fix/select_on_dataframe_with_no_set_index
Browse files Browse the repository at this point in the history
  • Loading branch information
PProfizi authored Aug 6, 2024
2 parents 16f9c2d + c74810e commit 3ef6d71
Show file tree
Hide file tree
Showing 25 changed files with 99 additions and 55 deletions.
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ body:
label: Which DPF/Ansys version are you using?
multiple: false
options:
- 'DPF Server 2025.1.pre0'
- 'Ansys 2024 R2'
- 'DPF Server 2024.2.pre1'
- 'DPF Server 2024.2.pre0'
- 'Ansys 2024 R1'
- 'DPF Server 2024.1.pre0'
- 'Ansys 2023 R2'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ansys_lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
print(f"Deleted {example}")
- name: "Download Release Asset - HTML"
uses: dsaltares/[email protected].1
uses: dsaltares/[email protected].2
with:
file: HTML-doc-ansys-dpf-post.zip
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
MODULE: 'post'
DOCUMENTATION_CNAME: 'post.docs.pyansys.com'
MAIN_PYTHON_VERSION: '3.10'
ANSYS_VERSION: '242'
ANSYS_VERSION: '251'

jobs:
debug:
Expand All @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4

- name: "Setup Python"
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

Expand Down Expand Up @@ -81,7 +81,8 @@ jobs:
MODULE: ${{env.MODULE}}
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
install_extras: plotting
wheel: true
# Upload the wheel artifact for only one of the OS as it is OS-agnostic
wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }}
wheelhouse: true
standalone_suffix: ${{ inputs.standalone_suffix || ''}}

Expand Down Expand Up @@ -129,7 +130,7 @@ jobs:
matrix:
python-version: ["3.10"]
os: ["windows-latest", "ubuntu-latest"]
ANSYS_VERSION: ["241", "232", "231", "222"]
ANSYS_VERSION: ["242", "241", "232", "231", "222"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -186,7 +187,7 @@ jobs:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: "242"
ANSYS_VERSION: "251"
python_versions: '["3.10"]'
standalone_suffix: ${{ inputs.standalone_suffix || ''}}
secrets: inherit
Expand All @@ -195,7 +196,7 @@ jobs:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: "242"
ANSYS_VERSION: "251"
python_version: "3.10"
standalone_suffix: ${{ inputs.standalone_suffix || ''}}
event_name: ${{ github.event_name }}
Expand All @@ -207,7 +208,7 @@ jobs:
needs: [docs]
steps:
- name: "Upload development documentation"
uses: ansys/actions/doc-deploy-dev@v5
uses: ansys/actions/doc-deploy-dev@v6
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
MODULE: 'post'
DOCUMENTATION_CNAME: 'post.docs.pyansys.com'
MAIN_PYTHON_VERSION: '3.10'
ANSYS_VERSION: '242'
ANSYS_VERSION: '251'

jobs:
debug:
Expand All @@ -46,7 +46,7 @@ jobs:
- uses: actions/checkout@v4

- name: "Setup Python"
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

Expand All @@ -62,7 +62,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ANSYS_VERSION: ["242"]
ANSYS_VERSION: ["251"]
python-version: ["3.9", "3.10", "3.11"]
os: ["windows-latest", "ubuntu-latest"]

Expand All @@ -85,7 +85,8 @@ jobs:
MODULE: ${{env.MODULE}}
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
install_extras: plotting
wheel: true
# Upload the wheel artifact for only one of the OS as it is OS-agnostic
wheel: ${{ (matrix.python-version == env.MAIN_PYTHON_VERSION) && (matrix.os == 'windows-latest') }}
wheelhouse: true
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}

Expand Down Expand Up @@ -132,7 +133,7 @@ jobs:
matrix:
python-version: ["3.10"]
os: ["windows-latest", "ubuntu-latest"]
ANSYS_VERSION: ["241", "232", "231", "222"]
ANSYS_VERSION: ["242", "241", "232", "231", "222"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -188,15 +189,15 @@ jobs:
examples:
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: '242'
ANSYS_VERSION: '251'
python_versions: '["3.10"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
secrets: inherit

docs:
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: '242'
ANSYS_VERSION: '251'
python_version: "3.10"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
event_name: ${{ github.event_name }}
Expand All @@ -215,7 +216,7 @@ jobs:
run: ls -R

- name: "Create draft release"
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
./**/*.whl
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "242"
default: "251"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -42,7 +42,7 @@ on:
description: "ANSYS version"
required: true
type: string
default: "242"
default: "251"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Running documentation style checks"
uses: ansys/actions/doc-style@v5.0
uses: ansys/actions/doc-style@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -81,7 +81,7 @@ jobs:
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ inputs.python_version }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "242"
default: "251"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -29,7 +29,7 @@ on:
description: "ANSYS version to run."
required: true
type: string
default: "242"
default: "251"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.1.0
with:
python-version: ${{ matrix.python-version }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
needs: get_latest_tag
steps:
- name: "Download Release Assets"
uses: robinraju/release-downloader@v1.8
uses: robinraju/release-downloader@v1.10
with:
tag: ${{ github.event.inputs.release_tag || needs.get_latest_tag.outputs.version }}
fileName: "*.whl"
Expand All @@ -72,7 +72,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Download Release Asset - HTML"
uses: dsaltares/[email protected].1
uses: dsaltares/[email protected].2
with:
file: HTML-doc-ansys-dpf-post.zip
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -90,7 +90,7 @@ jobs:
path: HTML-doc-ansys-dpf-post.zip

- name: "Deploy the stable documentation"
uses: ansys/actions/doc-deploy-stable@v5
uses: ansys/actions/doc-deploy-stable@v6
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
- name: "Deploy the latest documentation index"
uses: ansys/actions/doc-deploy-index@v5
uses: ansys/actions/doc-deploy-index@v6
with:
cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}
index-name: pydpf-post-v${{ env.VERSION_MEILI }}
Expand Down
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ repos:
- id: flake8

- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.6
hooks:
- id: codespell
args: [
"--ignore-words",
"doc/styles/config/vocabularies/ANSYS/accept.txt",
"doc src",
"*.py *.rst *.md",
]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2023 ANSYS
Copyright (c) 2024 ANSYS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The latest version of DPF supports Ansys solver results files for:
- Mechanical APDL (`.rst`, `.mode`, `.rfrq`, `.rdsp`)
- LS-DYNA (`.d3plot`, `.binout`)
- Fluent (`.cas/dat.h5`, `.flprj`)
- CFX (`.cad/dat.cff`, `.flprj`)
- CFX (`.cas/dat.cff`, `.flprj`, `.res`)

For more information on file support, see the [main page](https://dpf.docs.pyansys.com/version/stable/index.html)
in the PyDPF-Core documentation.
Expand Down
1 change: 1 addition & 0 deletions doc/.vale.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Vocab = ANSYS

# Apply the following styles
BasedOnStyles = Vale, Google
Vale.Terms = NO

# Removing Google-specific rule - Not applicable under some circumstances
Google.WordList = NO
Expand Down
24 changes: 19 additions & 5 deletions doc/source/getting_started/compatibility.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,19 @@ libraries.
* - DPF server version
- ansys.dpf.core python module version
- ansys.dpf.post python module version
* - 8.1 (DPF Server 2024.2.pre1)
- 0.12.0 or later
- 0.8.0 or later
* - 8.0 (DPF Server 2024.2.pre0)
- 0.11.0 or later
- 0.7.0 or later
* - 7.1 (Ansys 2024 R1)
- 0.10.1 or later
- 0.6.0 or later
* - 7.0 (DPF Server 2024.1.pre0)
- 0.10.0 or later
- 0.6.0 or later
* - 6.2 (Ansys 2023 R2)
- 0.9.0 or later
- 0.5.0 or later
* - 6.1 (DPF Server 2023.2.pre1)
Expand All @@ -38,11 +50,13 @@ libraries.
- 0.5.0 or later
- 0.3.0 or later
* - 3.0 (Ansys 2022 R1)
- 0.4.0 or later
- 0.1.0 or later
- 0.4.0 to 0.9.0
- 0.1.0 to 0.5.0
* - 2.0 (Ansys 2021 R2)
- 0.3.0 or later
- 0.1.0 or later
- 0.3.0 to 0.9.0**
- 0.1.0 to 0.5.0
* - 1.0 (Ansys 2021 R1)
- 0.2.*
- 0.1.0 or later
- 0.1.0

(** Compatibility of DPF 2.0 with ansys-dpf-core 0.5.0 to 0.9.0 is assumed but not certified.)
2 changes: 1 addition & 1 deletion doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The latest version of DPF supports Ansys solver results files for:
- Mechanical APDL (`.rst`, `.mode`, `.rfrq`, `.rdsp`)
- LS-DYNA (`.d3plot`, `.binout`)
- Fluent (`.cas/dat.h5`, `.flprj`)
- CFX (`.cad/dat.cff`, `.flprj`)
- CFX (`.cas/dat.cff`, `.flprj`, `.res`)

For more information on file support, see the `main page <https://dpf.docs.pyansys.com/version/stable/index.html>`_
in the PDF-Core documentation.
Expand Down
3 changes: 1 addition & 2 deletions doc/styles/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
*
!Vocab
!Vocab/**
!config/vocabularies/**
!.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ANSYS
API
HDF5
mecanic
postprocess
postprocessing
(PyDPF\s|PyDPF-Core|PyDPF-Post)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi"
[project]
# Check https://flit.readthedocs.io/en/latest/pyproject_toml.html for all available sections
name = "ansys-dpf-post"
version = "0.7.1.dev0"
version = "0.9.1.dev0"
description = "PyDPF-Post Python library."
readme = "README.md"
requires-python = ">=3.9,<4.0"
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements_build.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
wheel==0.42.0
wheel==0.43.0
10 changes: 5 additions & 5 deletions requirements/requirements_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ numpydoc==1.6.0
imageio-ffmpeg==0.4.7
Sphinx<7.2.0; python_version == '3.8'
Sphinx==7.2.6; python_version >= '3.9'
sphinx-autobuild==2024.2.4
sphinx-autobuild==2024.4.16
sphinxcontrib-napoleon==0.7
sphinxcontrib-websupport==1.2.7
pytest-sphinx==0.6.0
pytest-sphinx==0.6.3
sphinx-notfound-page==1.0.0
sphinx-copybutton==0.5.0
sphinx-gallery==0.15.0
ansys_sphinx_theme==0.14.0
sphinx-gallery==0.16.0
ansys_sphinx_theme==0.16.0
sphinx-autodoc-typehints==2.0.0
pyvista==0.43.3
pyvista==0.43.8
4 changes: 2 additions & 2 deletions requirements/requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage==7.4.3
pytest-cov==4.0.0
pytest-rerunfailures==13.0
pytest-rerunfailures==14.0
pytest==8.0.1
pyvista==0.43.3
pyvista==0.43.8
Loading

0 comments on commit 3ef6d71

Please sign in to comment.