Skip to content

Commit b6c79ea

Browse files
authored
Merge pull request #87 from bsipocz/CI_enable_all_euclid
CI: add back euclid tutorials to testing
2 parents 657538f + a006668 commit b6c79ea

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

conf.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@
5656

5757
if 'CI' in os.environ:
5858
# Both NEOWISE parquet notebooks work with large data that doesn't work within CircleCI or GHA resource limits
59-
# Some Euclid notebooks are also hitting limits on both platforms
6059
nb_execution_excludepatterns += ['neowise-source-table-strategies.md',
61-
'neowise-source-table-lightcurves.md',
62-
'1_Euclid_intro_MER_images.md', '5_Euclid_intro_SPE_catalog.md']
60+
'neowise-source-table-lightcurves.md',]
6361

6462
if platform.platform().startswith("mac") or platform.platform().startswith("win"):
6563
# The way the notebooks use the multiprocessing module is known to not work on non-Linux

ignore_gha_testing

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
tutorials/parquet-catalog-demos/neowise-source-table-lightcurves
22
tutorials/parquet-catalog-demos/neowise-source-table-strategies
3-
tutorials/euclid_access/1_Euclid_intro_MER_images
4-
tutorials/euclid_access/5_Euclid_intro_SPE_catalog

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ setenv =
1212
FIREFLY_URL = https://irsa.ipac.caltech.edu/irsaviewer # fallback url for firefly notebooks if not defined in code
1313
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simple https://pypi.anaconda.org/astropy/simple
1414

15-
passenv = CI, CIRCLECI, GITHUB_EVENT_NAME
15+
passenv = CI, CIRCLECI, GITHUB_EVENT_NAME, GITHUB_EVENT_PATH
1616

1717
deps =
1818
# We use these files to specify all the dependencies, and below we override
@@ -53,7 +53,7 @@ commands =
5353
!buildhtml: bash -c 'if [[ $CI == true ]]; then cat ignore_gha_testing >> ignore_testing; fi'
5454

5555
# We only want to run CI in PRs for the notebooks we touched
56-
!buildhtml: bash -c 'if [[ $GITHUB_EVENT_NAME == pull_request ]]; 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 '
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 '
5757

5858
!buildhtml: pytest --nbval-lax -vv --suppress-no-test-exit-code --durations=10 tutorials
5959
buildhtml: sphinx-build -b html . _build/html -D nb_execution_mode=auto -nWT --keep-going

0 commit comments

Comments
 (0)