Skip to content

CI: try explicitly including msvc_runtime #6116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 3 commits into from
Mar 6, 2016
Merged

CI: try explicitly including msvc_runtime #6116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed4d60f
CI: try explicitly including msvc_runtime
tacaswell Mar 6, 2016
f15adc6
CI: add msvc_runtime to conda recipe
tacaswell Mar 6, 2016
f8de511
CI: install libpng in windows
tacaswell Mar 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@jankatins jankatins Mar 6, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jankatins jankatins Mar 6, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

- activate test-environment
- cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32
Expand Down
4 changes: 3 additions & 1 deletion ci/conda_recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ requirements:
- pyqt # [not osx]
- tk # [linux and win]
- functools32 # [py2k]
- msvc_runtime # [win]

run:
- python
Expand All @@ -51,10 +52,11 @@ requirements:
- pytz
- pyparsing
# - py2cairo # [linux and py2k]
- libpng # [unix]
- libpng
- pyqt # [not osx]
- tk # [linux and win]
- functools32 # [py2k]
- msvc_runtime # [win]

test:
imports:
Expand Down