From ed4d60f1080bf296a2af2a074967f0adc3799127 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 6 Mar 2016 00:03:25 -0500 Subject: [PATCH 1/3] CI: try explicitly including msvc_runtime Might solve #6115 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8aff64c1279..4183e0a74c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,7 +68,7 @@ install: - cmd: copy "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat" # 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 + - 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 - activate test-environment - cmd: echo %PYTHON_VERSION% %TARGET_ARCH% - cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32 From f15adc63f49c109b689932fc1846fb66c6d002bb Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 6 Mar 2016 00:45:43 -0500 Subject: [PATCH 2/3] CI: add msvc_runtime to conda recipe --- ci/conda_recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/conda_recipe/meta.yaml b/ci/conda_recipe/meta.yaml index 21f275de3da..46f0833ca66 100644 --- a/ci/conda_recipe/meta.yaml +++ b/ci/conda_recipe/meta.yaml @@ -41,6 +41,7 @@ requirements: - pyqt # [not osx] - tk # [linux and win] - functools32 # [py2k] + - msvc_runtime # [win] run: - python @@ -55,6 +56,7 @@ requirements: - pyqt # [not osx] - tk # [linux and win] - functools32 # [py2k] + - msvc_runtime # [win] test: imports: From f8de51162c52c771fd3b3924e0aad3f8f28dd811 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 6 Mar 2016 01:00:35 -0500 Subject: [PATCH 3/3] CI: install libpng in windows --- ci/conda_recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/conda_recipe/meta.yaml b/ci/conda_recipe/meta.yaml index 46f0833ca66..ab49c6c758d 100644 --- a/ci/conda_recipe/meta.yaml +++ b/ci/conda_recipe/meta.yaml @@ -52,7 +52,7 @@ requirements: - pytz - pyparsing # - py2cairo # [linux and py2k] - - libpng # [unix] + - libpng - pyqt # [not osx] - tk # [linux and win] - functools32 # [py2k]