Menu
▾
▴
matplotlib-checkins
|
From: <md...@us...> - 2007-08-01 12:15:06
|
Revision: 3647
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3647&view=rev
Author: mdboom
Date: 2007-08-01 05:15:03 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Don't import commands if running on Windows
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-07-31 18:42:39 UTC (rev 3646)
+++ trunk/matplotlib/setupext.py 2007-08-01 12:15:03 UTC (rev 3647)
@@ -60,7 +60,8 @@
}
import sys, os, stat
-import commands
+if sys.platform != 'win32':
+ import commands
from sets import Set
from textwrap import fill
from distutils.core import Extension
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 12:19:06
|
Revision: 3648
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3648&view=rev
Author: mdboom
Date: 2007-08-01 05:19:03 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Earlier versions of pygtk don't have a pygobject version
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 12:15:03 UTC (rev 3647)
+++ trunk/matplotlib/setupext.py 2007-08-01 12:19:03 UTC (rev 3648)
@@ -409,9 +409,13 @@
if gotit:
import gobject
+ if hasattr(gobject, 'pygobject_version'):
+ pygobject_version = ver2str(gobject.pygobject_version)
+ else:
+ pygobject_version = '[pre-pygobject]'
print_status("Gtk+", "gtk+: %s, glib: %s, pygtk: %s, pygobject: %s" %
(ver2str(gtk.gtk_version), ver2str(gobject.glib_version),
- ver2str(gtk.pygtk_version), ver2str(gobject.pygobject_version)))
+ ver2str(gtk.pygtk_version), pygobject_version))
else:
print_status("Gtk+", "no")
print_message(explanation)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 12:41:21
|
Revision: 3651
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3651&view=rev
Author: mdboom
Date: 2007-08-01 05:41:17 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix wxagg building for earlier versions of wx
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 12:28:24 UTC (rev 3650)
+++ trunk/matplotlib/setupext.py 2007-08-01 12:41:17 UTC (rev 3651)
@@ -810,6 +810,7 @@
add_agg_flags(module)
add_ft2font_flags(module)
+ wxconfig = find_wx_config()
add_wx_flags(module, wxconfig)
ext_modules.append(module)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 13:03:02
|
Revision: 3652
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3652&view=rev
Author: mdboom
Date: 2007-08-01 06:03:00 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix handling of def/undef macros
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 12:41:17 UTC (rev 3651)
+++ trunk/matplotlib/setupext.py 2007-08-01 13:03:00 UTC (rev 3652)
@@ -193,12 +193,19 @@
status, output = commands.getstatusoutput(
"%s %s %s" % (pkg_config_exec, flags, packages))
if status == 0:
+ output += ' -UFOO'
for token in output.split():
attr = _flags.get(token[:2], None)
if attr is not None:
+ if token[:2] == '-D':
+ value = tuple(token[2:].split('='))
+ if len(value) == 1:
+ value = (value[0], None)
+ else:
+ value = token[2:]
set = getattr(module, attr)
- if token[2:] not in set:
- set.append(token[2:])
+ if value not in set:
+ set.append(value)
else:
if token not in module.extra_link_args:
module.extra_link_args.append(token)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 13:06:12
|
Revision: 3653
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3653&view=rev
Author: mdboom
Date: 2007-08-01 06:06:07 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Removing test code
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 13:03:00 UTC (rev 3652)
+++ trunk/matplotlib/setupext.py 2007-08-01 13:06:07 UTC (rev 3653)
@@ -193,7 +193,6 @@
status, output = commands.getstatusoutput(
"%s %s %s" % (pkg_config_exec, flags, packages))
if status == 0:
- output += ' -UFOO'
for token in output.split():
attr = _flags.get(token[:2], None)
if attr is not None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 14:08:45
|
Revision: 3655
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3655&view=rev
Author: mdboom
Date: 2007-08-01 07:08:44 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix formatting display bug.
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 13:51:48 UTC (rev 3654)
+++ trunk/matplotlib/setupext.py 2007-08-01 14:08:44 UTC (rev 3655)
@@ -114,13 +114,13 @@
def print_status(package, status):
initial_indent = "%22s: " % package
indent = ' ' * 24
- print fill(status, width=76,
+ print fill(str(status), width=76,
initial_indent=initial_indent,
subsequent_indent=indent)
def print_message(message):
indent = ' ' * 24 + "* "
- print fill(message, width=76,
+ print fill(str(message), width=76,
initial_indent=indent,
subsequent_indent=indent)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 14:22:17
|
Revision: 3656
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3656&view=rev
Author: mdboom
Date: 2007-08-01 07:22:16 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix order of libraries between freetype2 and zlib
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 14:08:44 UTC (rev 3655)
+++ trunk/matplotlib/setupext.py 2007-08-01 14:22:16 UTC (rev 3656)
@@ -357,9 +357,6 @@
def add_ft2font_flags(module):
'Add the module flags to ft2font extension'
- module.libraries.append('z')
- add_base_flags(module)
-
if not get_pkgconfig(module, 'freetype2'):
module.libraries.append('freetype')
@@ -376,6 +373,9 @@
p = os.path.join(d, 'freetype2/lib')
if os.path.exists(p): module.library_dirs.append(p)
+ module.libraries.append('z')
+ add_base_flags(module)
+
if sys.platform == 'win32' and win32_compiler == 'mingw32':
module.libraries.append('gw32c')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 15:06:31
|
Revision: 3657
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3657&view=rev
Author: mdboom
Date: 2007-08-01 08:06:29 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix erroneous message when wxPython devel headers are not even needed.
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 14:22:16 UTC (rev 3656)
+++ trunk/matplotlib/setupext.py 2007-08-01 15:06:29 UTC (rev 3657)
@@ -373,7 +373,7 @@
p = os.path.join(d, 'freetype2/lib')
if os.path.exists(p): module.library_dirs.append(p)
- module.libraries.append('z')
+ module.libraries.append('z')
add_base_flags(module)
if sys.platform == 'win32' and win32_compiler == 'mingw32':
@@ -470,7 +470,10 @@
except ImportError:
explanation = 'wxPython not found'
else:
- if sys.platform == 'win32' and win32_compiler == 'mingw32':
+ if getattr(wx, '__version__', '0.0')[0:3] >= '2.8':
+ print_status("wxPython", wx.__version__)
+ return True
+ elif sys.platform == 'win32' and win32_compiler == 'mingw32':
explanation = "The wxAgg extension can not be built using the mingw32 compiler on Windows, since the default wxPython binary is built using MS Visual Studio"
else:
wxconfig = find_wx_config()
@@ -491,15 +494,14 @@
gotit = True
if gotit:
- if getattr(wx, '__version__', '0.0')[0:3] < '2.8':
- module = Extension("test", [])
- add_wx_flags(module, wxconfig)
- if not find_include_file(
- module.include_dirs,
- os.path.join("wx", "wxPython", "wxPython.h")):
- explanation = ("Could not find wxPython headers in any of %s" %
+ module = Extension("test", [])
+ add_wx_flags(module, wxconfig)
+ if not find_include_file(
+ module.include_dirs,
+ os.path.join("wx", "wxPython", "wxPython.h")):
+ explanation = ("Could not find wxPython headers in any of %s" %
", ".join(["'%s'" % x for x in module.include_dirs]))
- gotit = False
+ gotit = False
if gotit:
print_status("wxPython", wx.__version__)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 15:07:32
|
Revision: 3658
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3658&view=rev
Author: mdboom
Date: 2007-08-01 08:07:29 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Change "unknown (no pkg-config)" to "found, but unknown version (no pkg-config)"
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 15:06:29 UTC (rev 3657)
+++ trunk/matplotlib/setupext.py 2007-08-01 15:07:29 UTC (rev 3658)
@@ -212,7 +212,7 @@
return False
def get_pkgconfig_version(package):
- default = "unknown (no pkg-config)"
+ default = "found, but unknown version (no pkg-config)"
if not has_pkgconfig():
return default
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-01 16:26:30
|
Revision: 3660
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3660&view=rev
Author: mdboom
Date: 2007-08-01 08:56:34 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix some win32 differences
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 15:35:54 UTC (rev 3659)
+++ trunk/matplotlib/setupext.py 2007-08-01 15:56:34 UTC (rev 3660)
@@ -358,7 +358,8 @@
def add_ft2font_flags(module):
'Add the module flags to ft2font extension'
if not get_pkgconfig(module, 'freetype2'):
- module.libraries.append('freetype')
+ module.libraries.extend(['freetype', 'z'])
+ add_base_flags(module)
basedirs = module.include_dirs[:] # copy the list to avoid inf loop!
for d in basedirs:
@@ -372,9 +373,8 @@
for d in basedirs:
p = os.path.join(d, 'freetype2/lib')
if os.path.exists(p): module.library_dirs.append(p)
-
- module.libraries.append('z')
- add_base_flags(module)
+ else:
+ add_base_flags(module)
if sys.platform == 'win32' and win32_compiler == 'mingw32':
module.libraries.append('gw32c')
@@ -451,10 +451,38 @@
'C:/GTK/include/gtk',
])
- add_base_flags(module)
+ add_base_flags(module)
+
+ if not os.environ.has_key('PKG_CONFIG_PATH'):
+ # If Gtk+ is installed, pkg-config is required to be installed
+ os.environ['PKG_CONFIG_PATH'] = 'C:\GTK\lib\pkgconfig'
+
+ pygtkIncludes = getoutput('pkg-config --cflags-only-I pygtk-2.0').split()
+ gtkIncludes = getoutput('pkg-config --cflags-only-I gtk+-2.0').split()
+ includes = pygtkIncludes + gtkIncludes
+ module.include_dirs.extend([include[2:] for include in includes])
+
+ pygtkLinker = getoutput('pkg-config --libs pygtk-2.0').split()
+ gtkLinker = getoutput('pkg-config --libs gtk+-2.0').split()
+ linkerFlags = pygtkLinker + gtkLinker
+
+ module.libraries.extend(
+ [flag[2:] for flag in linkerFlags if flag.startswith('-l')])
+
+ module.library_dirs.extend(
+ [flag[2:] for flag in linkerFlags if flag.startswith('-L')])
+
+ module.extra_link_args.extend(
+ [flag for flag in linkerFlags if not
+ (flag.startswith('-l') or flag.startswith('-L'))])
+ # visual studio doesn't need the math library
+ if sys.platform == 'win32' and win32_compiler == 'msvc' and 'm' in module.libraries:
+ module.libraries.remove('m')
+
if sys.platform != 'win32':
# If Gtk+ is installed, pkg-config is required to be installed
+ add_base_flags(module)
get_pkgconfig(module, 'pygtk-2.0 gtk+-2.0')
# visual studio doesn't need the math library
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-03 17:58:08
|
Revision: 3671
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3671&view=rev
Author: mdboom
Date: 2007-08-03 10:58:07 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
Change missing header file errors into warnings, since include paths
can be inserted in sneaky ways behind distutils' back ;)
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-03 17:27:20 UTC (rev 3670)
+++ trunk/matplotlib/setupext.py 2007-08-03 17:58:07 UTC (rev 3671)
@@ -240,26 +240,25 @@
for d in basedirs:
module.include_dirs.append(os.path.join(d, 'freetype2'))
+ print_status("freetype2", get_pkgconfig_version('freetype2'))
if not find_include_file(module.include_dirs, 'ft2build.h'):
print_message(
- "Could not find 'freetype2' headers in any of %s" %
+ "WARNING: Could not find 'freetype2' headers in any of %s." %
", ".join(["'%s'" % x for x in module.include_dirs]))
- return False
- print_status("freetype2", get_pkgconfig_version('freetype2'))
return True
def check_for_libpng():
module = Extension("test", [])
get_pkgconfig(module, 'libpng')
add_base_flags(module)
+
+ print_status("libpng", get_pkgconfig_version('libpng'))
if not find_include_file(module.include_dirs, 'png.h'):
print_message(
- ", ".join("Could not find 'libpng' headers in any of %s" %
- ["'%s'" % x for x in module.include_dirs]))
- return False
+ "Could not find 'libpng' headers in any of %s" %
+ ", ".join(["'%s'" % x for x in module.include_dirs]))
- print_status("libpng", get_pkgconfig_version('libpng'))
return True
def add_base_flags(module):
@@ -323,11 +322,10 @@
module = Extension('test', [])
add_numpy_flags(module)
add_base_flags(module)
+
+ print_status("numpy", numpy.__version__)
if not find_include_file(module.include_dirs, os.path.join("numpy", "arrayobject.h")):
- print_status("numpy", "no")
print_message("Could not find the headers for numpy. You may need to install the development package.")
- return False
- print_status("numpy", numpy.__version__)
return True
def add_numpy_flags(module):
@@ -408,7 +406,6 @@
explanation = (
"Could not find Gtk+ headers in any of %s" %
", ".join(["'%s'" % x for x in module.include_dirs]))
- gotit = False
def ver2str(tup):
return ".".join([str(x) for x in tup])
@@ -424,8 +421,10 @@
ver2str(gtk.pygtk_version), pygobject_version))
else:
print_status("Gtk+", "no")
+
+ if explanation is not None:
print_message(explanation)
-
+
return gotit
def add_pygtk_flags(module):
@@ -529,7 +528,6 @@
os.path.join("wx", "wxPython", "wxPython.h")):
explanation = ("Could not find wxPython headers in any of %s" %
", ".join(["'%s'" % x for x in module.include_dirs]))
- gotit = False
if gotit:
print_status("wxPython", wx.__version__)
@@ -663,7 +661,6 @@
gotit = False
if not find_include_file(module.include_dirs, "tk.h"):
explanation = 'Tkinter present, but header files are not installed. You may need to install development packages.'
- gotit = False
if gotit:
print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2007-08-07 00:35:10
|
Revision: 3678
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3678&view=rev
Author: cmoad
Date: 2007-08-06 17:35:08 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
typo in the tcl/tk win32 includes
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-06 20:53:11 UTC (rev 3677)
+++ trunk/matplotlib/setupext.py 2007-08-07 00:35:08 UTC (rev 3678)
@@ -676,10 +676,10 @@
if sys.platform=='win32':
major, minor1, minor2, s, tmp = sys.version_info
if major==2 and minor1 in [3, 4, 5]:
- module.include_dirs.extend(['win32_static/include/tcl84'])
+ module.include_dirs.extend(['win32_static/include/tcl8.4'])
module.libraries.extend(['tk84', 'tcl84'])
elif major==2 and minor1==2:
- module.include_dirs.extend(['win32_static/include/tcl83'])
+ module.include_dirs.extend(['win32_static/include/tcl8.3'])
module.libraries.extend(['tk83', 'tcl83'])
else:
raise RuntimeError('No tk/win32 support for this python version yet')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-08-23 18:02:04
|
Revision: 3735
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3735&view=rev
Author: mdboom
Date: 2007-08-23 11:02:03 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
There's no need to link ttconv with CXX (it hasn't used it for
sometime, but I forgot to remove it from the build.)
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-23 18:00:42 UTC (rev 3734)
+++ trunk/matplotlib/setupext.py 2007-08-23 18:02:03 UTC (rev 3735)
@@ -779,8 +779,6 @@
'ttconv/pprdrv_tt.cpp',
'ttconv/pprdrv_tt2.cpp',
'ttconv/ttutil.cpp']
- deps.extend(glob.glob('CXX/*.cxx'))
- deps.extend(glob.glob('CXX/*.c'))
module = Extension('matplotlib.ttconv', deps)
add_base_flags(module)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2007-11-09 01:43:19
|
Revision: 4174
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4174&view=rev
Author: dsdale
Date: 2007-11-08 17:43:18 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
fixed bug in dateutil version check
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-09 01:40:54 UTC (rev 4173)
+++ trunk/matplotlib/setupext.py 2007-11-09 01:43:18 UTC (rev 4174)
@@ -353,7 +353,7 @@
return False
else:
try:
- print_status("dateutil", dateutil.__version)
+ print_status("dateutil", dateutil.__version__)
except AttributeError:
print_status("dateutil", "present, version unknown")
return True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2007-11-09 20:38:12
|
Revision: 4196
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4196&view=rev
Author: dsdale
Date: 2007-11-09 12:37:57 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
minor formatting change to dependency report
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-09 20:15:52 UTC (rev 4195)
+++ trunk/matplotlib/setupext.py 2007-11-09 20:37:57 UTC (rev 4196)
@@ -299,7 +299,7 @@
print_status("Qt", "no")
return False
else:
- print_status("Qt", "Qt: %s, pyqt: %s" %
+ print_status("Qt", "Qt: %s, PyQt: %s" %
(convert_qt_version(pyqtconfig.Configuration().qt_version),
pyqtconfig.Configuration().pyqt_version_str))
return True
@@ -311,7 +311,7 @@
print_status("Qt4", "no")
return False
else:
- print_status("Qt4", "Qt: %s, pyqt: %s" %
+ print_status("Qt4", "Qt: %s, PyQt4: %s" %
(convert_qt_version(pyqtconfig.Configuration().qt_version),
pyqtconfig.Configuration().pyqt_version_str))
return True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2007-11-10 23:26:37
|
Revision: 4218
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4218&view=rev
Author: dsdale
Date: 2007-11-10 15:26:36 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
expand comments in build report
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-10 23:21:38 UTC (rev 4217)
+++ trunk/matplotlib/setupext.py 2007-11-10 23:26:36 UTC (rev 4218)
@@ -360,7 +360,7 @@
import pytz
except ImportError:
if hasdatetime and provide_pytz:
- print_status("pytz", "mpl-provided")
+ print_status("pytz", "matplotlib will provide")
return True
else:
print_status("pytz", "no")
@@ -374,7 +374,7 @@
import dateutil
except ImportError:
if hasdatetime and provide_dateutil:
- print_status("dateutil", "mpl-provided")
+ print_status("dateutil", "matplotlib will provide")
return True
else:
print_status("dateutil", "no")
@@ -391,7 +391,7 @@
import configobj
except ImportError:
if provide_configobj:
- print_status("configobj", "mpl-provided")
+ print_status("configobj", "matplotlib will provide")
return True
else:
print_status("configobj", "no")
@@ -410,14 +410,14 @@
return False
else:
if version.version.endswith('mpl'):
- print_status("enthought.traits", "mpl-provided")
+ print_status("enthought.traits", "matplotlib will provide")
return True
else:
print_status("enthought.traits", version.version)
return False
except ImportError:
if provide_traits:
- print_status("enthought.traits", "mpl-provided")
+ print_status("enthought.traits", "matplotlib will provide")
return True
else:
print_status("enthought.traits", "no")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2007-11-16 21:47:18
|
Revision: 4346
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4346&view=rev
Author: dsdale
Date: 2007-11-16 13:47:17 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
fixed version checking for traits-3
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-16 20:29:51 UTC (rev 4345)
+++ trunk/matplotlib/setupext.py 2007-11-16 21:47:17 UTC (rev 4346)
@@ -465,11 +465,16 @@
print_status("enthought.traits", "unknown and incompatible version: < 2.0")
return False
else:
- if version.version.endswith('mpl'):
+ # traits 2 and 3 store their version strings in different places:
+ try:
+ version = version.version
+ except AttributeError:
+ version = version.__version__
+ if version.endswith('mpl'):
print_status("enthought.traits", "matplotlib will provide")
return True
else:
- print_status("enthought.traits", version.version)
+ print_status("enthought.traits", version)
return False
except ImportError:
if options['provide_traits']:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2007-11-26 04:06:03
|
Revision: 4434
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4434&view=rev
Author: jdh2358
Date: 2007-11-25 20:06:01 -0800 (Sun, 25 Nov 2007)
Log Message:
-----------
added x11 to default darwin list
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-25 03:52:28 UTC (rev 4433)
+++ trunk/matplotlib/setupext.py 2007-11-26 04:06:01 UTC (rev 4434)
@@ -51,7 +51,7 @@
'linux' : ['/usr/local', '/usr',],
'cygwin' : ['/usr/local', '/usr',],
'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw'],
+ '/usr', '/sw', '/usr/X11R6'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2007-11-28 02:24:42
|
Revision: 4476
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4476&view=rev
Author: cmoad
Date: 2007-11-27 18:24:40 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
CXX/WrapPython.h was missing from sdist build
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-28 01:33:15 UTC (rev 4475)
+++ trunk/matplotlib/setupext.py 2007-11-28 02:24:40 UTC (rev 4476)
@@ -980,6 +980,7 @@
deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
deps.extend(glob.glob('CXX/*.cxx'))
deps.extend(glob.glob('CXX/*.c'))
+ deps.extend(glob.glob('CXX/*.h'))
module = Extension('matplotlib.ft2font', deps)
add_ft2font_flags(module)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2008-01-11 21:08:55
|
Revision: 4859
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4859&view=rev
Author: cmoad
Date: 2008-01-11 13:08:45 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
added explicit compiler flag to win32 build notes
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2008-01-10 19:32:16 UTC (rev 4858)
+++ trunk/matplotlib/setupext.py 2008-01-11 21:08:45 UTC (rev 4859)
@@ -37,7 +37,7 @@
http://matplotlib.sourceforge.net/win32_static_vs.tar.gz and
see the README in that dir
- > python setup.py build bdist_wininst
+ > python setup.py build --compiler=msvc bdist_wininst
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-04-25 15:43:58
|
Revision: 5074
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5074&view=rev
Author: jdh2358
Date: 2008-04-25 08:43:06 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
added numpy version check at build time
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2008-04-24 18:31:10 UTC (rev 5073)
+++ trunk/matplotlib/setupext.py 2008-04-25 15:43:06 UTC (rev 5074)
@@ -539,6 +539,14 @@
print_status("numpy", "no")
print_message("You must install numpy to build matplotlib.")
return False
+
+ major, minor1, minor2 = map(int, numpy.__version__.split('.')[:3])
+ if major<1 or (major==1 and minor1<1):
+ print_status("numpy version", "no")
+ print_message("You must install numpy 1.1 or later to build matplotlib.")
+
+ return False
+
module = Extension('test', [])
add_numpy_flags(module)
add_base_flags(module)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X