CI: Enable tk again

jankatins · jankatins · commit 99e71f746925 · 2015-12-03T17:13:04.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -52,7 +52,7 @@ install:
   # this is now the downloaded conda...
   - conda info -a
   # same things as in tools/conda_recipe
-  - 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
+  - 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
   - activate test-environment
   # This is needed for the installer to find the dlls...
   - set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib
diff --git a/ci/conda_recipe/bld.bat b/ci/conda_recipe/bld.bat
@@ -17,11 +17,3 @@ if errorlevel 1 exit 1
 
 rd /s /q %SP_DIR%\dateutil
 rd /s /q %SP_DIR%\numpy
-
-if "%ARCH%"=="64" (
-    set PLAT=win-amd64
-) else (
-    set PLAT=win32
-)
-
-::copy C:\Tcl%ARCH%\bin\t*.dll %SP_DIR%\matplotlib-%PKG_VERSION%-py%PY_VER%-%PLAT%.egg\matplotlib\backends
diff --git a/ci/conda_recipe/cfg.patch b/ci/conda_recipe/cfg.patch
diff --git a/ci/conda_recipe/meta.yaml b/ci/conda_recipe/meta.yaml
@@ -1,20 +1,22 @@
 # stolen from https://github.com/conda/conda-recipes/tree/master/matplotlib
+# selectors [py27] and comments need to be `# [selector] comment` not `[sel] # comment`
 
 package:
   name: matplotlib-test
   version: 1.5.0.9
 
 source:
   path: ../../
-  
+
   patches:
-    # off for now until there is a way to get the dlls tkagg...
-    #- setupext.patch
-    # - cfg.patch 
+    # don't run nosetest
     - cfg_notests.patch
+    # nake Qt4Agg the default backend
     - cfg_qt4agg.patch    [not osx]
     - rctmp_pyside.patch  [not osx]
+    # tk work on OSX
     - osx-tk.patch        [osx]
+    # dynamic version from git
     - condaversion.patch
 
 requirements:
@@ -33,7 +35,8 @@ requirements:
     - msinttypes          # this package is from the conda-forge channel!
     - pyqt                [not osx]
     - cycler
-    #- functools32         [py27] # this is actually not available
+    - tk
+    #- functools32         [py27] # this is currently not available
 
   run:
     - python
@@ -46,7 +49,8 @@ requirements:
     - libpng              [unix]
     - pyqt                [not osx]
     - cycler
-    
+    - tk
+
 test:
   requires:
     - nose
diff --git a/ci/conda_recipe/run_test.py b/ci/conda_recipe/run_test.py
@@ -12,8 +12,7 @@
 import matplotlib.backends._backend_agg
 import matplotlib.ft2font
 import matplotlib.ttconv
-# currently not working...
-#import matplotlib.backends._tkagg
+import matplotlib.backends._tkagg
 
 import pylab
 import mpl_toolkits
diff --git a/ci/conda_recipe/setupext.patch b/ci/conda_recipe/setupext.patch
