Skip to content

Commit

Permalink
[CI] Check reqs (mne-tools#139)
Browse files Browse the repository at this point in the history
* Check reqs
* Copy paste from mne

---------

Signed-off-by: Adam Li <adam2392@gmail.com>
Co-authored-by: Daniel McCloy <dan@mccloy.info>
  • Loading branch information
adam2392 and drammock authored May 2, 2023
1 parent 124dc15 commit 8a80033
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 108 deletions.
14 changes: 9 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
name: Set BASH_ENV
command: |
set -e
./tools/setup_xvfb.sh
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/setup_xvfb.sh -o setup_xvfb.sh
chmod +x setup_xvfb.sh
./setup_xvfb.sh
sudo apt install -qq graphviz optipng python3.10-venv python3-venv libxft2 ffmpeg
python3.10 -m venv ~/python_env
echo "set -e" >> $BASH_ENV
Expand Down Expand Up @@ -70,22 +72,24 @@ jobs:
- pip-cache
- restore_cache:
keys:
- user-install-bin-cachev1
- user-install-bin-cache-310

- run:
name: Get Python running and install dependencies
command: |
./tools/circleci_dependencies.sh
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/circleci_dependencies.sh -o circleci_dependencies.sh
chmod +x circleci_dependencies.sh
./circleci_dependencies.sh
- save_cache:
key: pip-cache
paths:
- ~/.cache/pip

- save_cache:
key: user-install-bin-cachev1
key: user-install-bin-cache-310
paths:
- ~/.local/lib/python3.8/site-packages
- ~/.local/lib/python3.10/site-packages
- ~/.local/bin

# Look at what we have and fail early if there is some library conflict
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/linux_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ jobs:
PYTHON_VERSION: '3.9'
steps:
- uses: actions/checkout@v2
- run: ./tools/setup_xvfb.sh
- run: |
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/setup_xvfb.sh -o setup_xvfb.sh
chmod +x setup_xvfb.sh
./setup_xvfb.sh
name: 'Setup xvfb'
- uses: conda-incubator/setup-miniconda@v2
with:
Expand All @@ -39,7 +42,9 @@ jobs:
- shell: bash -el {0}
run: |
conda activate mne
source tools/get_minimal_commands.sh
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/get_minimal_commands.sh -o get_minimal_commands.sh
chmod +x get_minimal_commands.sh
source ./get_minimal_commands.sh
pip install -r requirements_testing.txt
name: 'Install dependencies'

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ jobs:
# with:
# path: ~/.cache/pip
# key: ${{ hashFiles('setup.py') }}-${{ hashFiles('test-requirements.txt') }}-${{ hashFiles('requirements.txt') }}
- run: ./tools/setup_xvfb.sh
- run: |
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/setup_xvfb.sh -o setup_xvfb.sh
chmod +x setup_xvfb.sh
./setup_xvfb.sh
name: 'Setup xvfb'
if: runner.os == 'Linux'
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -132,7 +135,10 @@ jobs:
# path: ~/.cache/pip
# key: ${{ hashFiles('setup.py') }}-${{ hashFiles('test-requirements.txt') }}-${{ hashFiles('requirements.txt') }}

- run: ./tools/setup_xvfb.sh
- run: |
curl https://raw.githubusercontent.com/mne-tools/mne-python/main/tools/setup_xvfb.sh -o setup_xvfb.sh
chmod +x setup_xvfb.sh
./setup_xvfb.sh
name: 'Setup xvfb'
if: runner.os == 'Linux'
Expand Down
7 changes: 4 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ dependencies:
- statsmodels
- joblib
- vtk>=9.0.1
- pyvista>=0.32
- pyvista>=0.32,!=0.35.2,!=0.38.0,!=0.38.1,!=0.38.2,!=0.38.3,!=0.38.4,!=0.38.5
- pyvistaqt>=0.4
- pyqt!=5.15.3
- mne>=1.0
- qtpy
- pyqt!=5.15.3,!=5.15.4
- mne>=1.3
- h5netcdf
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ h5netcdf
tqdm
matplotlib
qtpy
PySide6!=6.3.0,!=6.4.0,!=6.4.0.1
PySide6!=6.3.0,!=6.4.0,!=6.4.0.1,!=6.5.0 # incompat with Matplotlib 3.6.1 and qtpy
sip
pyvista>=0.30
pyvistaqt>=0.4
Expand Down
4 changes: 2 additions & 2 deletions requirements_doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ sphinx-issues
numpydoc
nibabel
nilearn
https://github.com/pydata/pydata-sphinx-theme/archive/cef3e724e15852fc2a84bee256c457c9497834b8.zip
pydata_sphinx_theme==0.13.1
typing-extensions
sphinx-autodoc-typehints
sphinxcontrib-bibtex
https://github.com/mne-tools/mne-bids/archive/main.zip
git+https://github.com/mne-tools/mne-bids@main
pooch
mne-qt-browser
2 changes: 1 addition & 1 deletion requirements_testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ twine
wheel
statsmodels
scikit-learn
https://github.com/mne-tools/mne-bids/archive/main.zip
git+https://github.com/mne-tools/mne-bids@main
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@
'sip',
'pyvista',
'pyvistaqt',
'pyqt5'],
'pyqt5',
'h5netcdf',
'pyside6',
],
'tests': [
'pytest',
'pytest-cov',
Expand Down
12 changes: 0 additions & 12 deletions tools/circleci_dependencies.sh

This file was deleted.

64 changes: 0 additions & 64 deletions tools/get_minimal_commands.sh

This file was deleted.

15 changes: 0 additions & 15 deletions tools/setup_xvfb.sh

This file was deleted.

0 comments on commit 8a80033

Please sign in to comment.