Skip to content

Commit 34f4f80

Browse files
committed
Update dependencies in tests and wheelbuild and remove pyqt
* 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)
1 parent 16eb34b commit 34f4f80

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

README.win.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ without fiddling with environment variables.
1919

2020
``` sh
2121
# create a new environment with the required packages
22-
conda create -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado pyqt cycler tk libpng zlib freetype
22+
conda create -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado "cycler>=0.10" tk libpng zlib freetype
2323
activate matplotlib_build
24+
# if you want a qt backend, you also have to install pyqt (be aware that pyqt doesn't mix well if
25+
# you have created the environment with conda-forge already activated...)
26+
conda install pyqt
2427
# this package is only available in the conda-forge channel
2528
conda install -c conda-forge msinttypes
2629
# for python 2.7

appveyor.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ install:
7373

7474
# For building, use a new environment which only includes the requirements for mpl
7575
# same things as the requirements in ci/conda_recipe/meta.yaml
76-
- 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
76+
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
77+
# https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
78+
- 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
7779
- activate test-environment
7880
- cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
7981
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32

build_alllocal.cmd

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
:: This assumes you have installed all the dependencies via conda packages:
22
:: # create a new environment with the required packages
3-
:: conda create -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado pyqt cycler tk libpng zlib freetype
3+
:: conda create -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing pytz tornado "cycler>=0.10" tk libpng zlib freetype
44
:: activate matplotlib_build
5+
:: if you want qt backend, you also have to install pyqt
6+
:: conda install pyqt
57
:: # this package is only available in the conda-forge channel
68
:: conda install -c conda-forge msinttypes
79
:: if you build on py2.7:

0 commit comments

Comments
 (0)