Skip to content

Commit 439b8a9

Browse files
janvonrickenbachdependabot[bot]greschdFedericoNegriPipKat
authored
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] <support@github.com> 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: janvonrickenbach <jan.vonrickenbach@ansys.com> * 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: janvonrickenbach <jan.vonrickenbach@ansys.com> * 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] <support@github.com> 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] <support@github.com> 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dominik Gresch <dominik.gresch@ansys.com> * 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 <greschd@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dominik Gresch <greschd@users.noreply.github.com> Co-authored-by: Federico Negri <FedericoNegri@users.noreply.github.com> Co-authored-by: Kathy Pippert <84872299+PipKat@users.noreply.github.com> Co-authored-by: Dominik Gresch <dominik.gresch@ansys.com>
1 parent 4944cf5 commit 439b8a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1170
-1104
lines changed

.github/workflows/ci_cd.yml

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
CONTAINER_TAG: 'latest'
1717
PACKAGE_NAME: 'ansys-dpf-composites'
1818
DOCUMENTATION_CNAME: 'composites.dpf.docs.pyansys.com'
19-
PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT: "21002"
19+
PYDPF_COMPOSITES_DOCKER_CONTAINER_PORT: "50052"
2020

2121
concurrency:
2222
group: ${{ github.workflow }}-${{ github.ref }}
@@ -45,7 +45,7 @@ jobs:
4545
name: "Documentation style"
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: pyansys/actions/doc-style@v4
48+
- uses: ansys/actions/doc-style@v4
4949
with:
5050
token: ${{ secrets.GITHUB_TOKEN }}
5151

@@ -58,7 +58,7 @@ jobs:
5858
# docker images on the windows agents. See the issue
5959
# https://github.com/actions/runner-images/issues/1143
6060
os: [ubuntu-latest]
61-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
61+
python-version: ['3.8', '3.9', '3.10', '3.11']
6262
fail-fast: false
6363
steps:
6464
- name: "Login in Github Container registry"
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: "Pull and start dpf container"
7272
run: |
73-
docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
73+
docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
7474
7575
- name: "Checkout the project"
7676
uses: actions/checkout@v3
@@ -115,12 +115,12 @@ jobs:
115115
password: ${{ secrets.GITHUB_TOKEN }}
116116
- name: "Pull and start DPF container"
117117
run: |
118-
docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
118+
docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
119119
- uses: actions/checkout@v3
120120
- name: Set up Python
121121
uses: actions/setup-python@v4
122122
with:
123-
python-version: 3.7
123+
python-version: 3.8
124124
- name: Install dependencies
125125
run: |
126126
python -m pip install --upgrade pip tox tox-gh-actions
@@ -150,8 +150,8 @@ jobs:
150150

151151
- name: "Pull and start dpf container"
152152
run: |
153-
docker pull ghcr.io/pyansys/pydpf-composites:${{ env.CONTAINER_TAG }}
154-
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 }}
153+
docker pull ghcr.io/ansys/pydpf-composites:${{ env.CONTAINER_TAG }}
154+
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 }}
155155
156156
- name: "Checkout the project"
157157
uses: actions/checkout@v3
@@ -192,23 +192,40 @@ jobs:
192192
path: .tox/doc_out/latex/ansys-dpf-composites.pdf
193193
retention-days: 7
194194

195-
build-package:
195+
build-library:
196196
name: "Build package"
197197
runs-on: ubuntu-latest
198198
needs: [doc-style, doc-build, code-style, tests, tests_minimal_version]
199199
steps:
200200
- name: "Build library source and wheel artifacts"
201-
uses: pyansys/actions/build-library@v4
201+
uses: ansys/actions/build-library@v4
202202
with:
203203
library-name: ${{ env.PACKAGE_NAME }}
204204

205+
build-wheelhouse:
206+
name: "Build wheelhouse for latest Python versions"
207+
runs-on: ${{ matrix.os }}
208+
needs: [doc-style, doc-build, code-style, tests, tests_minimal_version]
209+
strategy:
210+
matrix:
211+
os: [ubuntu-latest, windows-latest]
212+
python-version: ['3.8', '3.9', '3.10', '3.11']
213+
steps:
214+
- name: "Build a wheelhouse of the Python library"
215+
uses: ansys/actions/build-wheelhouse@v4
216+
with:
217+
library-name: "ansys-dpf-composites"
218+
library-namespace: "ansys.dpf.composites"
219+
operating-system: ${{ matrix.os }}
220+
python-version: ${{ matrix.python-version }}
221+
205222
doc-deploy-dev:
206223
name: "Deploy development documentation"
207224
if: github.ref == 'refs/heads/main'
208225
runs-on: ubuntu-latest
209-
needs: [build-package]
226+
needs: [build-library, build-wheelhouse]
210227
steps:
211-
- uses: pyansys/actions/doc-deploy-dev@v4
228+
- uses: ansys/actions/doc-deploy-dev@v4
212229
with:
213230
cname: ${{ env.DOCUMENTATION_CNAME }}
214231
token: ${{ secrets.GITHUB_TOKEN }}
@@ -217,19 +234,19 @@ jobs:
217234
release:
218235
name: "Release project"
219236
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
220-
needs: [build-package]
237+
needs: [build-library, build-wheelhouse]
221238
runs-on: ubuntu-latest
222239
steps:
223240

