Skip to content

Commit

Permalink
Merge branch 'master' into feat/plot_deform
Browse files Browse the repository at this point in the history
  • Loading branch information
PProfizi authored Nov 19, 2024
2 parents 452a82f + 11ffa75 commit dea28bd
Show file tree
Hide file tree
Showing 47 changed files with 3,282 additions and 1,135 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
24 changes: 24 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
changelog:
exclude:
authors:
- dependabot[bot]
categories:
- title: Enhancements
labels:
- enhancement
- title: Bug fixes
labels:
- bug
- title: Documentation
labels:
- documentation
- title: Examples
labels:
- examples
- title: CI/CD
labels:
- CI/CD
- title: Maintenance
labels:
- maintenance
- dependencies
12 changes: 6 additions & 6 deletions .github/workflows/ansys_lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ on:
workflow_call:
inputs:
version:
description: "Release version as 'X.Y.Z'"
description: "Release version as 'vX.Y.Z'"
type: string
required: true
# Can be called manually
workflow_dispatch:
inputs:
version:
description: "Release version as 'X.Y.Z'"
description: "Release version as 'vX.Y.Z'"
type: string
required: true

Expand All @@ -39,11 +39,11 @@ 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 }}
version: tags/v${{ inputs.version }}
version: tags/${{ inputs.version }}

- name: "Extract ipynb examples"
shell: python
Expand All @@ -69,8 +69,8 @@ jobs:
- name: "Push changes"
shell: bash
run: |
git config --global user.name "rlagha"
git config --global user.name "pyansys-ci-bot"
git add .
git status
git commit -a -m ${{ inputs.version }}
git commit -a -m ${{ inputs.version }} || exit 0
git push https://${{ secrets.PYANSYS_CI_BOT_TOKEN }}@github.com/ansys/pydpf-post.git --follow-tags
24 changes: 14 additions & 10 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: '252'

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.3.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 All @@ -96,6 +97,7 @@ jobs:

- name: "Test Docstrings"
uses: ansys/pydpf-actions/[email protected]
if: ${{ matrix.python-version == env.MAIN_PYTHON_VERSION }}
with:
MODULE: ${{env.MODULE}}
PACKAGE_NAME: ${{env.PACKAGE_NAME}}
Expand All @@ -118,7 +120,7 @@ jobs:
path: tests/junit/test-results.xml

- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5

retro:
name: "Retro-compatibility"
Expand All @@ -129,7 +131,7 @@ jobs:
matrix:
python-version: ["3.10"]
os: ["windows-latest", "ubuntu-latest"]
ANSYS_VERSION: ["241", "232", "231", "222"]
ANSYS_VERSION: ["251", "242", "241", "232", "231", "222"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -180,13 +182,13 @@ jobs:
if: always()

- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5

examples:
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: "252"
python_versions: '["3.10"]'
standalone_suffix: ${{ inputs.standalone_suffix || ''}}
secrets: inherit
Expand All @@ -195,7 +197,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: "252"
python_version: "3.10"
standalone_suffix: ${{ inputs.standalone_suffix || ''}}
event_name: ${{ github.event_name }}
Expand All @@ -207,9 +209,11 @@ jobs:
needs: [docs]
steps:
- name: "Upload development documentation"
uses: ansys/actions/doc-deploy-dev@v5
uses: ansys/actions/doc-deploy-dev@v8
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
bot-user: ${{ secrets.PYANSYS_CI_BOT_USERNAME }}
bot-email: ${{ secrets.PYANSYS_CI_BOT_EMAIL }}
doc-artifact-name: HTML-doc-ansys-dpf-post.zip
decompress-artifact: true
29 changes: 15 additions & 14 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
standalone_branch_suffix:
description: 'Suffix of the branch on standalone'
required: false
default: '.sp01'
default: '.pre0'

#┌───────────── minute (0 - 59)
#│ ┌───────────── hour (0 - 23)
Expand All @@ -28,7 +28,7 @@ env:
MODULE: 'post'
DOCUMENTATION_CNAME: 'post.docs.pyansys.com'
MAIN_PYTHON_VERSION: '3.10'
ANSYS_VERSION: '241'
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.3.0
with:
python-version: ${{ env.MAIN_PYTHON_VERSION }}

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

Expand All @@ -85,9 +85,10 @@ 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 || '.sp01' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}

- name: "Prepare Testing Environment"
uses: ansys/pydpf-actions/[email protected]
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
path: tests/junit/test-results.xml

- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5

retro:
name: "Retro-compatibility"
Expand All @@ -132,7 +133,7 @@ jobs:
matrix:
python-version: ["3.10"]
os: ["windows-latest", "ubuntu-latest"]
ANSYS_VERSION: ["232", "231", "222"]
ANSYS_VERSION: ["242", "241", "232", "231", "222"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -183,22 +184,22 @@ jobs:
if: always()

- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5

examples:
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: '241'
ANSYS_VERSION: '251'
python_versions: '["3.10"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
secrets: inherit

docs:
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: '241'
ANSYS_VERSION: '251'
python_version: "3.10"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
event_name: ${{ github.event_name }}
secrets: inherit

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
12 changes: 6 additions & 6 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: "252"
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: "252"
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@v8
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.3.0
with:
python-version: ${{ inputs.python_version }}

Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
if: always()

- name: "Zip HTML Documentation"
uses: vimtor/action-zip@v1.1
uses: vimtor/action-zip@v1.2
with:
files: doc/build/html/
dest: HTML-doc-${{env.PACKAGE_NAME}}.zip
Expand All @@ -190,7 +190,7 @@ jobs:
echo "Found PDF doc: ${files[0]}"
- name: "Zip PDF Documentation"
uses: vimtor/action-zip@v1.1
uses: vimtor/action-zip@v1.2
if: ${{ inputs.generate_pdf == 'true' }}
with:
files: doc/build/latex/${{ steps.pdf.outputs.PDF_file }}
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: "252"
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: "252"
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.3.0
with:
python-version: ${{ matrix.python-version }}

Expand Down
Loading

0 comments on commit dea28bd

Please sign in to comment.