Skip to content

Commit 08e00f7

Browse files
committed
MAINT: reprganize ignore testing files
1 parent fcd49b4 commit 08e00f7

File tree

10 files changed

+29
-20
lines changed

10 files changed

+29
-20
lines changed

ignore_circleci_testing

Lines changed: 0 additions & 9 deletions
This file was deleted.

ignore_osx_testing

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# ignore these 10 now as excluding execution for these is a combination that passes JB2 building on CircleCI.
2+
# Note that the first 2 are excluded for all kinds of testing; while the parallelize causes issues for GHA JB2 builds and non linux testing, too.
3+
#
4+
tutorials/parquet-catalog-demos/neowise-source-table-lightcurves
5+
tutorials/parquet-catalog-demos/neowise-source-table-strategies
6+
tutorials/parallelize/Parallelize_Convolution
7+
tutorials/roman_simulations/roman_hlss_number_density
8+
tutorials/cosmodc2/cosmoDC2_TAP_access
9+
tutorials/openuniversesims/openuniverse2024_roman_simulated_timedomainsurvey
10+
tutorials/openuniversesims/openuniverse2024_roman_simulated_wideareasurvey
11+
tutorials/parquet-catalog-demos/wise-allwise-catalog-demo
12+
tutorials/cloud_access/euclid-cloud-access
13+
tutorials/cloud_access/cloud-access-intro
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# Both NEOWISE parquet notebooks work with large data that doesn't work within CircleCI or GHA resource limits
12
tutorials/parquet-catalog-demos/neowise-source-table-lightcurves
23
tutorials/parquet-catalog-demos/neowise-source-table-strategies
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# The way the notebooks use the multiprocessing module is known to not work on non-Linux
2+
tutorials/parallelize/Parallelize_Convolution
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Runs out of memory on GHA using the JB2 stack
2-
tutorials/parallelize/Parallelize_Convolution.md
2+
tutorials/parallelize/Parallelize_Convolution
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# The way the notebooks use the multiprocessing module is known to not work on non-Linux
2+
tutorials/parallelize/Parallelize_Convolution

ignore_windows_testing

Lines changed: 0 additions & 1 deletion
This file was deleted.

tox.ini

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,19 @@ allowlist_externals = bash, jupyter-book
4343
commands =
4444
pip freeze
4545

46-
# Ignore testing the tutorials listed in ignore_testing file. We have some OS specific ignores,
47-
# too due to issues with e.g. multiprocessing and problems in upstream dependency
48-
bash -c 'if python -c "import platform; print(platform.platform())" | grep -i macos; then cat ignore_osx_testing >> ignore_testing; fi'
49-
bash -c 'if python -c "import platform; print(platform.platform())" | grep -i win; then cat ignore_windows_testing >> ignore_testing; fi'
50-
bash -c 'if [[ $CI == true ]]; then cat ignore_gha_testing >> ignore_testing; fi'
51-
bash -c 'if [[ $CIRCLECI == true ]]; then cat ignore_circleci_testing >> ignore_testing; fi'
46+
# Ignore some tutorials for various types of testing. The individual lists are stored in the `ignore_tutorials`
47+
# directory and are documented about the specific reasons of them included in the ignores. These files are kept under version control.
48+
# The files `ignore_testing` and `ignore_execution` are generated during the CI jobs and are not under version control.
49+
bash -c 'cat ignore_tutorials/ignore_all_testing >> ignore_testing'
50+
bash -c 'if python -c "import platform; print(platform.platform())" | grep -i macos; then cat ignore_tutorials/ignore_osx_testing >> ignore_testing; fi'
51+
bash -c 'if python -c "import platform; print(platform.platform())" | grep -i win; then cat ignore_tutorials/ignore_windows_testing >> ignore_testing; fi'
52+
bash -c 'if [[ $CI == true ]]; then cat ignore_tutorials/ignore_gha_testing >> ignore_testing; fi'
53+
bash -c 'if [[ $CIRCLECI == true ]]; then cat ignore_tutorials/ignore_circleci_testing >> ignore_testing; fi'
5254

53-
buildhtml: bash -c "cat ignore_rendenring >> ignore_testing"
55+
buildhtml: bash -c 'cat ignore_tutorials/ignore_rendenring >> ignore_testing'
5456

5557
# We only want to run CI in PRs for the notebooks we touched
56-
!buildhtml: bash -c 'if [[ $GITHUB_EVENT_NAME == pull_request && -z "$(grep force_run:all_tests ${GITHUB_EVENT_PATH})" ]]; then git fetch origin main --depth=1; git diff origin/main --name-only tutorials | grep .md; else find tutorials -name "*.md"; fi | grep -vf ignore_testing | xargs jupytext --to notebook '
58+
!buildhtml: bash -c 'if [[ $GITHUB_EVENT_NAME == pull_request && -z "$(grep force_run:all_tests ${GITHUB_EVENT_PATH})" ]]; then git fetch origin main --depth=1; git diff origin/main --name-only tutorials | grep .md; else find tutorials -name "*.md"; fi | grep -vf ignore_testing/ignore_testing | xargs jupytext --to notebook '
5759

5860
!buildhtml: pytest --nbval-lax -vv --suppress-no-test-exit-code --durations=10 tutorials
5961

0 commit comments

Comments
 (0)