Skip to content

Commit

Permalink
Merge branch 'main' into maint/clean-mapdl-inprocess
Browse files Browse the repository at this point in the history
  • Loading branch information
Gryfenfer97 authored Aug 22, 2024
2 parents 0a30af5 + 93dd176 commit 80526b5
Show file tree
Hide file tree
Showing 408 changed files with 2,912 additions and 2,613 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/codespaces-dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ansys-dpf-core==0.10.1
ansys-tools-visualization-interface==0.2.6
autopep8==2.3.1
matplotlib==3.9.0
pandas==2.2.2
Expand All @@ -9,6 +10,5 @@ pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-rerunfailures==14.0
pytest==8.2.2
pyvista==0.43.10
scipy==1.14.0
vtk==9.3.0
5 changes: 2 additions & 3 deletions .devcontainer/codespaces-docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
grpcio==1.64.1
imageio-ffmpeg==0.5.1
imageio==2.34.2
Expand All @@ -14,12 +15,10 @@ pyiges[full]==0.3.1
pypandoc==1.13
pytest-sphinx==0.6.3
pythreejs==2.4.2
pyvista[trame]==0.43.10
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.0
sphinx-design==0.6.0
sphinx-design==0.6.1
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-reredirects==0.1.4
Expand Down
5 changes: 2 additions & 3 deletions .devcontainer/devcontainer-local/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
ansys-tools-visualization-interface==0.2.6
autopep8==2.3.1
grpcio==1.64.1
imageio-ffmpeg==0.5.1
Expand All @@ -21,13 +22,11 @@ pytest-rerunfailures==14.0
pytest-sphinx==0.6.3
pytest==8.2.2
pythreejs==2.4.2
pyvista[jupyter]==0.43.10
pyvista==0.43.10
scipy==1.14.0
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.0
sphinx-design==0.6.1
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-reredirects==0.1.4
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ updates:
- "matplotlib"
- "pexpect"
- "pyiges"
- "pyvista"
- "ansys-tools-visualization-interface"
- "scipy"
- "tqdm"
- "vtk"
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

env:
PROJECT_NAME: 'PyMAPDL'
MAIN_PYTHON_VERSION: '3.10'
MAIN_PYTHON_VERSION: '3.11'
PACKAGE_NAME: 'ansys-mapdl-core'
PACKAGE_NAMESPACE: 'ansys.mapdl.core'
DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com'
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: ansys/actions/doc-deploy-changelog@v6
- uses: ansys/actions/doc-deploy-changelog@v7
with:
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

Expand All @@ -81,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check branch name
uses: ansys/actions/branch-name-style@v6
uses: ansys/actions/branch-name-style@v7


commit-name:
Expand All @@ -90,7 +90,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check commit name
uses: ansys/actions/commit-style@v6
uses: ansys/actions/commit-style@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -103,7 +103,7 @@ jobs:
folder: ["doc", "examples"]
steps:
- name: "Ansys documentation style checks"
uses: ansys/actions/doc-style@v6
uses: ansys/actions/doc-style@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
files: ${{ matrix.folder }}
Expand All @@ -120,7 +120,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12']
# Only perform wheelhouse builds for macOS when releasing
should-release:
- ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
Expand All @@ -129,7 +129,7 @@ jobs:
os: macos-latest
steps:
- name: "Build wheelhouse and perform smoke test"
uses: ansys/actions/build-wheelhouse@v6
uses: ansys/actions/build-wheelhouse@v7
with:
library-name: ${{ env.PACKAGE_NAME }}
operating-system: ${{ matrix.os }}
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
uses: actions/checkout@v4.1.7

- name: "Login in Github container registry"
uses: docker/login-action@v3.2.0
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -395,7 +395,7 @@ jobs:
uses: actions/checkout@v4.1.7

- name: "Login in Github container registry"
uses: docker/login-action@v3.2.0
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -603,7 +603,7 @@ jobs:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
needs: [smoke-tests, build-test-local-minimal-matrix]
timeout-minutes: 55
timeout-minutes: 75
strategy:
fail-fast: false
matrix: ${{fromJson(needs.build-test-local-minimal-matrix.outputs.matrix)}}
Expand Down Expand Up @@ -737,7 +737,7 @@ jobs:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
needs: [smoke-tests, build-test-local-minimal-matrix]
timeout-minutes: 55
timeout-minutes: 75
strategy:
fail-fast: false
matrix: ${{fromJson(needs.build-test-local-minimal-matrix.outputs.matrix)}}
Expand Down Expand Up @@ -916,7 +916,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Build library source and wheel artifacts"
uses: ansys/actions/build-library@v6
uses: ansys/actions/build-library@v7
with:
library-name: ${{ env.PACKAGE_NAME }}
python-version: ${{ env.MAIN_PYTHON_VERSION }}
Expand All @@ -934,13 +934,13 @@ jobs:
contents: write
steps:
- name: "Release to the public PyPI repository"
uses: ansys/actions/release-pypi-public@v6
uses: ansys/actions/release-pypi-public@v7
with:
library-name: ${{ env.PACKAGE_NAME }}
use-trusted-publisher: true

- name: "Release to GitHub"
uses: ansys/actions/release-github@v6
uses: ansys/actions/release-github@v7
with:
library-name: ${{ env.PACKAGE_NAME }}
additional-artifacts: "minimum_requirements.txt"
Expand Down Expand Up @@ -986,7 +986,7 @@ jobs:
echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
- name: "Deploy the latest documentation index"
uses: ansys/actions/doc-deploy-index@v6
uses: ansys/actions/doc-deploy-index@v7
with:
cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}
index-name: pymapdl-v${{ env.VERSION_MEILI }}
Expand Down Expand Up @@ -1014,7 +1014,7 @@ jobs:
needs: upload-dev-docs
steps:
- name: "Deploy the latest documentation index"
uses: ansys/actions/doc-deploy-index@v6
uses: ansys/actions/doc-deploy-index@v7
with:
cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev
index-name: pymapdl-vdev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_clean_untagged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:

