Skip to content

Commit

Permalink
Merge branch 'master' into fix/make_tmp_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
PProfizi authored Jun 13, 2023
2 parents 3198fcb + 8917810 commit 1835348
Show file tree
Hide file tree
Showing 672 changed files with 3,765 additions and 1,687 deletions.
7 changes: 7 additions & 0 deletions .ci/code_generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,11 @@
except Exception as e:
print(f"Could not generate operators for optional library {lib}:\n{str(e)}")

# Reorder imports alphabetically in __init__.py files to reduce changes raised
for init_file_path in glob.glob(os.path.join(TARGET_PATH, "**/__init__.py"), recursive=True):
with open(init_file_path, "r") as init_file:
lines = init_file.readlines()
with open(init_file_path, "w") as init_file:
init_file.writelines(sorted(lines))

build.build_operators()
16 changes: 10 additions & 6 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ body:
label: Before submitting the issue
description: Please, make sure the following conditions are met
options:
- label: I have checked for [Compatibility](https://dpf.docs.pyansys.com/getting_started/compatibility.html#id1) issues
- label: I have checked for [Compatibility](https://dpf.docs.pyansys.com/version/stable/getting_started/compatibility.html#id1) issues
required: true
- label: I have searched among the existing issues
required: true
Expand Down Expand Up @@ -46,8 +46,8 @@ body:
- type: dropdown
id: os-name
attributes:
label: Which Operating System are you using?
multiple: false
label: Which Operating System causes the issue?
multiple: true
options:
- 'Windows'
- 'MacOS'
Expand All @@ -61,7 +61,10 @@ body:
label: Which DPF/Ansys version are you using?
multiple: false
options:
- 'DPF Server as standalone'
- 'Ansys 2024 R1'
- 'Ansys 2023 R2'
- 'DPF Server 2023.2.pre1'
- 'DPF Server 2023.2.pre0'
- 'Ansys 2023 R1'
- 'Ansys 2022 R2'
- 'Ansys 2022 R1'
Expand All @@ -73,14 +76,15 @@ body:
- type: dropdown
id: python-version
attributes:
label: Which Python version are you using?
label: Which Python version causes the issue?
description: Run `python --version` to verify your Python version
multiple: false
multiple: true
options:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
validations:
required: true

Expand Down
75 changes: 75 additions & 0 deletions .github/ISSUE_TEMPLATE/examples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: 🎓 Adding an example
description: Proposing a new example for the library
title: "Example proposal: ..."
labels: ["example"]
assignees: [""]

body:

- type: textarea
id: example-description
attributes:
label: '📝 Description of the example'
placeholder: Describe what example you devised and why it is useful for the project.

validations:
required: true

- type: textarea
id: example-files
attributes:
label: '📁 Files needed for running the example'
placeholder: >
Drag and drop the files used in your example, together with the script employed.
Test the example files before uploading to ensure they at least run on your machine.
Add any additional comments/explanations that maintainers may need for running the example.
If you have issues uploading your files because of the file extension/type, upload them
as a .zip file.
validations:
required: true

- type: dropdown
id: os-name
attributes:
label: '💻 Which operating system are you using?'
multiple: false
options:
- 'Windows'
- 'MacOS'
- 'Linux'
validations:
required: true

- type: textarea
id: ansys-version
attributes:
label: '📀 Which ANSYS version are you using?'
placeholder: Indicate the ANSYS version of the products you are using.

validations:
required: false

- type: dropdown
id: python-version
attributes:
label: '🐍 Which Python version are you using?'
description: Run `python --version` to verify your Python version
multiple: false
options:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
validations:
required: true

- type: textarea
id: installed-packages
attributes:
label: '📦 Installed packages'
description: Run `python -m pip freeze` to list installed packages
placeholder: Paste the output of `python -m pip freeze` here.
render: shell
validations:
required: true
38 changes: 25 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
description: "extra pip --find-links argument to find custom dpf wheels"
required: false
type: string
default: './dpf-standalone/v232/dist'
default: './dpf-standalone/v241/dist'
custom-wheels-docker:
description: "extra pip --find-links argument to find custom dpf wheels"
required: false
Expand All @@ -36,7 +36,6 @@ concurrency:
cancel-in-progress: true

env:
ANSYS_VERSION: 232
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
MAIN_PYTHON_VERSION: '3.8'

Expand All @@ -56,7 +55,7 @@ jobs:
- uses: actions/checkout@v3

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

Expand All @@ -69,19 +68,20 @@ jobs:
tests:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "232"
ANSYS_VERSION: "241"
python_versions: '["3.8"]'
wheel: true
wheelhouse: false
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
secrets: inherit

docker_tests:
name: "Build and Test on Docker"
uses: ./.github/workflows/test_docker.yml
with:
ANSYS_VERSION: "241"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
Expand All @@ -91,7 +91,7 @@ jobs:
name: "Run examples on Docker"
uses: ./.github/workflows/examples_docker.yml
with:
ANSYS_VERSION: "232"
ANSYS_VERSION: "241"
python_versions: '["3.8"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
Expand All @@ -102,10 +102,10 @@ 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: "232"
ANSYS_VERSION: "241"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
event_name: ${{ github.event_name }}
secrets: inherit

Expand All @@ -115,7 +115,7 @@ jobs:
needs: [docs]
steps:
- name: "Upload development documentation"
uses: pyansys/actions/doc-deploy-dev@v4
uses: ansys/actions/doc-deploy-dev@v4
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -125,11 +125,23 @@ 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: "232"
ANSYS_VERSION: "241"
python_versions: '["3.8"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
secrets: inherit

retro_232:
name: "retro 232"
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "232"
python_versions: '["3.8"]'
DOCSTRING: false
standalone_suffix: ''
custom-wheels: './dpf-standalone/v232/dist --pre'
secrets: inherit

retro_231:
Expand Down Expand Up @@ -170,9 +182,9 @@ jobs:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: "232"
ANSYS_VERSION: "241"
post_branch: "master"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
secrets: inherit
6 changes: 2 additions & 4 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v3

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

Expand Down Expand Up @@ -157,8 +157,6 @@ jobs:
ANSYS_VERSION: "232"
python_versions: '["3.8", "3.9", "3.10"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
secrets: inherit

draft_release:
Expand All @@ -168,7 +166,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Set up Python"
uses: actions/setup-python@v4.1.0
uses: actions/setup-python@v4.6.0
with:
python-version: 3.9

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: "232"
default: "241"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -44,7 +44,7 @@ on:
description: "ANSYS version"
required: true
type: string
default: "232"
default: "241"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -87,13 +87,13 @@ jobs:
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.6.0
with:
python-version: ${{ inputs.python_version }}

- name: "Build Package"
id: build-package
uses: pyansys/pydpf-actions/build_package@v2.3
uses: ansys/pydpf-actions/build_package@v2.3
with:
python-version: ${{ inputs.python_version }}
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
pip install -r requirements/requirements_docs.txt
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
uses: ansys/pydpf-actions/kill-dpf-servers@v2.3

- name: "List installed packages"
shell: bash
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
esac
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
uses: ansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()

- name: "Retrieve package version"
Expand Down
12 changes: 6 additions & 6 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: "232"
default: "241"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -39,7 +39,7 @@ on:
description: "ANSYS version to run."
required: true
type: string
default: "232"
default: "241"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -92,12 +92,12 @@ jobs:
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.6.0
with:
python-version: ${{ matrix.python-version }}

- name: "Build Package"
uses: pyansys/pydpf-actions/build_package@v2.3
uses: ansys/pydpf-actions/build_package@v2.3
with:
python-version: ${{ matrix.python-version }}
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
Expand All @@ -112,7 +112,7 @@ jobs:
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.3
uses: ansys/pydpf-actions/prepare_tests@v2.3
with:
DEBUG: true

Expand All @@ -128,5 +128,5 @@ jobs:
python run_examples.py
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
uses: ansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()
Loading

0 comments on commit 1835348

Please sign in to comment.