Jvonrick/merge main in release 0 2 (#283)

* Bump ansys-sphinx-theme from 0.9.5 to 0.9.6 (#240) Bumps [ansys-sphinx-theme](https://github.com/ansys/ansys-sphinx-theme) from 0.9.5 to 0.9.6. - [Release notes](https://github.com/ansys/ansys-sphinx-theme/releases) - [Commits](ansys/ansys-sphinx-theme@v0.9.5...v0.9.6) --- updated-dependencies: - dependency-name: ansys-sphinx-theme dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove the poetry workaround for sphinx theme installation (#241) * Update dpf core version (#243) * Bump peter-evans/create-or-update-comment from 2 to 3 (#249) Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 2 to 3. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](peter-evans/create-or-update-comment@v2...v3) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 7.2.2 to 7.3.0 (#250) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.2 to 7.3.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@7.2.2...7.3.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Short fiber example: fiber orientation tensor (#233) * Bump ansys-dpf-core from 0.8.0 to 0.8.1 (#253) Bumps [ansys-dpf-core](https://github.com/pyansys/pydpf-core) from 0.8.0 to 0.8.1. - [Release notes](https://github.com/pyansys/pydpf-core/releases) - [Commits](ansys/pydpf-core@v0.8.0...v0.8.1) --- updated-dependencies: - dependency-name: ansys-dpf-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 7.3.0 to 7.3.1 (#254) Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.0 to 7.3.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@7.3.0...7.3.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add info to explain switching of doc versions (#256) Update main index.rst file with minor edits Note: The display links to other topics should use the same title as the topic. This is a Google developer doc style guideline. Users can be confident that the have been taked to the correct place. * Drop support for Python 3.7 (#257) Drop support for Python 3.7, and remove it from the tox and CI/CD configurations. Upgrade mypy to avoid python/mypy#13499, and add checks for 'None' to account for newly reported errors. * Bump pre-commit from 2.21.0 to 3.2.2 (#259) Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.21.0 to 3.2.2. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v2.21.0...v3.2.2) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update AWP_ROOT_DOCKER variable (#265) * Update pre-commit dependencies, remove code obsolete with Python 3.7 drop (#258) * Update pre-commit dependencies. * Add and run the `pyupgrade` pre-commit hook. * Remove `TYPE_CHECKING` guards for `numpy.typing`. * Set the minimum requirement for `numpy` to `1.22`. * Add 'build-wheelhouse' job to CI/CD (#264) * Add 'build-wheelhouse' job to CI/CD * Rename build-package to build-library, improve dependencies * Add allow-last-days option to package cleanup * Bump ansys-sphinx-theme from 0.9.7 to 0.9.8 (#266) Bumps [ansys-sphinx-theme](https://github.com/ansys/ansys-sphinx-theme) from 0.9.7 to 0.9.8. - [Release notes](https://github.com/ansys/ansys-sphinx-theme/releases) - [Commits](ansys/ansys-sphinx-theme@v0.9.7...v0.9.8) --- updated-dependencies: - dependency-name: ansys-sphinx-theme dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: janvonrickenbach <[email protected]> * Bump numpy from 1.22.0 to 1.24.3 (#267) Bumps [numpy](https://github.com/numpy/numpy) from 1.22.0 to 1.24.3. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](numpy/numpy@v1.22.0...v1.24.3) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: janvonrickenbach <[email protected]> * Bump pre-commit from 3.2.2 to 3.3.1 (#271) Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.2.2 to 3.3.1. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v3.2.2...v3.3.1) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ansys-sphinx-theme from 0.9.8 to 0.9.9 (#273) Bumps [ansys-sphinx-theme](https://github.com/ansys/ansys-sphinx-theme) from 0.9.8 to 0.9.9. - [Release notes](https://github.com/ansys/ansys-sphinx-theme/releases) - [Commits](ansys/ansys-sphinx-theme@v0.9.8...v0.9.9) --- updated-dependencies: - dependency-name: ansys-sphinx-theme dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Adapt to organization rename from 'pyansys' to 'ansys' (#276) Change the following references: - `github.com/pyansys` -> `github.com/ansys` - `ghcr.io/pyansys` -> `ghcr.io/ansys` - `pyansys/actions` -> `ansys/actions` - `https://codecov.io/gh/pyansys/pydpf-composites` -> `https://codecov.io/gh/ansys/pydpf-composites` * Adapt to change in Axes with maptlotlib==3.7.1 (#263) Bump matplotlib to ``3.7.1`` in ``poetry.lock``. The matplotlib 'Axes' class no longer inherits from 'SubplotBase' since matplotlib/matplotlib#23573. This breaks the '_get_subplot' method in 'sampling_point.py' which checks if the passed 'axes_obj' is a 'SubplotBase' instance to distinguish between indexable and non-indexable objects. To fix this, we now use a try-except block to index into the 'axes_obj', and catch the 'TypeError' that is raised if it is and 'Axes' (as opposed to an array). --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dominik Gresch <[email protected]> * Relax pyvista requirement upper bound (#278) Allow all pyvista versions `<1` to be used. This is required for compatibility with `ansys-fluent-visualization`, which depends on `>=0.39.0`. * Document docker container from customer portal (#277) * Support customer portal docker images and update docs * Remove --server-bin pytest option because it is not working anymore. * Ignore generated result definitions. * Update README.rst * Automatically upload file to server in CompositeModel * Add 2024_1_pre0 to supported directories. * Add show function to show sampling point plots --------- Co-authored-by: Dominik Gresch <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dominik Gresch <[email protected]> Co-authored-by: Federico Negri <[email protected]> Co-authored-by: Kathy Pippert <[email protected]> Co-authored-by: Dominik Gresch <[email protected]>
ansys · May 24, 2023 · 439b8a9 · 439b8a9
1 parent 4944cf5
commit 439b8a9
Show file tree

Hide file tree

Showing 54 changed files with 1,170 additions and 1,104 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -16,7 +16,7 @@ env:
   CONTAINER_TAG: 'latest'
   PACKAGE_NAME: 'ansys-dpf-composites'
   DOCUMENTATION_CNAME: 'composites.dpf.docs.pyansys.com'
-  PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT: "21002"
+  PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT: "50052"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -45,7 +45,7 @@ jobs:
     name: "Documentation style"
     runs-on: ubuntu-latest
     steps:
-      - uses: pyansys/actions/doc-style@v4
+      - uses: ansys/actions/doc-style@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -58,7 +58,7 @@ jobs:
         # docker images on the windows agents. See the issue
         # https://github.com/actions/runner-images/issues/1143
         os: [ubuntu-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
       fail-fast: false
     steps:
       - name: "Login in Github Container registry"
@@ -70,7 +70,7 @@ jobs:
 
       - name: "Pull and start dpf container"
         run:  |
-          docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
+          docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
 
       - name: "Checkout the project"
         uses: actions/checkout@v3
@@ -115,12 +115,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: "Pull and start DPF container"
         run: |
-          docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
+          docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip tox tox-gh-actions
@@ -150,8 +150,8 @@ jobs:
 
       - name: "Pull and start dpf container"
         run: |
-          docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
-          docker run -d --restart always -p 21002:50052 -e ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }} -e ANSYS_DPF_ACCEPT_LA=Y ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
+          docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
+          docker run -d --restart always -p 50052:50052 -e ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }} -e ANSYS_DPF_ACCEPT_LA=Y ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
 
       - name: "Checkout the project"
         uses: actions/checkout@v3