- name: "Perform versions cleanup - except certain tags"
uses: ansys/actions/hk-package-clean-untagged@v6
uses: ansys/actions/hk-package-clean-untagged@v7
with:
package-name: 'mapdl'
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: ansys/actions/doc-changelog@v6
- uses: ansys/actions/doc-changelog@v7
with:
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/linkchecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4.1.7

- name: "Login in Github container registry"
uses: docker/login-action@v3.2.0
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ secrets.GH_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ docker/mapdl/*.sh
tmp.out

# virtual environment
venv/
venv*
.venv/
.venv
.venv*

# Visual studio code local settings
.vscode/
Expand Down
14 changes: 8 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ fail_fast: True
repos:

- repo: https://github.com/ansys/pre-commit-hooks
rev: v0.3.1
rev: v0.4.3
hooks:
- id: add-license-headers
args:
- --start_year=2016

- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort

- repo: https://github.com/numpy/numpydoc
rev: v1.7.0
rev: v1.8.0
hooks:
- id: numpydoc-validation
exclude: |
Expand All @@ -26,7 +28,7 @@ repos:
)
- repo: https://github.com/psf/black
rev: 24.4.2 # If version changes --> modify "blacken-docs" manually as well.
rev: 24.8.0 # If version changes --> modify "blacken-docs" manually as well.
hooks:
- id: black
args:
Expand All @@ -36,10 +38,10 @@ repos:
rev: 1.18.0
hooks:
- id: blacken-docs
additional_dependencies: [black==24.4.2]
additional_dependencies: [black==24.8.0]

- repo: https://github.com/PyCQA/flake8
rev: 7.1.0
rev: 7.1.1
hooks:
- id: flake8

Expand All @@ -65,6 +67,6 @@ repos:

# this validates our github workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.0
rev: 0.29.1
hooks:
- id: check-github-workflows
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 ANSYS, Inc. and/or its affiliates.
Copyright (c) 2016 - 2024 ANSYS, Inc. and/or its affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/2799.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: Adapt PyMAPDL to common plotter
1 change: 0 additions & 1 deletion doc/changelog.d/3226.fixed.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/changelog.d/3240.fixed.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/changelog.d/3256.added.md

This file was deleted.

1 change: 1 addition & 0 deletions doc/changelog.d/3258.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refactor: moving tests to a class and adding delete method.
1 change: 0 additions & 1 deletion doc/changelog.d/3261.changed.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/changelog.d/3266.fixed.md

This file was deleted.

1 change: 1 addition & 0 deletions doc/changelog.d/3273.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: removing io error when logging to closed streams
1 change: 1 addition & 0 deletions doc/changelog.d/3276.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
maint: update CHANGELOG for v0.68.4
1 change: 1 addition & 0 deletions doc/changelog.d/3282.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: increasing timeout for local-min
1 change: 1 addition & 0 deletions doc/changelog.d/3283.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump sphinx from 7.3.7 to 7.4.4 in the documentation group
1 change: 1 addition & 0 deletions doc/changelog.d/3288.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: local-min timeout
1 change: 1 addition & 0 deletions doc/changelog.d/3293.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat/adding missing argument
1 change: 1 addition & 0 deletions doc/changelog.d/3295.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: missing arguments in secdata
1 change: 1 addition & 0 deletions doc/changelog.d/3296.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs: adding warning about *mwrite. Update *vwrite warning to include *mwrite
1 change: 1 addition & 0 deletions doc/changelog.d/3299.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump grpcio from 1.65.0 to 1.65.1 in the grpc-deps group
1 change: 1 addition & 0 deletions doc/changelog.d/3300.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump sphinx from 7.4.4 to 7.4.6 in the documentation group
1 change: 1 addition & 0 deletions doc/changelog.d/3304.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: filename with /OUTPUT command in stored commands
1 change: 1 addition & 0 deletions doc/changelog.d/3306.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: bump docker/login-action from 3.2.0 to 3.3.0 in the actions group
1 change: 1 addition & 0 deletions doc/changelog.d/3307.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: license headers
1 change: 1 addition & 0 deletions doc/changelog.d/3309.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump importlib-metadata from 8.0.0 to 8.2.0 in the minimal group
1 change: 1 addition & 0 deletions doc/changelog.d/3310.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump ansys-tools-visualization-interface from 0.2.6 to 0.3.0 in the core group
1 change: 1 addition & 0 deletions doc/changelog.d/3311.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump the documentation group with 3 updates
1 change: 1 addition & 0 deletions doc/changelog.d/3312.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump pytest from 8.2.2 to 8.3.2 in the testing group
1 change: 1 addition & 0 deletions doc/changelog.d/3315.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: Making sure we skip all the pool unit tests.
1 change: 1 addition & 0 deletions doc/changelog.d/3316.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[pre-commit.ci] pre-commit autoupdate
1 change: 1 addition & 0 deletions doc/changelog.d/3319.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat: adding more descriptive errors
1 change: 1 addition & 0 deletions doc/changelog.d/3322.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump grpcio from 1.65.1 to 1.65.2 in the grpc-deps group
1 change: 1 addition & 0 deletions doc/changelog.d/3323.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump ansys-tools-visualization-interface from 0.3.0 to 0.4.0 in the core group
1 change: 1 addition & 0 deletions doc/changelog.d/3324.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: bump the documentation group with 3 updates
Loading

0 comments on commit 80526b5

Please sign in to comment.