Skip to content

Commit f57d81b

Browse files
committed
collect config package code in one location in setup.py, so it can
easily be commented out for the next release. svn path=/trunk/matplotlib/; revision=4222
1 parent b760e2e commit f57d81b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

setup.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@
120120
'matplotlib.numerix.npyma',
121121
'matplotlib.numerix.linear_algebra',
122122
'matplotlib.numerix.random_array',
123-
'matplotlib.numerix.fft',
124-
'matplotlib.config'
123+
'matplotlib.numerix.fft'
125124
]
126125

127126
py_modules = ['pylab']
@@ -307,10 +306,9 @@ def add_dateutil():
307306
# TODO: comment out for mpl release:
308307
print_raw("")
309308
print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
310-
if check_provide_configobj():
311-
py_modules.append('configobj')
312-
if check_provide_traits():
313-
build_traits(ext_modules, packages)
309+
packages.append('matplotlib.config')
310+
if check_provide_configobj(): py_modules.append('configobj')
311+
if check_provide_traits(): build_traits(ext_modules, packages)
314312

315313
print_raw("")
316314
print_raw("[Edit setup.cfg to suppress the above messages]")

0 commit comments

Comments
 (0)