Skip to content

Commit

Permalink
Merge branch 'main' into refactor/annotate-files
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 authored Dec 16, 2024
2 parents 2993179 + b5e482a commit 5204d70
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .ci/build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ for version in "${versions[@]}"; do
fi

# Skipping student versions on auth_user
if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true" ]]; then
echo "Skipping student versions when user is authenticated"
echo ""
continue
fi
# if [[ "$auth_user" == "true" && "$ON_STUDENT" == "true" ]]; then
# echo "Skipping student versions when user is authenticated"
# echo ""
# continue
# fi

# main logic
if [[ "$auth_user" == "true" ]]; then
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
DPF_PORT: 21004
MAPDL_PACKAGE: ghcr.io/ansys/mapdl
ON_CI: True
PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html'
PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html --timeout=40'

BUILD_CHEATSHEET: True

Expand Down Expand Up @@ -615,7 +615,7 @@ jobs:
- id: set-matrix
env:
ONLY_UBUNTU: true
LIMIT_VERSIONS: 3
LIMIT_VERSIONS: 2
ON_SCHEDULE: ${{ github.event_name == 'schedule' }}
ON_WORKFLOW_DISPATCH: ${{ github.event_name == 'workflow_dispatch' }}
RUN_ALL_TEST: ${{ inputs.run_all_tests }}
Expand Down Expand Up @@ -821,7 +821,7 @@ jobs:
- name: "Unit testing requirements installation"
run: |
python -m pip install pytest pytest-rerunfailures pytest-cov pytest-random-order pyfakefs
python -m pip install pytest pytest-rerunfailures pytest-cov pytest-random-order pyfakefs pytest-timeout
- name: "Unit testing"
env:
Expand Down Expand Up @@ -929,7 +929,7 @@ jobs:
- name: "Unit testing requirements installation"
run: |
python -m pip install pytest pytest-rerunfailures pytest-cov pytest-random-order
python -m pip install pytest pytest-rerunfailures pytest-cov pytest-random-order pyfakefs pytest-timeout
- name: "Unit testing"
env:
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/3621.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tests: adding timeout to each test
1 change: 1 addition & 0 deletions doc/changelog.d/3623.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: adding student back
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ tests = [
"pytest-pyvista==0.1.9",
"pytest-random-order==1.1.1",
"pytest-rerunfailures==15.0",
"pytest-timeout==2.3.1",
"pytest==8.3.4",
"scipy==1.14.1",
"vtk==9.3.1",
Expand Down Expand Up @@ -117,7 +118,7 @@ pymapdl_convert_script = "ansys.mapdl.core.cli:old_pymapdl_convert_script_entry_
pymapdl = "ansys.mapdl.core.cli:main"

[tool.pytest.ini_options]
addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10"
addopts = "-rxXsa -vvv --maxfail=10 --random-order-bucket=class --random-order --durations=10 --timeout=40"
junit_family = "legacy"
filterwarnings = [
"ignore::FutureWarning",
Expand Down

0 comments on commit 5204d70

Please sign in to comment.