Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fem tester update #105

Merged
merged 15 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci-FEM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
python=3.11
code-aster=*=*nompi*
paradoc
python-dotenv
pytest

- name: install latest ada-py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:

jobs:
review:
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-pr-review.yaml@fix/conda-build-control
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-pr-review.yaml@main
secrets:
SOURCE_KEY: ${{ secrets.SOURCE_KEY }}
CONDA_API_TOKEN: ${{ secrets.CONDA_API_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ concurrency:

jobs:
run:
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-pre-release-dispatch.yaml@fix/conda-build-control
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-pre-release-dispatch.yaml@main
with:
release_pypi: ${{ github.event.inputs.release_pypi }}
release_conda: ${{ github.event.inputs.release_conda }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-new-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
release:
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-release.yaml@fix/conda-build-control
uses: AibelDevs/action-toolbox/.github/workflows/default-tool-release.yaml@main
secrets:
SOURCE_KEY: ${{ secrets.SOURCE_KEY }}
CONDA_API_TOKEN: ${{ secrets.CONDA_API_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-on-pr-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ concurrency:
jobs:
release_if_ok:
if: github.event.pull_request.merged == true
uses: AibelDevs/action-toolbox/.github/workflows/tool-generate-semantic-version.yaml@fix/conda-build-control
uses: AibelDevs/action-toolbox/.github/workflows/tool-generate-semantic-version.yaml@main
secrets:
SOURCE_KEY: ${{ secrets.SOURCE_KEY }}
2 changes: 1 addition & 1 deletion action_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ enabled = true
enabled = true
recipe_dir = "./conda"
extra_conda_dep_channels = ["krande"]

platforms = "ubuntu-latest,windows-latest,macos-latest"
# Anaconda Related
use_anaconda_server = true
owner = "Krande"
Expand Down
2 changes: 1 addition & 1 deletion docs/documents/code.rst
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,5 @@ Base Classes
Visualization Classes
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. automodule:: ada.visualize.concept
.. automodule:: ada.visit.concept
:members:
2 changes: 1 addition & 1 deletion docs/documents/fea/fea_software.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ More information [http://www.dhondt.de/](http://www.dhondt.de/)
Code Aster is distributed as a conda-forge package and is now a dependency of `adapy`.
It is currently only supported on Linux.

Work is ongoing to support Windows and Mac.
Work is ongoing to support Windows. See https://github.com/conda-forge/code-aster-feedstock/issues/65 for more information.

More information [https://www.code-aster.org](https://www.code-aster.org/spip.php?rubrique2)

Expand Down
7 changes: 5 additions & 2 deletions environment.dev.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name: ada-dev
channels:
- https://repo.prefix.dev/code-aster
- conda-forge
- krande
dependencies:
- ada-py
- ada-cpp
# - ada-cpp
- paradoc
- code-aster
- occt=*=*novtk*
- trimesh >=4.1.0
- python-dotenv
- pytest
Loading
Loading