Skip to content

Commit 1ccd70b

Browse files
authored
Merge pull request #3062 from effigies/mnt/drop_34
MNT: Drop Python 3.4 support
2 parents 7d310dd + aadc37a commit 1ccd70b

File tree

2 files changed

+1
-33
lines changed

2 files changed

+1
-33
lines changed

.travis.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,6 @@ env:
3131
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
3232
CI_SKIP_TEST=1
3333

34-
# Python 3.4 is only available on Trusty, so we need to duplicate the
35-
# env matrix specifically for it.
36-
matrix:
37-
include:
38-
- python: 3.4
39-
dist: trusty
40-
env:
41-
- INSTALL_DEB_DEPENDECIES=true
42-
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
43-
CI_SKIP_TEST=1
44-
- python: 3.4
45-
dist: trusty
46-
env:
47-
- INSTALL_DEB_DEPENDECIES=false
48-
NIPYPE_EXTRAS="doc,tests,profiler"
49-
CI_SKIP_TEST=1
50-
- python: 3.4
51-
dist: trusty
52-
env:
53-
- INSTALL_DEB_DEPENDECIES=true
54-
NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
55-
CI_SKIP_TEST=1
56-
- python: 3.4
57-
dist: trusty
58-
env:
59-
- INSTALL_DEB_DEPENDECIES=true
60-
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
61-
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
62-
CI_SKIP_TEST=1
63-
6434
addons:
6535
apt:
6636
packages:

nipype/info.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ def get_nipype_gitversion():
5555
'Operating System :: MacOS :: MacOS X',
5656
'Operating System :: POSIX :: Linux',
5757
'Programming Language :: Python :: 2.7',
58-
'Programming Language :: Python :: 3.4',
5958
'Programming Language :: Python :: 3.5',
6059
'Programming Language :: Python :: 3.6',
6160
'Programming Language :: Python :: 3.7',
6261
'Topic :: Scientific/Engineering'
6362
]
64-
PYTHON_REQUIRES = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*"
63+
PYTHON_REQUIRES = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, != 3.4.*"
6564

6665
description = 'Neuroimaging in Python: Pipelines and Interfaces'
6766

@@ -145,7 +144,6 @@ def get_nipype_gitversion():
145144
'funcsigs',
146145
'future>=%s' % FUTURE_MIN_VERSION,
147146
'futures; python_version == "2.7"',
148-
'lxml<4.4.0; python_version == "3.4"',
149147
'networkx>=%s ; python_version >= "3.0"' % NETWORKX_MIN_VERSION,
150148
'networkx>=%s,<=%s ; python_version < "3.0"' % (NETWORKX_MIN_VERSION, NETWORKX_MAX_VERSION_27),
151149
'nibabel>=%s' % NIBABEL_MIN_VERSION,

0 commit comments

Comments
 (0)