CI: try explicitly including msvc_runtime #6116

Merged
merged 3 commits into from Mar 6, 2016

Conversation

Projects
None yet
5 participants
Owner

tacaswell commented Mar 6, 2016

Might solve #6115

@tacaswell tacaswell CI: try explicitly including msvc_runtime
Might solve #6115
ed4d60f

tacaswell added some commits Mar 6, 2016

@tacaswell tacaswell CI: add msvc_runtime to conda recipe
f15adc6
@tacaswell tacaswell CI: install libpng in windows
f8de511

@janschulz janschulz commented on the diff Mar 6, 2016

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
@janschulz

janschulz Mar 6, 2016

Contributor

IMO this isn't necessary, the fix is the libpng (without # [unix]) line below?

@janschulz

janschulz Mar 6, 2016

Contributor

ok, strike that this seems to be fixing the 3.3 error, I looked only at the 27 one?

Contributor

janschulz commented Mar 6, 2016

IMO this should be merged... Maybe the conda ppl can shed some light why this is only now failing... OR if the msvc dependency it the right thing to do...

Owner

jenshnielsen commented Mar 6, 2016

Ok lets merge this. If it can be done in a more clean way we can change it again

@jenshnielsen jenshnielsen added a commit that referenced this pull request Mar 6, 2016

@jenshnielsen jenshnielsen Merge pull request #6116 from tacaswell/ci_fix_appveyor
CI: try explicitly including msvc_runtime
1fb465a

@jenshnielsen jenshnielsen merged commit 1fb465a into matplotlib:master Mar 6, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

mdboom removed the needs_review label Mar 6, 2016

tacaswell deleted the tacaswell:ci_fix_appveyor branch Mar 6, 2016

QuLogic added this to the 2.1 (next point release) milestone Jul 5, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment