diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 083be1f9..38306329 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: - "master" - "dev" # temporarily added - - "t019-exclude-windows-from-ci" + - "364-t020-not-working-under-mac-os" schedule: # Run a cron job once weekly on Monday - cron: "0 3 * * 1" @@ -75,17 +75,22 @@ jobs: run: | PYTEST_ARGS="--nbval-lax --current-env --dist loadscope --numprocesses 2" - # Ignore T019 under Windows, see https://github.com/volkamerlab/teachopencadd/issues/313 PYTEST_IGNORE_T019="--ignore=teachopencadd/talktorials/T019_md_simulation/talktorial.ipynb" + PYTEST_IGNORE_T020="--ignore=teachopencadd/talktorials/T020_md_analysis/talktorial.ipynb" - if [ "$RUNNER_OS" != "Windows" ]; then - # If not Windows, run all - pytest $PYTEST_ARGS teachopencadd/talktorials/ - else - # If Windows, run all but T019 - pytest $PYTEST_ARGS teachopencadd/talktorials/ $PYTEST_IGNORE_T019 + IGNORE="" + + if [ "$RUNNER_OS" == "Windows" ]; then + # Ignore T019 under Windows, see https://github.com/volkamerlab/teachopencadd/issues/313 + IGNORE="$IGNORE $PYTEST_IGNORE_T019" + fi + + if [ "$RUNNER_OS" == "macOS" ]; then + IGNORE="$IGNORE $PYTEST_IGNORE_T019" fi + pytest $PYTEST_ARGS teachopencadd/talktorials/ $IGNORE + format: name: Black runs-on: ubuntu-latest