8000 RF: force TkAgg / Agg extensions with messages · matplotlib/matplotlib@0c2c5a0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0c2c5a0

Browse files
committed
RF: force TkAgg / Agg extensions with messages
Now we can always build TkAgg, so force building of Agg and TkAgg.
1 parent 626a1d2 commit 0c2c5a0

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

setupext.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,7 @@ def get_install_requires(self):
15061506

15071507
class BackendAgg(OptionalBackendPackage):
15081508
name = "agg"
1509+
force = True
15091510

15101511
def get_extension(self):
15111512
sources = [
@@ -1523,10 +1524,10 @@ def get_extension(self):
15231524

15241525
class BackendTkAgg(OptionalBackendPackage):
15251526
name = "tkagg"
1527+
force = True
15261528

1527-
def check_requirements(self):
1528-
BackendAgg.force = True
1529-
return ""
1529+
def check(self):
1530+
return "installing; run-time loading from Python Tcl / Tk"
15301531

15311532
def get_extension(self):
15321533
sources = [
@@ -1658,8 +1659,6 @@ def check(self):
16581659
return super(BackendGtkAgg, self).check()
16591660
except:
16601661
raise
1661-
else:
1662-
BackendAgg.force = True
16631662

16641663
def get_package_data(self):
16651664
return {'matplotlib': ['mpl-data/*.glade']}
@@ -1735,7 +1734,6 @@ def check_requirements(self):
17351734
p.join()
17361735

17371736
if success:
1738-
BackendAgg.force = True
17391737
return msg
17401738
else:
17411739
raise CheckFailed(msg)
@@ -1808,7 +1806,6 @@ def check_requirements(self):
18081806
p.join()
18091807

18101808
if success:
1811-
BackendAgg.force = True
18121809
return msg
18131810
else:
18141811
raise CheckFailed(msg)
@@ -1852,8 +1849,6 @@ def check_requirements(self):
18521849
raise CheckFailed(
18531850
"Requires wxPython 2.8, found %s" % backend_version)
18541851

1855-
BackendAgg.force = True
1856-
18571852
return "version %s" % backend_version
18581853

18591854

@@ -1963,7 +1958,6 @@ def backend_pyside_internal_check(self):
19631958
except ImportError:
19641959
raise CheckFailed("PySide not found")
19651960
else:
1966-
BackendAgg.force = True
19671961
return ("Qt: %s, PySide: %s" %
19681962
(QtCore.__version__, __version__))
19691963

@@ -1980,7 +1974,6 @@ def backend_pyqt4_internal_check(self):
19801974
except AttributeError:
19811975
raise CheckFailed('PyQt4 not correctly imported')
19821976
else:
1983-
BackendAgg.force = True
19841977
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
19851978

19861979

@@ -2016,7 +2009,6 @@ def backend_pyside2_internal_check(self):
20162009
except ImportError:
20172010
raise CheckFailed("PySide2 not found")
20182011
else:
2019-
BackendAgg.force = True
20202012
return ("Qt: %s, PySide2: %s" %
20212013
(QtCore.__version__, __version__))
20222014

@@ -2032,7 +2024,6 @@ def backend_pyqt5_internal_check(self):
20322024
except AttributeError:
20332025
raise CheckFailed('PyQt5 not correctly imported')
20342026
else:
2035-
BackendAgg.force = True
20362027
return ("Qt: %s, PyQt: %s" % (self.convert_qt_version(qt_version), pyqt_version_str))
20372028

20382029
def backend_qt5_internal_check(self):

0 commit comments

Comments
 (0)
0