Skip to content

Commit

Permalink
CI: Use recent Python image to build packages
Browse files Browse the repository at this point in the history
Similarly to nipreps/fmriprep#1790, we are changing to the Python
3.7+ docker image to test and deploy the Pypi package since twine has
stopped support for python <3.6 since their latest relase 2.0.
  • Loading branch information
oesteban authored and NPann committed Dec 11, 2019
1 parent dc57873 commit dbca2c6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ jobs:
- run:
name: Start virtual environment
command: |
sudo python -m pip install "setuptools>=30.3.0" "pip>=10.0.1" twine docutils numpy nipy
sudo python -m pip install "setuptools>=30.3.0" "pip>=10.0.1" twine docutils
python -m venv /tmp/venv
source /tmp/venv/bin/activate
- run:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
'numpy',
'scipy',
'sklearn',
'statsmodel',
'statsmodels',
'nipype',
'niworkflows.interfaces.registration',
'niworkflows.interfaces',
Expand Down
5 changes: 1 addition & 4 deletions mriqc/qc/anatomical.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@
import scipy.ndimage as nd
from scipy.stats import kurtosis # pylint: disable=E0611

from io import open # pylint: disable=W0622
from builtins import zip, range # pylint: disable=W0622
from six import string_types

DIETRICH_FACTOR = 1.0 / sqrt(2 / (4 - pi))
FSL_FAST_LABELS = {'csf': 1, 'gm': 2, 'wm': 3, 'bg': 0}
Expand Down Expand Up @@ -621,7 +618,7 @@ def _prepare_mask(mask, label, erode=True):
fgmask = mask.copy()

if np.issubdtype(fgmask.dtype, np.integer):
if isinstance(label, string_types):
if isinstance(label, (str, bytes)):
label = FSL_FAST_LABELS[label]

fgmask[fgmask != label] = 0
Expand Down
10 changes: 6 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,14 @@ install_requires =
matplotlib
nibabel >= 2.2.1
nilearn >= 0.2.6, != 0.5.0, != 0.5.1
nipy
nipype >= 1.1.1
nitime
niworkflows ~= 0.10.3rc1
numpy
pandas>=0.21.0
pybids ~= 0.9.2
scikit-image
scikit-learn>=0.19.0
scipy
seaborn
six
statsmodels
svgutils
templateflow ~= 0.4.1
Expand Down Expand Up @@ -86,9 +82,15 @@ docs =
notebook =
ipython
jupyter
nipy
notebooks =
%(notebook)s

other =
scikit-image
others =
%(other)s

test =
coverage
mock
Expand Down

0 comments on commit dbca2c6

Please sign in to comment.