Skip to content

Commit 24f3c1f

Browse files
committed
conda-recipe: workaround newer libpng issue
conda-fore currently does not copy libpng16.lib as png.lib, which the older package from the defaults channel did. Lets do that for the moment and enable the conda build again. png.lib during the conda build (as opposed to the static one in the tests and wheel builds, which contains all object code) is used as a kind of header file, the real linked dependency is then on `libpng16.dll` and therefore we need a libpng dependency in the conda binary package.
1 parent 06ac33e commit 24f3c1f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ install:
7171
# VS tools instead of the also installed Py27 VS compiler (which wouldn't need this workarounds...)
7272
- 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"
7373

74-
# For building, use a new environment which only include sthe requirements for mpl
74+
# 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
7676
- 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
7777
- activate test-environment
@@ -96,13 +96,13 @@ test_script:
9696
- python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
9797
# tests
9898
- python tests.py
99-
# remove to get around libpng issue?
99+
# Generate a html for visual tests
100100
- python visual_tests.py
101101

102102
after_test:
103103
# After the tests were a success, build packages (wheels and conda)
104104

105-
# Build the wheel
105+
# Build the wheel with the static libs
106106
# Hide the output, the copied files really clutter the build log...
107107
- cmd: '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
108108

@@ -116,7 +116,7 @@ after_test:
116116
- cmd: path
117117
- cmd: where python
118118
- cmd: '%CMD_IN_ENV% conda config --get channels'
119-
# - cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'
119+
- cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'
120120

121121
# Move the conda package into the dist directory, to register it
122122
# as an "artifact" for Appveyor.

ci/conda_recipe/bld.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@ ECHO tests = False >> setup.cfg
88
ECHO sample_data = False >> setup.cfg
99
ECHO toolkits_tests = False >> setup.cfg
1010

11+
@rem workaround for https://github.com/matplotlib/matplotlib/issues/6460
12+
@rem see also https://github.com/conda-forge/libpng-feedstock/pull/4
13+
copy /y %LIBRARY_LIB%\libpng16.lib %LIBRARY_LIB%\png.lib
14+
1115
%PYTHON% setup.py install
1216
if errorlevel 1 exit 1

0 commit comments

Comments
 (0)