Skip to content

Commit a97b067

Browse files
committed
MAINT: Move to setuptools exclusively
1 parent 81e775f commit a97b067

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

nibabel/info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,5 +209,5 @@ def cmp_pkg_version(version_str, pkg_version_str=__version__):
209209
ISRELEASE = _version_extra == ''
210210
VERSION = __version__
211211
PROVIDES = ["nibabel", 'nisext']
212-
REQUIRES = ["numpy (>=%s)" % NUMPY_MIN_VERSION,
212+
REQUIRES = ["numpy>=%s" % NUMPY_MIN_VERSION,
213213
'bz2file; python_version < "3.0"']

nisext/sexts.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ def version_getter(pkg_name):
191191
optional,
192192
dependency)
193193
return
194-
_add_append_key(setuptools_args, 'install_requires', dependency)
195194
return
196195

197196

setup.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@
1919
if os.path.exists('MANIFEST'):
2020
os.remove('MANIFEST')
2121

22-
# For some commands, use setuptools.
23-
if len(set(('develop', 'bdist_egg', 'bdist_rpm', 'bdist', 'bdist_dumb',
24-
'install_egg_info', 'egg_info', 'easy_install', 'bdist_wheel',
25-
'bdist_mpkg')).intersection(sys.argv)) > 0:
26-
# setup_egg imports setuptools setup, thus monkeypatching distutils.
27-
import setup_egg # noqa
28-
29-
from distutils.core import setup
22+
from setuptools import setup
3023

3124
# Commit hash writing, and dependency checking
3225
from nisext.sexts import (get_comrec_build, package_check, install_scripts_bat,
@@ -77,8 +70,8 @@ def main(**extra_args):
7770
author_email=INFO.AUTHOR_EMAIL,
7871
platforms=INFO.PLATFORMS,
7972
version=INFO.VERSION,
80-
requires=INFO.REQUIRES,
8173
provides=INFO.PROVIDES,
74+
install_requires=INFO.REQUIRES,
8275
packages = ['nibabel',
8376
'nibabel.externals',
8477
'nibabel.externals.tests',

0 commit comments

Comments
 (0)