Skip to content

Commit

Permalink
Merge pull request #2017 from mgxd/maint/py37
Browse files Browse the repository at this point in the history
MAINT: Bump to 3.7+
  • Loading branch information
effigies authored Mar 3, 2020
2 parents bcb772d + 4118d90 commit 572a3ed
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache:
- $HOME/.cache/pip

python:
- 3.6
- 3.7

before_install:
- python -m pip install --upgrade pip
Expand Down
20 changes: 10 additions & 10 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installation

There are two ways to get *fMRIPrep* installed:

* within a `Manually Prepared Environment (Python 3.5+)`_, also known as
* within a `Manually Prepared Environment (Python 3.7+)`_, also known as
*bare-metal installation*; or
* using container technologies (RECOMMENDED), such as :ref:`run_docker`
or :ref:`run_singularity`.
Expand Down Expand Up @@ -55,10 +55,10 @@ You can check your `Docker Engine`_ installation running their ``hello-world`` i
$ docker run --rm hello-world

If you have a functional installation, then you should obtain the following output. ::

Hello from Docker!
This message shows that your installation appears to be working correctly.

To generate this message, Docker took the following steps:
1. The Docker client contacted the Docker daemon.
1. The Docker daemon pulled the "hello-world" image from the Docker Hub.
Expand All @@ -67,19 +67,19 @@ If you have a functional installation, then you should obtain the following outp
executable that produces the output you are currently reading.
1. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal.

To try something more ambitious, you can run an Ubuntu container with:
$ docker run -it ubuntu bash

Share images, automate workflows, and more with a free Docker ID:
https://hub.docker.com/

For more examples and ideas, visit:
https://docs.docker.com/get-started/

After checking your Docker Engine is capable of running Docker images, then go ahead
and `check out our documentation <docker.html>`_ to run the *fMRIPrep* image.
The list of Docker images ready to use is found at the `Docker Hub`_,
The list of Docker images ready to use is found at the `Docker Hub`_,
under the ``poldracklab/fmriprep`` identifier.

The ``fmriprep-docker`` wrapper
Expand All @@ -106,7 +106,7 @@ Please make sure you `follow our tips and tricks to run fMRIPrep's Singularity i
<singularity.html>`_.


Manually Prepared Environment (Python 3.5+)
Manually Prepared Environment (Python 3.7+)
===========================================

.. warning::
Expand All @@ -121,7 +121,7 @@ A relatively interpretable description of how your environment can be set-up
is found in the `Dockerfile <https://github.com/poldracklab/fmriprep/blob/master/Dockerfile>`_.
As an additional installation setting, FreeSurfer requires a license file (see :ref:`fs_license`).

On a functional Python 3.5 (or above) environment with ``pip`` installed,
On a functional Python 3.7 (or above) environment with ``pip`` installed,
*fMRIPRep* can be installed using the habitual command ::

$ python -m pip install fmriprep
Expand All @@ -134,7 +134,7 @@ Check your installation with the ``--version`` argument ::
External Dependencies
---------------------

*fMRIPRep* is written using Python 3.5 (or above), and is based on
*fMRIPRep* is written using Python 3.7 (or above), and is based on
nipype_.

*fMRIPRep* requires some other neuroimaging software tools that are
Expand Down
2 changes: 1 addition & 1 deletion docs/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ in the *fMRIPrep* distribution.

All trademarks referenced herein are property of their respective holders.

Copyright (c) 2015-2019, the *fMRIPrep* developers and the CRN.
Copyright (c) 2015-2020, the *fMRIPrep* developers and the CRN.
All rights reserved.
2 changes: 1 addition & 1 deletion fmriprep/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
del get_versions

__packagename__ = 'fmriprep'
__copyright__ = 'Copyright 2019, Center for Reproducible Neuroscience, Stanford University'
__copyright__ = 'Copyright 2020, Center for Reproducible Neuroscience, Stanford University'
__credits__ = ('Contributors: please check the ``.zenodo.json`` file at the top-level folder'
'of the repository')
__url__ = 'https://github.com/poldracklab/fmriprep'
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ classifiers =
Intended Audience :: Science/Research
Topic :: Scientific/Engineering :: Image Recognition
License :: OSI Approved :: BSD License
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8

[options]
python_requires = >=3.5
python_requires = >=3.7
install_requires =
indexed_gzip >= 0.8.8
nibabel >= 3.0.1
Expand Down
2 changes: 1 addition & 1 deletion wrapper/fmriprep_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import subprocess

__version__ = '99.99.99'
__copyright__ = 'Copyright 2019, Center for Reproducible Neuroscience, Stanford University'
__copyright__ = 'Copyright 2020, Center for Reproducible Neuroscience, Stanford University'
__credits__ = ['Craig Moodie', 'Ross Blair', 'Oscar Esteban', 'Chris Gorgolewski',
'Shoshana Berleant', 'Christopher J. Markiewicz', 'Russell A. Poldrack']
__bugreports__ = 'https://github.com/poldracklab/fmriprep/issues'
Expand Down

0 comments on commit 572a3ed

Please sign in to comment.