Skip to content

Commit 572a3ed

Browse files
authored
Merge pull request #2017 from mgxd/maint/py37
MAINT: Bump to 3.7+
2 parents bcb772d + 4118d90 commit 572a3ed

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cache:
66
- $HOME/.cache/pip
77

88
python:
9-
- 3.6
9+
- 3.7
1010

1111
before_install:
1212
- python -m pip install --upgrade pip

docs/installation.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Installation
66

77
There are two ways to get *fMRIPrep* installed:
88

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

5757
If you have a functional installation, then you should obtain the following output. ::
58-
58+
5959
Hello from Docker!
6060
This message shows that your installation appears to be working correctly.
61-
61+
6262
To generate this message, Docker took the following steps:
6363
1. The Docker client contacted the Docker daemon.
6464
1. The Docker daemon pulled the "hello-world" image from the Docker Hub.
@@ -67,19 +67,19 @@ If you have a functional installation, then you should obtain the following outp
6767
executable that produces the output you are currently reading.
6868
1. The Docker daemon streamed that output to the Docker client, which sent it
6969
to your terminal.
70-
70+
7171
To try something more ambitious, you can run an Ubuntu container with:
7272
$ docker run -it ubuntu bash
73-
73+
7474
Share images, automate workflows, and more with a free Docker ID:
7575
https://hub.docker.com/
76-
76+
7777
For more examples and ideas, visit:
7878
https://docs.docker.com/get-started/
7979

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

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

108108

109-
Manually Prepared Environment (Python 3.5+)
109+
Manually Prepared Environment (Python 3.7+)
110110
===========================================
111111

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

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

127127
$ python -m pip install fmriprep
@@ -134,7 +134,7 @@ Check your installation with the ``--version`` argument ::
134134
External Dependencies
135135
---------------------
136136

137-
*fMRIPRep* is written using Python 3.5 (or above), and is based on
137+
*fMRIPRep* is written using Python 3.7 (or above), and is based on
138138
nipype_.
139139

140140
*fMRIPRep* requires some other neuroimaging software tools that are

docs/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ in the *fMRIPrep* distribution.
77

88
All trademarks referenced herein are property of their respective holders.
99

10-
Copyright (c) 2015-2019, the *fMRIPrep* developers and the CRN.
10+
Copyright (c) 2015-2020, the *fMRIPrep* developers and the CRN.
1111
All rights reserved.

fmriprep/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
del get_versions
99

1010
__packagename__ = 'fmriprep'
11-
__copyright__ = 'Copyright 2019, Center for Reproducible Neuroscience, Stanford University'
11+
__copyright__ = 'Copyright 2020, Center for Reproducible Neuroscience, Stanford University'
1212
__credits__ = ('Contributors: please check the ``.zenodo.json`` file at the top-level folder'
1313
'of the repository')
1414
__url__ = 'https://github.com/poldracklab/fmriprep'

setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ classifiers =
1313
Intended Audience :: Science/Research
1414
Topic :: Scientific/Engineering :: Image Recognition
1515
License :: OSI Approved :: BSD License
16-
Programming Language :: Python :: 3.5
17-
Programming Language :: Python :: 3.6
1816
Programming Language :: Python :: 3.7
17+
Programming Language :: Python :: 3.8
1918

2019
[options]
21-
python_requires = >=3.5
20+
python_requires = >=3.7
2221
install_requires =
2322
indexed_gzip >= 0.8.8
2423
nibabel >= 3.0.1

wrapper/fmriprep_docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import subprocess
2121

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

0 commit comments

Comments
 (0)