From 4af81bebaaedce755f0f389b33b3806856ef17a2 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Fri, 30 Dec 2016 09:52:06 +0000 Subject: [PATCH 1/6] NF: add Python 3.6 build to matrix --- .travis.yml | 4 ++++ multibuild | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cda956e38..568ee8234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,6 +73,10 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.5 + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.6 before_install: - source multibuild/common_utils.sh diff --git a/multibuild b/multibuild index db8f38459..cd526bf45 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit db8f384596bbe436efdfa205f181f6c5209abbc4 +Subproject commit cd526bf4505fc4a10d7d045350053ff9954892fa From 2e5ac3af7561614dfd84fa41dea2ed2cf473b009 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 1 Jan 2017 15:20:13 +0000 Subject: [PATCH 2/6] Add Linux builds for Python 3.6 --- .travis.yml | 7 +++++++ multibuild | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 568ee8234..a81521bb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,13 @@ matrix: env: - MB_PYTHON_VERSION=3.5 - PLAT=i686 + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - os: linux + env: + - MB_PYTHON_VERSION=3.6 + - PLAT=i686 - os: osx language: generic env: MB_PYTHON_VERSION=2.7 diff --git a/multibuild b/multibuild index cd526bf45..fba60d9c6 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit cd526bf4505fc4a10d7d045350053ff9954892fa +Subproject commit fba60d9c63c4f1103ca1ee06e793e4a52a04580b From b85e3d13aed441c3204e0a5bad7499637aa17c27 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 1 Jan 2017 16:02:41 +0000 Subject: [PATCH 3/6] Try reverting to previous multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index fba60d9c6..cd526bf45 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit fba60d9c63c4f1103ca1ee06e793e4a52a04580b +Subproject commit cd526bf4505fc4a10d7d045350053ff9954892fa From e88f28aa4457bcc5b2d7b34d14544b299f2c9120 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 1 Jan 2017 16:41:07 +0000 Subject: [PATCH 4/6] Update zlib version for build zlib does not appear to keep its old archives. --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index cd526bf45..5a20b0846 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit cd526bf4505fc4a10d7d045350053ff9954892fa +Subproject commit 5a20b0846e0118febf7e2155d14851f96483a536 From e83989165ae09c02ceac2e26eac7f9dcb8aa98ac Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 1 Jan 2017 17:51:51 +0000 Subject: [PATCH 5/6] Update to latest zlib version --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index ddcf152a8..9ac546bf0 100644 --- a/config.sh +++ b/config.sh @@ -4,7 +4,7 @@ # Package versions for fresh source builds FREETYPE_VERSION=2.6.5 LIBPNG_VERSION=1.6.25 -ZLIB_VERSION=1.2.8 +ZLIB_VERSION=1.2.9 JPEG_VERSION=9b OPENJPEG_VERSION=2.1 TIFF_VERSION=4.0.6 From be638712487577814073def86b975a660eeb01e3 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 1 Jan 2017 18:12:12 +0000 Subject: [PATCH 6/6] Update to latest multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index 5a20b0846..93ec51083 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 5a20b0846e0118febf7e2155d14851f96483a536 +Subproject commit 93ec510830049fbf96f3ebaafdb3799b9e9b037d