Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f035525

Browse filesBrowse files
committed
CI: enable local freetype and use conda forge functools on py27
1 parent b9a65b0 commit f035525
Copy full SHA for f035525

File tree

Expand file treeCollapse file tree

5 files changed

+24
-12
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+24
-12
lines changed

‎README.win.md

Copy file name to clipboardExpand all lines: README.win.md
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ conda create -n "matplotlib_build" python=3.4 numpy python-dateutil pyparsing p
2323
activate matplotlib_build
2424
# this package is only available in the conda-forge channel
2525
conda install -c conda-forge msinttypes
26+
# for python 2.7
27+
conda install -c conda-forge functools32
2628

2729
# copy the libs which have "wrong" names
2830
set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+11-5Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# With infos from
1+
# With infos from
22
# http://tjelvarolsson.com/blog/how-to-continuously-test-your-python-code-on-windows-using-appveyor/
33
# https://packaging.python.org/en/latest/appveyor/
44
# https://github.com/rmcgibbo/python-appveyor-conda-example
@@ -62,12 +62,18 @@ install:
6262
# same things as the requirements in ci/conda_recipe/meta.yaml
6363
- cmd: conda create -y -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.5 msinttypes tk pyparsing pytz tornado libpng zlib pyqt cycler nose mock
6464
- activate test-environment
65+
- cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
66+
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -y functools32
6567
# This is needed for the installer to find the dlls...
6668
- set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib
6769
- cmd: 'mkdir lib || cmd /c "exit /b 0"'
68-
- copy %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
70+
- copy %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
6971
- copy %LIBRARY_LIB%\libpng_static.lib lib\png.lib
7072
- set MPLBASEDIRLIST=%CONDA_DEFAULT_ENV%\Library\;.
73+
# enables the local freetype build
74+
- copy ci\travis\setup.cfg .
75+
# There is no 2.7 64bit freetype build configuration...
76+
- cmd: IF %PYTHON_VERSION% == 2.7 (IF %TARGET_ARCH% == x64 (del setup.cfg))
7177
# Show the installed packages + versions
7278
- conda list
7379

@@ -80,7 +86,7 @@ test_script:
8086

8187
after_test:
8288
# After the tests were a success, build packages (wheels and conda)
83-
89+
8490
# There is a bug in wheels which prevents building wheels when the package uses namespaces
8591
- cmd: '%CMD_IN_ENV% python setup.py bdist_wheel'
8692
# Note also that our setup.py script, which is called by conda-build, writes
@@ -90,15 +96,15 @@ after_test:
9096
- cmd: '%CMD_IN_ENV% conda config --get channels'
9197
- cmd: '%CMD_IN_ENV% conda build .\ci\conda_recipe'
9298
# Move the conda package into the dist directory, to register it
93-
# as an "artifact" for Appveyor.
99+
# as an "artifact" for Appveyor.
94100
- cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"'
95101
- cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"'
96102
- cmd: dir .\dist\
97103

98104
artifacts:
99105
- path: dist\*
100106
name: packages
101-
107+
102108
- path: result_images\*
103109
name: result_images
104110
type: zip

‎build_alllocal.cmd

Copy file name to clipboardExpand all lines: build_alllocal.cmd
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
:: activate matplotlib_build
55
:: # this package is only available in the conda-forge channel
66
:: conda install -c conda-forge msinttypes
7+
:: if you build on py2.7:
8+
:: conda install -c conda-forge functools32
79

810
set TARGET=bdist_wheel
911
IF [%1]==[] (

‎ci/conda_recipe/meta.yaml

Copy file name to clipboardExpand all lines: ci/conda_recipe/meta.yaml
+3-6Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ source:
2323
# by conda build to get the version.
2424
- condaversion.patch
2525

26-
# On Windows, the following error occurs for x64:
27-
# src/ft2font.cpp(5) : fatal error C1083: Cannot open include file: 'string': No such file or directory
28-
build: # [win64]
29-
skip: # [win64]
30-
- True # [win64]
31-
3226
requirements:
3327
build:
3428
- python
@@ -47,6 +41,8 @@ requirements:
4741
- zlib # [win]
4842
- pyqt # [not osx]
4943
- tk # [linux]
44+
- functools32 # [py2k]
45+
5046
run:
5147
- python
5248
- numpy x.x
@@ -59,6 +55,7 @@ requirements:
5955
- libpng # [unix]
6056
- pyqt # [not osx]
6157
- tk # [linux]
58+
- functools32 # [py2k]
6259

6360
test:
6461
imports:

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,10 +1044,15 @@ def do_custom_build(self):
10441044
set MSBUILD=C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe
10451045
rd /S /Q %FREETYPE%\\objs
10461046
%MSBUILD% %FREETYPE%\\builds\\windows\\{vc20xx}\\freetype.sln /t:Clean;Build /p:Configuration="{config}";Platform={WinXX}
1047+
echo Build completed, moving result"
10471048
:: move to the "normal" path for the unix builds...
10481049
mkdir %FREETYPE%\\objs\\.libs
10491050
:: REMINDER: fix when changing the version
1050-
copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1051+
copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1052+
if errorlevel 1 (
1053+
rem This is a py27 version, which has a different location for the lib file :-/
1054+
copy %FREETYPE%\\objs\\{WinXX}\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1055+
)
10511056
"""
10521057
from setup_external_compile import fixproj, prepare_build_cmd, VS2010, X64, tar_extract
10531058
vc = 'vc2010' if VS2010 else 'vc2008'

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.