diff --git a/.circleci/config.yml b/.circleci/config.yml index 6618188621b..f2d9b6837c8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,59 +21,6 @@ _check_skip: &check_skip circleci-agent step halt; fi -jobs: - pytest-macos-arm64: - parameters: - scheduled: - type: string - default: "false" - macos: - xcode: "14.2.0" - resource_class: macos.m1.medium.gen1 - environment: - HOMEBREW_NO_AUTO_UPDATE: 1 - steps: - - checkout - - run: - <<: *check_skip - - run: - name: Install Python and dependencies - command: | - set -eo pipefail - brew install python@3.11 - which python - which pip - pip install --upgrade pip - pip install --upgrade --only-binary "numpy,scipy,dipy,statsmodels" -ve .[full,test_extra] - # 3D too slow on Apple's software renderer, and numba causes us problems - pip uninstall -y vtk pyvista pyvistaqt numba - mkdir -p test-results - echo "set -eo pipefail" >> $BASH_ENV - - run: - command: mne sys_info - - run: - command: ./tools/get_testing_version.sh && cat testing_version.txt - - restore_cache: - keys: - - data-cache-testing-{{ checksum "testing_version.txt" }} - - run: - command: python -c "import mne; mne.datasets.testing.data_path(verbose=True)" - - save_cache: - key: data-cache-testing-{{ checksum "testing_version.txt" }} - paths: - - ~/mne_data/MNE-testing-data # (2.5 G) - - run: - command: pytest -m "not slowtest" --tb=short --cov=mne --cov-report xml -vv mne - - run: - name: Prepare test data upload - command: cp -av junit-results.xml test-results/junit.xml - - store_test_results: - path: ./test-results - # Codecov orb has bugs on macOS (gpg issues) - # - codecov/upload - - run: - command: bash <(curl -s https://codecov.io/bash) - build_docs: parameters: scheduled: @@ -591,20 +538,6 @@ workflows: only: - main - weekly: - jobs: - - pytest-macos-arm64: - name: pytest_macos_arm64_weekly - scheduled: "true" - triggers: - - schedule: - # "At 6:00 AM GMT every Monday" - cron: "0 6 * * 1" - filters: - branches: - only: - - main - monthly: jobs: - linkcheck: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 396f03803f3..ef83b3289af 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,24 +55,27 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest - python: '3.11' - kind: pip-pre - - os: ubuntu-latest + # - os: ubuntu-latest + # python: '3.11' + # kind: pip-pre + # - os: ubuntu-latest + # python: '3.12' + # kind: conda + # - os: macos-latest + # python: '3.11' + # kind: mamba + # - os: windows-latest + # python: '3.10' + # kind: mamba + # - os: ubuntu-latest + # python: '3.9' + # kind: minimal + # - os: ubuntu-20.04 + # python: '3.9' + # kind: old + - os: macos-14 python: '3.12' - kind: conda - - os: macos-latest - python: '3.11' kind: mamba - - os: windows-latest - python: '3.10' - kind: mamba - - os: ubuntu-latest - python: '3.9' - kind: minimal - - os: ubuntu-20.04 - python: '3.9' - kind: old steps: - uses: actions/checkout@v4 with: @@ -104,6 +107,9 @@ jobs: mamba fmt!=10.2.0 if: ${{ !startswith(matrix.kind, 'pip') }} + # Make sure we have the right Python + - run: python -c "import platform; platform.machine() == "arm64", platform.machine()" + if: matrix.os == 'macos-14' - run: ./tools/github_actions_dependencies.sh # Minimal commands on Linux (macOS stalls) - run: ./tools/get_minimal_commands.sh