Skip to content

Commit d52b886

Browse files
committed
Merge remote-tracking branch 'origin/main' into refactor/launcher
2 parents e549887 + 8be236d commit d52b886

File tree

86 files changed

+390
-270
lines changed

Some content is hidden

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

86 files changed

+390
-270
lines changed

.ci/collect_mapdl_logs_locals.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cp *apdl.out ./"$LOG_NAMES"/ || echo "No APDL log files could be found"
77
cp *pymapdl.apdl ./"$LOG_NAMES"/ || echo "No PYMAPDL APDL log files could be found"
88

99
echo "Copying the profiling files..."
10-
cp prof ./"$LOG_NAMES"/prof || echo "No profile files could be found"
10+
cp -r prof ./"$LOG_NAMES"/prof || echo "No profile files could be found"
1111

1212

1313
ls -la ./"$LOG_NAMES"

.ci/collect_mapdl_logs_remote.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cp mapdl_launch_0.log ./"$LOG_NAMES"/mapdl_launch_0.log || echo "MAPDL launch do
3636
cp mapdl_launch_1.log ./"$LOG_NAMES"/mapdl_launch_1.log || echo "MAPDL launch docker log not found."
3737

3838
echo "Copying the profiling files..."
39-
cp prof ./"$LOG_NAMES"/prof || echo "No profile files could be found"
39+
cp -r prof ./"$LOG_NAMES"/prof || echo "No profile files could be found"
4040

4141
echo "Collecting file structure..."
4242
ls -R > ./"$LOG_NAMES"/files_structure.txt || echo "Failed to copy file structure to a file"

.ci/requirements_minimal.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
pyfakefs==5.7.2
22
pytest-cov==6.0.0
3+
pytest-profiling==1.8.1
34
pytest-random-order==1.1.1
45
pytest-rerunfailures==15.0
56
pytest-timeout==2.3.1

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ci:
1414
repos:
1515

1616
- repo: https://github.com/ansys/pre-commit-hooks
17-
rev: v0.4.4
17+
rev: v0.5.1
1818
hooks:
1919
- id: add-license-headers
2020
args:

doc/changelog.d/3662.fixed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/3663.miscellaneous.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/3664.added.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/3665.fixed.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/3666.added.md

Lines changed: 1 addition & 0 deletions

doc/changelog.d/3670.dependencies.md

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)