Skip to content

Commit 4725770

Browse files
committed
remove MPL code causing problems on Debian; update license removing references to "vendored" code
1 parent b2035ab commit 4725770

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

GSASII/GSASIIplot.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,10 @@ def SetToolTipString(self,text):
290290
self.canvas.SetToolTipString(text)
291291

292292
def ToolBarDraw(self):
293-
mplv = eval(mpl.__version__.replace('.',','))
294-
if mplv[0] >= 3 and mplv[1] >= 3:
293+
try:
295294
self.toolbar.canvas.draw_idle()
296-
else:
295+
except: # patch: used for MLP <3.3
297296
self.toolbar.draw()
298-
# mplv = eval(mpl.__version__.replace('.',','))
299-
# if mplv[0] >= 3 and mplv[1] >= 3:
300-
# self.toolbar.draw_idle()
301-
# else:
302-
# self.toolbar.draw()
303297

304298
class G2PlotNoteBook(wx.Panel):
305299
'create a tabbed panel to hold a GSAS-II graphics window'

LICENSE

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,11 @@ that the following conditions are met:
3232
Also note that GSAS-II is normally distributed with the following
3333
included software:
3434

35-
pybaselines: for license see GSASII/pybaselines/LICENSE.txt and
36-
GSASII/pybaselines/LICENSES_bundled.txt.
37-
3835
NIST_profile (Fundamental Parameters Python Code): U.S. Government work,
3936
not subject to copyright
4037

41-
PDFfit2: see PDFfit2/LICENSE.txt for license.
42-
43-
DIFFaX: Not copyrighted; Distributed with direct permission of M. Treacy
38+
DIFFaX: Not copyrighted; Distributed with direct permission of
39+
author (M. Treacy)
4440

4541
NIST*LATTICE: U.S. Government work, not subject to copyright
4642

0 commit comments

Comments
 (0)