luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from stephengroat/patch-1 

use new travis homebrew addon
This commit is contained in:
Matthias Köfferlein 2018-12-18 21:54:48 +01:00 committed by GitHub
parent 31a9598c35 5d4b0dac1a
commit 07bce7ee21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
.travis.yml
View File

@ -10,7 +10,6 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python2 osx10.12" - name: "klayout python2 osx10.12"
os: osx os: osx
@ -20,7 +19,6 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python2 osx10.11" - name: "klayout python2 osx10.11"
os: osx os: osx
@ -30,19 +28,22 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
# python 3 osx # python 3 osx
- name: "klayout python3 osx10.13" - name: "klayout python3 osx10.13"
os: osx os: osx
osx_image: xcode9.4 # macOS 10.13 osx_image: xcode9.4 # macOS 10.13
addons:
homebrew:
packages:
- python3
update: true
env: env:
- MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=true
- name: "klayout python3.6.6 osx10.13" - name: "klayout python3.6.6 osx10.13"
os: osx os: osx
@ -52,7 +53,6 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python3.5.6 osx10.13" - name: "klayout python3.5.6 osx10.13"
os: osx os: osx
@ -62,7 +62,6 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python3.4.9 osx10.13" - name: "klayout python3.4.9 osx10.13"
os: osx os: osx
@ -72,17 +71,20 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python3 osx10.12" - name: "klayout python3 osx10.12"
os: osx os: osx
osx_image: xcode8.3 # macOS 10.12 osx_image: xcode8.3 # macOS 10.12
addons:
homebrew:
packages:
- python3
update: true
env: env:
- MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=true
- name: "klayout python3 osx10.11" - name: "klayout python3 osx10.11"
os: osx os: osx
@ -92,7 +94,6 @@ matrix:
- ARCHFLAGS="-std=c++11" - ARCHFLAGS="-std=c++11"
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- name: "klayout python3.7 package" - name: "klayout python3.7 package"
os: linux os: linux
@ -104,7 +105,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -118,7 +118,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -132,7 +131,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -146,7 +144,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="0" # setuptools installed from last pip has syntax error on py 2.6 - PIP_UPDATE="0" # setuptools installed from last pip has syntax error on py 2.6
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -160,7 +157,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -174,7 +170,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -188,7 +183,6 @@ matrix:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PIP_UPDATE="1" - PIP_UPDATE="1"
- PYTHON_BUILD=true - PYTHON_BUILD=true
- BREW_BUNDLE=false
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
@ -197,73 +191,95 @@ matrix:
- name: "KLayout macOS 10.13 with py3.7" - name: "KLayout macOS 10.13 with py3.7"
os: osx os: osx
osx_image: xcode9.4 # macOS 10.13 osx_image: xcode9.4 # macOS 10.13
addons:
homebrew:
packages:
- python3
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=B37 - PYTHON_VERSION=B37
- MACOS_VERSION=HighSierra - MACOS_VERSION=HighSierra
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
- name: "KLayout macOS 10.12 with py3.7" - name: "KLayout macOS 10.12 with py3.7"
os: osx os: osx
osx_image: xcode8.3 # macOS 10.12 osx_image: xcode8.3 # macOS 10.12
addons:
homebrew:
packages:
- python3
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=B37 - PYTHON_VERSION=B37
- MACOS_VERSION=Sierra - MACOS_VERSION=Sierra
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
- name: "KLayout macOS 10.11 with py3.7" - name: "KLayout macOS 10.11 with py3.7"
os: osx os: osx
osx_image: xcode8 # macOS 10.11 osx_image: xcode8 # macOS 10.11
addons:
homebrew:
packages:
- python3
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=B37 - PYTHON_VERSION=B37
- MACOS_VERSION=ElCapitan - MACOS_VERSION=ElCapitan
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
# Python 2 # Python 2
- name: "KLayout macOS 10.13 with py2.7" - name: "KLayout macOS 10.13 with py2.7"
os: osx os: osx
osx_image: xcode9.4 # macOS 10.13 osx_image: xcode9.4 # macOS 10.13
addons:
homebrew:
packages:
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=Sys - PYTHON_VERSION=Sys
- MACOS_VERSION=HighSierra - MACOS_VERSION=HighSierra
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
- name: "KLayout macOS 10.12 with py2.7" - name: "KLayout macOS 10.12 with py2.7"
os: osx os: osx
osx_image: xcode8.3 # macOS 10.12 osx_image: xcode8.3 # macOS 10.12
addons:
homebrew:
packages:
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=Sys - PYTHON_VERSION=Sys
- MACOS_VERSION=Sierra - MACOS_VERSION=Sierra
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
- name: "KLayout macOS 10.11 with py2.7" - name: "KLayout macOS 10.11 with py2.7"
os: osx os: osx
osx_image: xcode8 # macOS 10.11 osx_image: xcode8 # macOS 10.11
addons:
homebrew:
packages:
- qt
update: true
env: env:
- MATRIX_EVAL="" - MATRIX_EVAL=""
- PYTHON_VERSION=Sys - PYTHON_VERSION=Sys
- MACOS_VERSION=ElCapitan - MACOS_VERSION=ElCapitan
- KLAYOUT_BUILD=true - KLAYOUT_BUILD=true
- BREW_BUNDLE=true
before_install: before_install:
- env - env
- gem install dropbox-deployment - gem install dropbox-deployment
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
- if [ "$BREW_BUNDLE" = true ]; then
find "$(brew --prefix)/Caskroom/"*'/.metadata' -type f -name '*.rb' | xargs grep 'EOS.undent' --files-with-matches | xargs sed -i '' 's/EOS.undent/EOS/';
brew update;
brew bundle;
fi
- if [ "${PIP_UPDATE}" == "1" ]; then - if [ "${PIP_UPDATE}" == "1" ]; then
pip --version; pip --version;
pip install --upgrade pip || sudo pip install --upgrade pip; pip install --upgrade pip || sudo pip install --upgrade pip;