Skip to content
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

Jump to bottom

WIP: more windows build and CI changes #5629

Merged
merged 18 commits into from
Jan 26, 2016
Merged

WIP: more windows build and CI changes #5629

merged 18 commits into from
Jan 26, 2016

Commits on Jan 25, 2016

  1. CI: use proper comments for selectors in meta.yaml

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    b2cb7e5 View commit details
    Browse the repository at this point in the history

  2. CI: Build conda packages on win py2.7

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    2eee386 View commit details
    Browse the repository at this point in the history

  3. CI: switch appveyors builds to use ObviousCI

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    bb71eae View commit details
    Browse the repository at this point in the history

  4. CI: push result images on appveyor failure 

    Redirect output of 7z command to not pollute the log with
endless lines of "compressed file..."
    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    5e16a3e View commit details
    Browse the repository at this point in the history

  5. CI: fix functools32 runtime requirement in conda recipe

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    8159b57 View commit details
    Browse the repository at this point in the history

  6. CI: Update conda package build.sh for unix/mac 

    This file is optimized for CI ServiceS: travis for MACOSX build and
CircleCI for Linux.
    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    b501fd4 View commit details
    Browse the repository at this point in the history

  7. gitignore: add copied windows lib/*.lib

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    7413fe9 View commit details
    Browse the repository at this point in the history

  8. Add how to compile on windows

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    24cead7 View commit details
    Browse the repository at this point in the history

  9. Use conda-forge version of conda recipe 

    See here: https://github.com/conda-forge/matplotlib-feedstock
    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    a1f6ca9 View commit details
    Browse the repository at this point in the history

  10. Win: build with a local freetype 

    Makes it possible to use the local freetype config option in setup.cfg.

Parts of this commit are from https://github.com/jbmohler/matplotlib-winbuild
    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    01c2c6c View commit details
    Browse the repository at this point in the history

  11. conda package: remove tcl patch on windows

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    b9a65b0 View commit details
    Browse the repository at this point in the history

  12. CI: enable local freetype and use conda forge functools on py27

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    f035525 View commit details
    Browse the repository at this point in the history

  13. conda: update patches

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    7753d0e View commit details
    Browse the repository at this point in the history

  14. Appveyor: cleanup working dir before conda build

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    428547d View commit details
    Browse the repository at this point in the history

  15. CI: readd tk build to win conda package

    @jankatins
    jankatins committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    9a04e89 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. CI: work around some conda and appveyor issues 

    Conda prefers the normal VS tools for py27 instead of the python
specific ones and appeveyor has no 64bit versions installed there.

Same for the py34 version of VS, which lacks the vcvars64.bat "hack":
point 4 in
http://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/#for-python-3-4

Also fix some environtment variable leaks from the test environment
to the conda build environment.

Also fix the build error on 64bit builds
    @jankatins
    jankatins committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    a1678f2 View commit details
    Browse the repository at this point in the history

  2. CI/Win: also build a local freetype on py27 64bit

    @jankatins
    jankatins committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    df8feeb View commit details
    Browse the repository at this point in the history

  3. CI: remove unneeded functions for local freetype build

    @jankatins
    jankatins committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    78a029d View commit details
    Browse the repository at this point in the history