File tree Expand file tree Collapse file tree 6 files changed +12
-60
lines changed
Expand file tree Collapse file tree 6 files changed +12
-60
lines changed Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ install:
5252 # this is now the downloaded conda...
5353 - conda info -a
5454 # same things as in tools/conda_recipe
55- - cmd : conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.5 msinttypes pyparsing pytz tornado libpng zlib pyqt cycler nose mock
55+ - cmd : conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.5 msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock
5656 - activate test-environment
5757 # This is needed for the installer to find the dlls...
5858 - set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib
Original file line number Diff line number Diff line change @@ -17,11 +17,3 @@ if errorlevel 1 exit 1
1717
1818rd /s /q %SP_DIR% \dateutil
1919rd /s /q %SP_DIR% \numpy
20-
21- if " %ARCH% " == " 64" (
22- set PLAT = win-amd64
23- ) else (
24- set PLAT = win32
25- )
26-
27- :: copy C:\Tcl%ARCH%\bin\t*.dll %SP_DIR%\matplotlib-%PKG_VERSION%-py%PY_VER%-%PLAT%.egg\matplotlib\backends
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11# stolen from https://github.com/conda/conda-recipes/tree/master/matplotlib
2+ # selectors [py27] and comments need to be `# [selector] comment` not `[sel] # comment`
23
34package :
45 name : matplotlib-test
56 version : 1.5.0.9
67
78source :
89 path : ../../
9-
10+
1011 patches :
11- # off for now until there is a way to get the dlls tkagg...
12- # - setupext.patch
13- # - cfg.patch
12+ # don't run nosetest
1413 - cfg_notests.patch
14+ # nake Qt4Agg the default backend
1515 - cfg_qt4agg.patch [not osx]
1616 - rctmp_pyside.patch [not osx]
17+ # tk work on OSX
1718 - osx-tk.patch [osx]
19+ # dynamic version from git
1820 - condaversion.patch
1921
2022requirements :
@@ -33,7 +35,8 @@ requirements:
3335 - msinttypes # this package is from the conda-forge channel!
3436 - pyqt [not osx]
3537 - cycler
36- # - functools32 [py27] # this is actually not available
38+ - tk
39+ # - functools32 [py27] # this is currently not available
3740
3841 run :
3942 - python
@@ -46,7 +49,8 @@ requirements:
4649 - libpng [unix]
4750 - pyqt [not osx]
4851 - cycler
49-
52+ - tk
53+
5054test :
5155 requires :
5256 - nose
Original file line number Diff line number Diff line change 1212import matplotlib .backends ._backend_agg
1313import matplotlib .ft2font
1414import matplotlib .ttconv
15- # currently not working...
16- #import matplotlib.backends._tkagg
15+ import matplotlib .backends ._tkagg
1716
1817import pylab
1918import mpl_toolkits
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments