Update dependencies in tests and wheelbuild and remove pyqt

jankatins · jankatins · commit 34f4f8058281 · 2016-07-03T17:11:16.000+02:00
* Use versions from conda-forge (in sync with the conda package build) * remove pyqt (which right now is installed from default) as the dependencies of that package clashes with packages in conda-forge. See here: conda-forge/conda-forge.github.io#157 (comment)
diff --git a/README.win.md b/README.win.md
@@ -19,8 +19,11 @@ without fiddling with environment variables.
 
 ``` sh
 # create a new environment with the required packages
-conda create  -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado pyqt cycler tk libpng zlib freetype
+conda create  -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado "cycler>=0.10" tk libpng zlib freetype
 activate matplotlib_build
+# if you want a qt backend, you also have to install pyqt (be aware that pyqt doesn't mix well if
+# you have created the environment with conda-forge already activated...)
+conda install pyqt
 # this package is only available in the conda-forge channel
 conda install -c conda-forge msinttypes
 # for python 2.7
diff --git a/appveyor.yml b/appveyor.yml
@@ -73,7 +73,9 @@ install:
 
   # For building, use a new environment which only includes the requirements for mpl
   # same things as the requirements in ci/conda_recipe/meta.yaml
-  - cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock msvc_runtime
+  # if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
+  # https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
+  - cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy  python-dateutil freetype=2.6 msinttypes "tk=8.5" pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10" nose mock
   - activate test-environment
   - cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
   - cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32
diff --git a/build_alllocal.cmd b/build_alllocal.cmd
@@ -1,7 +1,9 @@
 :: This assumes you have installed all the dependencies via conda packages:
 :: # create a new environment with the required packages
-:: conda create  -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado pyqt cycler tk libpng zlib freetype
+:: conda create  -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado "cycler>=0.10" tk libpng zlib freetype
 :: activate matplotlib_build
+:: if you want qt backend, you also have to install pyqt
+:: conda install pyqt
 :: # this package is only available in the conda-forge channel
 :: conda install -c conda-forge msinttypes
 :: if you build on py2.7:
