Skip to content

Commit

Permalink
Add olefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ocefpaf committed Jan 25, 2017
1 parent 64bbc98 commit f78d1c5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 23 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
language: generic

os: osx
osx_image: beta-xcode6.1
osx_image: xcode6.4

env:
matrix:

- CONDA_PY=27
- CONDA_PY=34
- CONDA_PY=35
- CONDA_PY=36
global:
Expand All @@ -20,7 +19,7 @@ env:

before_install:
# Remove homebrew.
- brew remove --force $(brew list)
- brew remove --force --ignore-dependencies $(brew list)
- brew cleanup -s
- rm -rf $(brew --cache)

Expand Down
15 changes: 3 additions & 12 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ environment:
CONDA_PY: 27
CONDA_INSTALL_LOCN: C:\\Miniconda-x64

- TARGET_ARCH: x86
CONDA_PY: 34
CONDA_INSTALL_LOCN: C:\\Miniconda3

- TARGET_ARCH: x64
CONDA_PY: 34
CONDA_INSTALL_LOCN: C:\\Miniconda3-x64

- TARGET_ARCH: x86
CONDA_PY: 35
CONDA_INSTALL_LOCN: C:\\Miniconda35
Expand All @@ -40,11 +32,11 @@ environment:

- TARGET_ARCH: x86
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda
CONDA_INSTALL_LOCN: C:\\Miniconda35

- TARGET_ARCH: x64
CONDA_PY: 36
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64


# We always use a 64-bit machine, but can build x86 distributions
Expand All @@ -67,9 +59,8 @@ install:
- cmd: rmdir C:\cygwin /s /q

# Add path, activate `conda` and update conda.
- cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
- cmd: conda update --yes --quiet conda
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- cmd: conda update --yes --quiet conda

- cmd: set PYTHONUNBUFFERED=1

Expand Down
8 changes: 1 addition & 7 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,13 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
# Embarking on 4 case(s).
# Embarking on 3 case(s).
set -x
export CONDA_PY=27
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
set -x
export CONDA_PY=34
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
set -x
export CONDA_PY=35
set +x
Expand Down
3 changes: 2 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:
sha256: ece687f83a78db7ac608aaa9469fc4d5dbc22757c5bc814cee75f457382d26bc

build:
number: 0
number: 1

requirements:
build:
Expand All @@ -27,6 +27,7 @@ requirements:
- zlib 1.2.*
- freetype 2.6.*
- libtiff 4.0.*
- olefile

test:
imports:
Expand Down

0 comments on commit f78d1c5

Please sign in to comment.