224241
- name: "Release to the public PyPI repository"
225-
uses: pyansys/actions/release-pypi-public@v4
242+
uses: ansys/actions/release-pypi-public@v4
226243
with:
227244
library-name: ${{ env.PACKAGE_NAME }}
228245
twine-username: "__token__"
229246
twine-token: ${{ secrets.PYPI_TOKEN }}
230247

231248
- name: "Release to GitHub"
232-
uses: pyansys/actions/release-github@v4
249+
uses: ansys/actions/release-github@v4
233250
with:
234251
library-name: ${{ env.PACKAGE_NAME }}
235252

@@ -239,7 +256,7 @@ jobs:
239256
needs: [release]
240257
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/v')
241258
steps:
242-
- uses: pyansys/actions/doc-deploy-stable@v4
259+
- uses: ansys/actions/doc-deploy-stable@v4
243260
with:
244261
cname: ${{ env.DOCUMENTATION_CNAME }}
245262
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# Label based on branch name
4141
- uses: actions-ecosystem/action-add-labels@v1
4242
if: |
43-
startsWith(github.event.pull_request.head.ref, 'doc') ||
43+
startsWith(github.event.pull_request.head.ref, 'doc') ||
4444
startsWith(github.event.pull_request.head.ref, 'docs')
4545
with:
4646
labels: documentation
@@ -70,16 +70,16 @@ jobs:
7070
runs-on: ubuntu-latest
7171
steps:
7272
- name: Suggest to add labels
73-
uses: peter-evans/create-or-update-comment@v2
73+
uses: peter-evans/create-or-update-comment@v3
7474
# Execute only when no labels have been applied to the pull request
7575
if: toJSON(github.event.pull_request.labels.*.name) == '{}'
7676
with:
7777
issue-number: ${{ github.event.pull_request.number }}
7878
body: |
7979
Please add one of the following labels to add this contribution to the Release Notes :point_down:
80-
- [bug](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Abug+)
81-
- [documentation](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Adocumentation+)
82-
- [enhancement](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Aenhancement+)
83-
- [good first issue](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Agood+first+issue)
84-
- [maintenance](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Amaintenance+)
85-
- [release](https://github.com/pyansys/pydpf-composites/pulls?q=label%3Arelease+)
80+
- [bug](https://github.com/ansys/pydpf-composites/pulls?q=label%3Abug+)
81+
- [documentation](https://github.com/ansys/pydpf-composites/pulls?q=label%3Adocumentation+)
82+
- [enhancement](https://github.com/ansys/pydpf-composites/pulls?q=label%3Aenhancement+)
83+
- [good first issue](https://github.com/ansys/pydpf-composites/pulls?q=label%3Agood+first+issue)
84+
- [maintenance](https://github.com/ansys/pydpf-composites/pulls?q=label%3Amaintenance+)
85+
- [release](https://github.com/ansys/pydpf-composites/pulls?q=label%3Arelease+)

.github/workflows/package_cleanup.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: "Delete untagged package versions"
17-
uses: pyansys/actions/hk-package-clean-untagged@v4
17+
uses: ansys/actions/hk-package-clean-untagged@v4
1818
with:
1919
package-name: 'pydpf-composites'
20+
allow-last-days: '14'
2021
token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ cython_debug/
157157

158158
# End of https://www.toptal.com/developers/gitignore/api/python
159159

160+
# VSCode
161+
.vscode/
162+
160163
# Generated sphinx gallery
161164
doc/source/examples/gallery_examples
162165

@@ -165,4 +168,7 @@ doc/source/api/_autosummary
165168

166169
# testing server logs
167170
tests/logs/*_log_err*.txt
168-
tests/logs/*_log_out*.txt
171+
tests/logs/*_log_out*.txt
172+
173+
# Generated result_definitions in tests
174+
tests/data/*/result_definition.json

.pre-commit-config.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
repos:
22

33
- repo: https://github.com/psf/black
4-
rev: 22.12.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
4+
rev: 23.3.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
55
hooks:
66
- id: black
77

88
- repo: https://github.com/adamchainz/blacken-docs
99
rev: 1.13.0
1010
hooks:
1111
- id: blacken-docs
12-
additional_dependencies: [black==22.12.0]
12+
additional_dependencies: [black==23.3.0]
1313
exclude: "^tests/"
1414

1515
- repo: https://github.com/pycqa/isort
1616
rev: 5.12.0
1717
hooks:
1818
- id: isort
1919

20+
- repo: https://github.com/asottile/pyupgrade
21+
rev: v3.3.1
22+
hooks:
23+
- id: pyupgrade
24+
args: [--py38-plus]
25+
2026
- repo: https://github.com/PyCQA/flake8
2127
rev: 6.0.0
2228
hooks:
@@ -30,10 +36,11 @@ repos:
3036
exclude: "^(tests/|examples/)"
3137

3238
- repo: https://github.com/codespell-project/codespell
33-
rev: v2.2.2
39+
rev: v2.2.4
3440
hooks:
3541
- id: codespell
3642
additional_dependencies: ['tomli'] # needed to parse pyproject.toml
43+
exclude: '^poetry\.lock$'
3744

3845
- repo: local
3946
hooks:

0 commit comments

Comments
 (0)