@@ -192,23 +192,40 @@ jobs:
           path: .tox/doc_out/latex/ansys-dpf-composites.pdf
           retention-days: 7
 
-  build-package:
+  build-library:
     name: "Build package"
     runs-on: ubuntu-latest
     needs: [doc-style, doc-build, code-style, tests, tests_minimal_version]
     steps:
       - name: "Build library source and wheel artifacts"
-        uses: pyansys/actions/build-library@v4
+        uses: ansys/actions/build-library@v4
         with:
           library-name: ${{ env.PACKAGE_NAME }}
 
+  build-wheelhouse:
+    name: "Build wheelhouse for latest Python versions"
+    runs-on: ${{ matrix.os }}
+    needs: [doc-style, doc-build, code-style, tests, tests_minimal_version]
+    strategy:
+      matrix:
+          os: [ubuntu-latest, windows-latest]
+          python-version: ['3.8', '3.9', '3.10', '3.11']
+    steps:
+      - name: "Build a wheelhouse of the Python library"
+        uses: ansys/actions/build-wheelhouse@v4
+        with:
+          library-name: "ansys-dpf-composites"
+          library-namespace: "ansys.dpf.composites"
+          operating-system: ${{ matrix.os }}
+          python-version: ${{ matrix.python-version }}
+
   doc-deploy-dev:
     name: "Deploy development documentation"
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
-    needs: [build-package]
+    needs: [build-library, build-wheelhouse]
     steps:
-      - uses: pyansys/actions/doc-deploy-dev@v4
+      - uses: ansys/actions/doc-deploy-dev@v4
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -217,19 +234,19 @@ jobs:
   release:
     name: "Release project"
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
-    needs: [build-package]
+    needs: [build-library, build-wheelhouse]
     runs-on: ubuntu-latest
     steps:
 
       - name: "Release to the public PyPI repository"
