diff --git a/ignore_tutorials/ignore_circleci_testing b/ignore_tutorials/ignore_circleci_testing index 390533ae..e33baa3f 100644 --- a/ignore_tutorials/ignore_circleci_testing +++ b/ignore_tutorials/ignore_circleci_testing @@ -1,13 +1,7 @@ -# ignore these 10 now as excluding execution for these is a combination that passes JB2 building on CircleCI. +# ignore these as they run out of resources on CircleCI. # 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. # +tutorials/simulated_data/roman_hlss_number_density +tutorials/simulated_data/openuniverse2024_roman_simulated_timedomainsurvey tutorials/euclid/euclid-cloud-access -tutorials/simulated-data/cosmoDC2_TAP_access -tutorials/simulated-data/openuniverse2024_roman_simulated_timedomainsurvey -tutorials/simulated-data/openuniverse2024_roman_simulated_wideareasurvey -tutorials/simulated-data/roman_hlss_number_density tutorials/techniques-and-tools/cloud-access-intro -tutorials/techniques-and-tools/Parallelize_Convolution -tutorials/wise/neowise-source-table-lightcurves -tutorials/wise/neowise-source-table-strategies -tutorials/wise/wise-allwise-catalog-demo diff --git a/tox.ini b/tox.ini index 956bd8fd..12a970bb 100644 --- a/tox.ini +++ b/tox.ini @@ -70,7 +70,9 @@ commands = bash -c 'find tutorials -name "*md" | xargs grep kernelspec: | awk -F :kernelspec: "{print \$1}" > all_tutorials' # Make a list of the tutorials changed, we only need this in CI. Also deal with grep's non-zero exit code. Deleted files are ignored. - bash -c 'if [[ $CI == true ]]; then git fetch origin main --depth=1; git diff origin/main --name-only --diff-filter=d tutorials | (grep ".md" || true); fi > changed_tutorials' + # bash -c 'if [[ $CI == true ]]; then git fetch origin main --depth=1; git diff origin/main --name-only --diff-filter=d tutorials | (grep ".md" || true); fi > changed_tutorials' + + bash -c 'cat all_tutorials > changed_tutorials' # We only skip testing untouched tutorials in PRs; in cron and dispatch all should be tested. Make sure we don't jupytext non-notebook files. !buildhtml: bash -c 'if [[ $GITHUB_EVENT_NAME == pull_request && -z "$(grep force_run:all_tests ${GITHUB_EVENT_PATH})" ]]; then grep -f changed_tutorials all_tutorials; else cat all_tutorials; fi | grep -vf ignore_testing | xargs jupytext --to notebook '