Skip to content

Commit

Permalink
ENH: 3.7 for conda (mne-tools#5887)
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner authored Jan 29, 2019
1 parent d7fe748 commit 285dffd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ jobs:
- run:
name: Patch Qt
command: |
conda remove --yes qt pyqt matplotlib sip libxcb icu vtk
pip uninstall --yes mayavi vtk
pip install vtk mayavi PyQt5 PyQt5-sip sip matplotlib
conda remove --yes qt pyqt matplotlib sip libxcb icu
pip install PyQt5 PyQt5-sip sip matplotlib
echo "export LD_PRELOAD=~/miniconda/envs/mne/lib/libgobject-2.0.so.0" >> $BASH_ENV
pip install --upgrade "https://api.github.com/repos/nipy/PySurfer/zipball/master"
- save_cache:
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ env:
# TRAVIS_PYTHON_VERSION is only needed for neo's setup.py
# OPENBLAS_NUM_THREADS=1 avoid slowdowns:
# https://github.com/xianyi/OpenBLAS/issues/731
global: PYTHON_VERSION=3.6 DISPLAY=:99.0 MNE_LOGGING_LEVEL=warning TEST_LOCATION=src
global: PYTHON_VERSION=3.7 DISPLAY=:99.0 MNE_LOGGING_LEVEL=warning TEST_LOCATION=src
PIP_DEPENDENCIES="codecov pytest-faulthandler pytest-sugar pytest-timeout nitime"
TRAVIS_PYTHON_VERSION=3.6 CONDA_VERSION=">=4.3.27"
TRAVIS_PYTHON_VERSION=3.7 CONDA_VERSION=">=4.3.27"
OPENBLAS_NUM_THREADS=1

matrix:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ environment:
global:
PYTHON: "C:\\conda"
# CONDA_ENVIRONMENT: "environment.yml"
CONDA_DEPENDENCIES: "python>=3.6 pip mkl numpy scipy matplotlib cython pyqt>=5.9 pandas xlrd scikit-learn h5py pillow statsmodels jupyter pytest pytest-cov joblib psutil numpydoc flake8 spyder numexpr traits>=4.6.0 pyface>=6 traitsui>=6 testpath<0.4"
CONDA_DEPENDENCIES: "python>=3.7 pip mkl numpy scipy matplotlib cython pyqt>=5.9 pandas xlrd scikit-learn h5py pillow statsmodels jupyter pytest pytest-cov joblib psutil numpydoc flake8 spyder numexpr traits>=4.6.0 pyface>=6 traitsui>=6 testpath<0.4"
PIP_DEPENDENCIES: "codecov pytest-sugar pytest-timeout vtk https://api.github.com/repos/enthought/mayavi/zipball/b3fc35218dda9776d8f1a407663bfb49783dca12 PySurfer[save_movie] dipy --only-binary dipy nibabel nilearn neo pytest-faulthandler pytest-mock pydocstyle codespell python-picard"
matrix:
- PYTHON_VERSION: "3.6"
- PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"

install:
Expand Down
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ def reset_warnings(gallery_conf, fname):
warnings.filterwarnings( # needed until SciPy 1.2.0 is released
'ignore', '.*will be interpreted as an array index.*', module='scipy')
for key in ('HasTraits', r'numpy\.testing', 'importlib', r'np\.loads',
'Using or importing the ABCs from', # internal modules on 3.7
r"it will be an error for 'np\.bool_'", # ndimage
"'U' mode is deprecated", # sphinx io
):
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ name: mne
channels:
- defaults
dependencies:
- python>=3.6
- python>=3.7
- pip
- mkl
- numpy
- scipy
- matplotlib
- cython
- pyqt>=5.9
- vtk>=8
- pandas
- xlrd
- scikit-learn
Expand All @@ -34,6 +33,7 @@ dependencies:
- testpath<0.4
- pip:
- mne
- vtk
- https://api.github.com/repos/enthought/mayavi/zipball/b3fc35218dda9776d8f1a407663bfb49783dca12
- PySurfer[save_movie]
- dipy --only-binary dipy
Expand Down

0 comments on commit 285dffd

Please sign in to comment.