-        uses: pyansys/actions/release-pypi-public@v4
+        uses: ansys/actions/release-pypi-public@v4
         with:
           library-name: ${{ env.PACKAGE_NAME }}
           twine-username: "__token__"
           twine-token: ${{ secrets.PYPI_TOKEN }}
 
       - name: "Release to GitHub"
-        uses: pyansys/actions/release-github@v4
+        uses: ansys/actions/release-github@v4
         with:
           library-name: ${{ env.PACKAGE_NAME }}
 
@@ -239,7 +256,7 @@ jobs:
     needs: [release]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
     steps:
-      - uses: pyansys/actions/doc-deploy-stable@v4
+      - uses: ansys/actions/doc-deploy-stable@v4
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -40,7 +40,7 @@ jobs:
     # Label based on branch name
     - uses: actions-ecosystem/action-add-labels@v1
       if: |
-        startsWith(github.event.pull_request.head.ref, 'doc') || 
+        startsWith(github.event.pull_request.head.ref, 'doc') ||
         startsWith(github.event.pull_request.head.ref, 'docs')
       with:
         labels: documentation
@@ -70,16 +70,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Suggest to add labels
-      uses: peter-evans/create-or-update-comment@v2
+      uses: peter-evans/create-or-update-comment@v3
       # Execute only when no labels have been applied to the pull request
       if: toJSON(github.event.pull_request.labels.*.name) == '{}'
       with:
         issue-number: ${{ github.event.pull_request.number }}
         body: |
           Please add one of the following labels to add this contribution to the Release Notes :point_down:
-          - [bug](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Abug+)
-          - [documentation](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Adocumentation+)
-          - [enhancement](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Aenhancement+)
-          - [good first issue](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Agood+first+issue)
-          - [maintenance](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Amaintenance+)
-          - [release](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Arelease+)
+          - [bug](https://github.com/ansys/pydpf-composites/pulls?q=label%3Abug+)
+          - [documentation](https://github.com/ansys/pydpf-composites/pulls?q=label%3Adocumentation+)
+          - [enhancement](https://github.com/ansys/pydpf-composites/pulls?q=label%3Aenhancement+)
+          - [good first issue](https://github.com/ansys/pydpf-composites/pulls?q=label%3Agood+first+issue)
+          - [maintenance](https://github.com/ansys/pydpf-composites/pulls?q=label%3Amaintenance+)
+          - [release](https://github.com/ansys/pydpf-composites/pulls?q=label%3Arelease+)
diff --git a/.github/workflows/package_cleanup.yml b/.github/workflows/package_cleanup.yml
@@ -14,7 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Delete untagged package versions"
-        uses: pyansys/actions/hk-package-clean-untagged@v4
+        uses: ansys/actions/hk-package-clean-untagged@v4
         with:
           package-name: 'pydpf-composites'
+          allow-last-days: '14'
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -157,6 +157,9 @@ cython_debug/
 
 # End of https://www.toptal.com/developers/gitignore/api/python
 
+# VSCode
+.vscode/
+
 # Generated sphinx gallery
 doc/source/examples/gallery_examples
 
@@ -165,4 +168,7 @@ doc/source/api/_autosummary
 
 # testing server logs
 tests/logs/*_log_err*.txt
-tests/logs/*_log_out*.txt
+tests/logs/*_log_out*.txt
+
+# Generated result_definitions in tests
+tests/data/*/result_definition.json
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,22 +1,28 @@
 repos:
 
 - repo: https://github.com/psf/black
-  rev: 22.12.0  # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
+  rev: 23.3.0  # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
   hooks:
   - id: black
 
 - repo: https://github.com/adamchainz/blacken-docs
   rev: 1.13.0
   hooks:
   - id: blacken-docs
-    additional_dependencies: [black==22.12.0]
+    additional_dependencies: [black==23.3.0]
     exclude: "^tests/"
 
 - repo: https://github.com/pycqa/isort
   rev: 5.12.0
   hooks:
   - id: isort
 
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.3.1
+  hooks:
+  - id: pyupgrade
+    args: [--py38-plus]
+
 - repo: https://github.com/PyCQA/flake8
   rev: 6.0.0
   hooks:
@@ -30,10 +36,11 @@ repos:
     exclude: "^(tests/|examples/)"
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.2
+  rev: v2.2.4
   hooks:
   - id: codespell
     additional_dependencies: ['tomli'] # needed to parse pyproject.toml
+    exclude: '^poetry\.lock$'
 
 - repo: local
   hooks: