From bda1304500a1ff6dbd6cef8fe811a8b236b700c7 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Sun, 7 Oct 2018 22:56:44 -0400 Subject: [PATCH 1/6] fixed macos10.11 version with py3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 691fa5f30..4b21af936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ matrix: os: osx osx_image: xcode8 # macOS 10.11 env: - - MATRIX_EVAL="brew update; brew config; brew upgrade python;" + - MATRIX_EVAL="brew update; brew config; brew upgrade python; brew postinstall python; ls -l /usr/local/opt/python/libexec/bin/; shopt -s expand_aliases; alias python='/usr/local/opt/python/libexec/bin/python'; alias pip='/usr/local/opt/python/libexec/bin/pip';" - ARCHFLAGS="-std=c++11" - PIP_UPDATE="1" - PYTHON_BUILD=true From 5dcc01f0f3b19b12d700c828165073621ad60bb8 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Mon, 8 Oct 2018 01:12:51 -0400 Subject: [PATCH 2/6] adding linux pymod py3.7 with clang instead of gcc --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4b21af936..5c2d9ab95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,19 @@ matrix: - PYTHON_BUILD=true - BREW_BUNDLE=false + - name: "klayout python3.7 package" + os: linux + dist: trusty # Ubuntu 14.04 + sudo: false + language: python + python: '3.7-dev' + env: + - MATRIX_EVAL="" + - PIP_UPDATE="1" + - PYTHON_BUILD=true + - BREW_BUNDLE=false + - CC=clang + - name: "klayout python3.6 package" os: linux dist: trusty # Ubuntu 14.04 From a2e357cf9cfca1ed51c87b3e8896c1c9e5241696 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Mon, 8 Oct 2018 01:20:17 -0400 Subject: [PATCH 3/6] testing new compile flags --- .travis.yml | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c2d9ab95..d0cb08029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ matrix: - PYTHON_BUILD=true - BREW_BUNDLE=false - CC=clang + - CXX=clang++ - name: "klayout python3.6 package" os: linux diff --git a/setup.py b/setup.py index f7b4d2c44..211d6a257 100644 --- a/setup.py +++ b/setup.py @@ -149,7 +149,7 @@ class Config(object): return [] else: return ["-Wno-strict-aliasing", # Avoids many "type-punned pointer" warnings - "-std=c++0x", # because we use unordered_map/unordered_set + "-std=c++11", # because we use unordered_map/unordered_set ] def link_args(self, mod): From 6d69f22ece641b07481d4888b9618e63ec2479c4 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Mon, 8 Oct 2018 02:03:46 -0400 Subject: [PATCH 4/6] building and linking in linux with clang and clang++, respectively (smaller binaries) --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index d0cb08029..26aefaebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,8 @@ matrix: - PIP_UPDATE="1" - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ - name: "klayout python2.7 package" os: linux @@ -111,6 +113,8 @@ matrix: - PIP_UPDATE="1" - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ - name: "klayout python2.6 package" os: linux @@ -123,6 +127,8 @@ matrix: - PIP_UPDATE="0" # setuptools installed from last pip has syntax error on py 2.6 - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ - name: "klayout python3.3 package" os: linux @@ -135,6 +141,8 @@ matrix: - PIP_UPDATE="1" - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ - name: "klayout python3.4 package" os: linux @@ -147,6 +155,8 @@ matrix: - PIP_UPDATE="1" - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ - name: "klayout python3.5 package" os: linux @@ -159,6 +169,8 @@ matrix: - PIP_UPDATE="1" - PYTHON_BUILD=true - BREW_BUNDLE=false + - CC=clang + - CXX=clang++ # KLayout builds for mac # Python 3 From 69bc566e0f91b0b9b948dc78d2b064f0f651cc5e Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Mon, 8 Oct 2018 01:54:41 -0400 Subject: [PATCH 5/6] adding python 3.5 and 3.4 for osx 10.13 --- .travis.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26aefaebe..956702401 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,11 +44,31 @@ matrix: - PYTHON_BUILD=true - BREW_BUNDLE=true - - name: "klayout python3.6.5_1 osx10.13" + - name: "klayout python3.6.6 osx10.13" os: osx osx_image: xcode9.4 # macOS 10.13 env: - - MATRIX_EVAL="brew update; brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a764ef944b1080be64bd88dca9a1d80130c558/Formula/python.rb; brew switch python 3.6.5_1; shopt -s expand_aliases; alias python='python3'; alias pip='pip3';" + - MATRIX_EVAL="brew update; brew install sashkab/python/python36; brew link --force --overwrite python36; shopt -s expand_aliases; alias python='/usr/local/opt/python36/bin/python3.6'; alias pip='/usr/local/opt/python36/bin/pip3.6';" + - ARCHFLAGS="-std=c++11" + - PIP_UPDATE="1" + - PYTHON_BUILD=true + - BREW_BUNDLE=false + + - name: "klayout python3.5.6 osx10.13" + os: osx + osx_image: xcode9.4 # macOS 10.13 + env: + - MATRIX_EVAL="brew update; brew install sashkab/python/python35; brew link --force --overwrite python35; shopt -s expand_aliases; alias python='/usr/local/opt/python35/bin/python3.5'; alias pip='/usr/local/opt/python35/bin/pip3.5';" + - ARCHFLAGS="-std=c++11" + - PIP_UPDATE="1" + - PYTHON_BUILD=true + - BREW_BUNDLE=false + + - name: "klayout python3.4.9 osx10.13" + os: osx + osx_image: xcode9.4 # macOS 10.13 + env: + - MATRIX_EVAL="brew update; brew install sashkab/python/python34; brew link --force --overwrite python34; shopt -s expand_aliases; alias python='/usr/local/opt/python34/bin/python3.4'; alias pip='/usr/local/opt/python34/bin/pip3.4';" - ARCHFLAGS="-std=c++11" - PIP_UPDATE="1" - PYTHON_BUILD=true From f007d2d75882c9491e43339e7963508c6a811bc6 Mon Sep 17 00:00:00 2001 From: Thomas Ferreira de Lima Date: Mon, 8 Oct 2018 11:27:06 -0400 Subject: [PATCH 6/6] latest version of ruby not necessary for dropbox-deployment --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 956702401..0898c58d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -257,7 +257,6 @@ matrix: before_install: - env - - rvm install ruby --latest - gem install dropbox-deployment - eval "${MATRIX_EVAL}" - if [ "$BREW_BUNDLE" = true ]; then