Skip to content

ENH: Move up to 3.8 #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
language: c
sudo: false
dist: xenial
dist: bionic
services:
- xvfb
env:
global: PYTHON_VERSION=3.7
CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt>=5.9 coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
global: PYTHON_VERSION=3.8
CONDA_DEPENDENCIES="numpy scipy matplotlib pyqt coverage pytest pytest-cov flake8 pygments traits traitsui pyface"
PIP_DEPENDENCIES="codecov pytest-sugar pytest-faulthandler nibabel imageio imageio-ffmpeg"
DISPLAY=:99.0
SUBJECTS_DIR=~/subjects
Expand All @@ -18,10 +18,15 @@ matrix:
apt:
packages:
- mencoder
- libosmesa6
- libglx-mesa0
- libopengl0
- libglx0
- libdbus-1-3

# 3.5, no mencoder
- os: linux
env: PYTHON_VERSION=3.5
env: PYTHON_VERSION=3.6
CONDA_DEPENDENCIES="numpy scipy matplotlib coverage pytest pytest-cov flake8"
PIP_DEPENDENCIES="codecov pytest-sugar nibabel imageio imageio-ffmpeg"

Expand All @@ -37,14 +42,15 @@ before_install:
fi;
- git clone https://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda.sh
- pip install vtk
- pip install mayavi
- mkdir -p $SUBJECTS_DIR
- if [ "${PYTHON_VERSION}" == "3.5" ]; then
pip install "mne<0.21";
- if [ "${PYTHON_VERSION}" == "3.6" ]; then
pip install --only-binary ":all:" "vtk<9";
pip install mayavi;
else
pip install "https://api.github.com/repos/mne-tools/mne-python/zipball/master";
pip install --only-binary ":all:" -f "https://vtk.org/download" "vtk>=9";
pip install https://github.com/enthought/mayavi/zipball/master;
fi;
- mkdir -p $SUBJECTS_DIR
- pip install "https://api.github.com/repos/mne-tools/mne-python/zipball/master";
- python -c "import mne; mne.datasets.fetch_fsaverage(verbose=True)"

install:
Expand Down
6 changes: 1 addition & 5 deletions doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ install from your local source directory::
Dependencies
~~~~~~~~~~~~

PySurfer works on Python 2.7 and 3.6+.
(Older Python 3 versions will probably work, but are not tested.)

To use PySurfer, you will need to have the following Python packages:
PySurfer works on Python 3.6+ and requires the following Python packages:

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

.. include:: links_names.txt

4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
platforms='any',
packages=['surfer', 'surfer.tests'],
scripts=['bin/pysurfer'],
install_requires=['numpy', 'scipy', 'matplotlib', 'nibabel >= 1.2', 'mayavi'],
python_requires='>=3.6',
install_requires=[
'numpy', 'scipy', 'matplotlib', 'nibabel >= 1.2', 'mayavi'],
extras_require={'save_movie': ['imageio >= 1.5']},
)