-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/development' into 434-fast-disor…
…ientation-calculation
- Loading branch information
Showing
30 changed files
with
2,216 additions
and
482 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ stages: | |
################################################################################################### | ||
default: | ||
before_script: | ||
- ${LOCAL_HOME}/bin/queue2 ${CI_JOB_ID} ${TOKEN} | ||
- ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} ${TOKEN} | ||
- source env/DAMASK.sh | ||
- export PATH=${TESTROOT}/bin:${PATH} | ||
- echo Job start:" $(date)" | ||
|
@@ -56,7 +56,7 @@ variables: | |
create_testroot: | ||
stage: prepare | ||
before_script: | ||
- ${LOCAL_HOME}/bin/queue2 ${CI_JOB_ID} ${TOKEN} | ||
- ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} ${TOKEN} | ||
- echo Job start:" $(date)" | ||
script: | ||
- mkdir -p ${TESTROOT} | ||
|
@@ -65,20 +65,33 @@ create_testroot: | |
################################################################################################### | ||
setuptools: | ||
stage: python | ||
tags: | ||
- matesting2-container-runner | ||
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407 | ||
before_script: [] | ||
script: | ||
- sed -i 's/-[[:digit:]]*-.*//' VERSION | ||
- cd python | ||
- python3 -m build --wheel --no-isolation | ||
|
||
pytest: | ||
stage: python | ||
tags: | ||
- matesting2-container-runner | ||
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407 | ||
before_script: [] | ||
script: | ||
- PYTHONPATH=$(pwd)/python:$PYTHONPATH | ||
- cd python | ||
- pytest --basetemp ${TESTROOT}/python -v --cov --damaskroot=${CI_PROJECT_DIR} | ||
- python3 -m pytest -v --cov=damask --cov-report=xml | ||
- coverage report --fail-under=90 --show-missing | ||
|
||
mypy: | ||
stage: python | ||
tags: | ||
- matesting2-container-runner | ||
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407 | ||
before_script: [] | ||
script: | ||
- cd python | ||
- mypy damask | ||
|
@@ -243,7 +256,7 @@ grid_performance: | |
- make -j2 all install | ||
- export PATH=${PWD}/bin:${PATH} | ||
- cd $(mktemp -d) | ||
- git clone -q [email protected].mpie.de:damask/statistics.git . | ||
- git clone -q [email protected]-multiphysics.org:damask/statistics.git . | ||
- ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA} | ||
- > | ||
if [ ${CI_COMMIT_BRANCH} == development ]; then | ||
|
@@ -269,7 +282,7 @@ update_revision: | |
- echo Job start:" $(date)" | ||
script: | ||
- cd $(mktemp -d) | ||
- git clone -q [email protected].mpie.de:damask/DAMASK.git . | ||
- git clone -q [email protected]-multiphysics.org:damask/DAMASK.git . | ||
- git pull | ||
- export VERSION=$(git describe ${CI_COMMIT_SHA}) | ||
- echo ${VERSION:1} > VERSION | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
The following tasks are required for a new release. | ||
Detailed instructions for each step are documented in the [wiki](https://git.damask.mpie.de/damask/DAMASK/-/wikis/releasing). | ||
|
||
1. [ ] Compile changelog | ||
1. [ ] Update repository | ||
1. [ ] Create and upload tarball | ||
1. [ ] Create GitLab release | ||
1. [ ] Update examples repository | ||
1. [ ] Update website | ||
1. Packages | ||
- [ ] Conda package | ||
- [ ] Spack package | ||
- [ ] PyPi package (wheel) | ||
- [ ] Arch Linux (PKGBUILD) | ||
- [ ] Ubuntu (Launchpad) | ||
- Open build service | ||
- [ ] Debian | ||
- [ ] Fedora/Suse | ||
1. [ ] Docker | ||
1. [ ] Send info mail to mailing list |
Submodule PRIVATE
updated
from 131d06 to 890c64
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
# DAMASK - The Düsseldorf Advanced Material Simulation Kit | ||
|
||
- Usage, installation, and support: https://damask.mpie.de | ||
- Code development: https://git.damask.mpie.de | ||
- General inquiries: [email protected] | ||
- Usage, installation, and support: https://damask-multiphysics.org | ||
- Code development: https://git.damask-multiphysics.org | ||
- General inquiries: [email protected] | ||
|
||
|
||
## Repository Locations | ||
|
||
### [git.damask.mpie.de](https://git.damask.mpie.de) | ||
|
||
All code development is centralized in the principal DAMASK code repository hosted at [git.damask.mpie.de](https://git.damask.mpie.de). | ||
All code development is centralized in the principal DAMASK code repository hosted at [git.damask-multiphysics.org](https://git.damask-multiphysics.org). | ||
Access to this GitLab instance requires registration and is granted to anyone with an interest in actively supporting the development of DAMASK. | ||
|
||
### [github.com](https://github.com/damask-multiphysics) | ||
|
||
GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its three top-level branches from [git.damask.mpie.de](https://git.damask.mpie.de). | ||
GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its most relevant branches from [git.damask-multiphysics.org](https://git.damask-multiphysics.org). | ||
|
||
The site is primarily meant to provide a forum for [Discussions](https://github.com/damask-multiphysics/DAMASK/discussions) and [Issues](https://github.com/damask-multiphysics/DAMASK/issues). | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.0.0-10-gcee66f4da | ||
3.0.0-100-g41a50d8c8 |
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.