Skip to content

Commit 09513f9

Browse files
authored
ENH: Move up to 3.8 (#294)
* ENH: Move up to 3.8 * FIX: Newer * FIX: Newer
1 parent 1afce4b commit 09513f9

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

.travis.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: c
22
sudo: false
3-
dist: xenial
3+
dist: bionic
44
services:
55
- xvfb
66
env:
7-
global: PYTHON_VERSION=3.7
8-
CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt>=5.9 coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
7+
global: PYTHON_VERSION=3.8
8+
CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
99
PIP_DEPENDENCIES="codecov pytest-sugar pytest-faulthandler nibabel imageio imageio-ffmpeg"
1010
DISPLAY=:99.0
1111
SUBJECTS_DIR=~/subjects
@@ -18,10 +18,15 @@ matrix:
1818
apt:
1919
packages:
2020
- mencoder
21+
- libosmesa6
22+
- libglx-mesa0
23+
- libopengl0
24+
- libglx0
25+
- libdbus-1-3
2126

2227
# 3.5, no mencoder
2328
- os: linux
24-
env: PYTHON_VERSION=3.5
29+
env: PYTHON_VERSION=3.6
2530
CONDA_DEPENDENCIES="numpy scipy matplotlib coverage pytest pytest-cov flake8"
2631
PIP_DEPENDENCIES="codecov pytest-sugar nibabel imageio imageio-ffmpeg"
2732

@@ -37,14 +42,15 @@ before_install:
3742
fi;
3843
- git clone https://github.com/astropy/ci-helpers.git
3944
- source ci-helpers/travis/setup_conda.sh
40-
- pip install vtk
41-
- pip install mayavi
42-
- mkdir -p $SUBJECTS_DIR
43-
- if [ "${PYTHON_VERSION}" == "3.5" ]; then
44-
pip install "mne<0.21";
45+
- if [ "${PYTHON_VERSION}" == "3.6" ]; then
46+
pip install --only-binary ":all:" "vtk<9";
47+
pip install mayavi;
4548
else
46-
pip install "https://api.github.com/repos/mne-tools/mne-python/zipball/master";
49+
pip install --only-binary ":all:" -f "https://vtk.org/download" "vtk>=9";
50+
pip install https://github.com/enthought/mayavi/zipball/master;
4751
fi;
52+
- mkdir -p $SUBJECTS_DIR
53+
- pip install "https://api.github.com/repos/mne-tools/mne-python/zipball/master";
4854
- python -c "import mne; mne.datasets.fetch_fsaverage(verbose=True)"
4955

5056
install:

doc/install.rst

+1-5
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ install from your local source directory::
3030
Dependencies
3131
~~~~~~~~~~~~
3232

33-
PySurfer works on Python 2.7 and 3.6+.
34-
(Older Python 3 versions will probably work, but are not tested.)
35-
36-
To use PySurfer, you will need to have the following Python packages:
33+
PySurfer works on Python 3.6+ and requires the following Python packages:
3734

3835
* numpy_
3936
* scipy_
@@ -91,4 +88,3 @@ as a static PNG image, or ``'x3d'`` to render it using
9188
If you are having trouble getting started using PySurfer, please describe the problem on the `nipy mailing list`_.
9289

9390
.. include:: links_names.txt
94-

setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
platforms='any',
6767
packages=['surfer', 'surfer.tests'],
6868
scripts=['bin/pysurfer'],
69-
install_requires=['numpy', 'scipy', 'matplotlib', 'nibabel >= 1.2', 'mayavi'],
69+
python_requires='>=3.6',
70+
install_requires=[
71+
'numpy', 'scipy', 'matplotlib', 'nibabel >= 1.2', 'mayavi'],
7072
extras_require={'save_movie': ['imageio >= 1.5']},
7173
)

0 commit comments

Comments
 (0)