From 187108fae9f2b1c0198644b550b570767148c288 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 2 Oct 2015 15:07:50 +0300 Subject: [PATCH 1/3] Add Travis CI's Python versions to matrix Travis CI uses Ubuntu 12.04 LTS Server Edition 64 bit, and is also tested on 3.4 and 3.5. Travis CI also uses OS X Mavericks, and is also tested on 3.2 and 3.3. I've left out 3.5 because it's not yet passing. [CI skip] --- docs/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index e14682212..7b6ebff74 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -248,7 +248,7 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Mac OS X 10.10 Yosemite |Yes | 2.7,3.3,3.4 | 2.8.1,2.9 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Mac OS X 10.9 Mavericks |Yes | 2.7,3.4 | 2.6.1 |x86-64 | +| Mac OS X 10.9 Mavericks |Yes | 2.7,3.2,3.3,3.4 | 2.6.1 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Mac OS X 10.8 Mountain Lion |Yes | 2.6,2.7,3.2,3.3 | |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ @@ -260,8 +260,8 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Ubuntu Linux 10.04 LTS |Yes | 2.6 | 2.3.0 |x86,x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Ubuntu Linux 12.04 LTS |Yes | 2.6,2.7,3.2,3.3,PyPy2.4, | 2.6.1 |x86,x86-64 | -| | | PyPy3,v2.3 | | | +| Ubuntu Linux 12.04 LTS |Yes | 2.6,2.7,3.2,3.3,3.4,3.5 | 2.6.1 |x86,x86-64 | +| | | PyPy2.4,PyPy3,v2.3 | | | | | | | | | | | | 2.7,3.2 | 2.6.1 |ppc | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ From 9ff42d30b22069c5472001ceeb4b5c8bd76139d7 Mon Sep 17 00:00:00 2001 From: hugovk Date: Fri, 2 Oct 2015 15:44:35 +0300 Subject: [PATCH 2/3] Only list most recently tested --- docs/installation.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 7b6ebff74..f35d6526d 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -246,9 +246,9 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ |**Operating system** |**Supported**|**Tested Python versions** |**Tested Pillow versions** |**Tested processors** | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Mac OS X 10.10 Yosemite |Yes | 2.7,3.3,3.4 | 2.8.1,2.9 |x86-64 | +| Mac OS X 10.10 Yosemite |Yes | 2.7,3.3,3.4 | 2.9.0 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Mac OS X 10.9 Mavericks |Yes | 2.7,3.2,3.3,3.4 | 2.6.1 |x86-64 | +| Mac OS X 10.9 Mavericks |Yes | 2.7,3.2,3.3,3.4 | 3.0.0 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Mac OS X 10.8 Mountain Lion |Yes | 2.6,2.7,3.2,3.3 | |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ @@ -260,7 +260,7 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Ubuntu Linux 10.04 LTS |Yes | 2.6 | 2.3.0 |x86,x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Ubuntu Linux 12.04 LTS |Yes | 2.6,2.7,3.2,3.3,3.4,3.5 | 2.6.1 |x86,x86-64 | +| Ubuntu Linux 12.04 LTS |Yes | 2.6,2.7,3.2,3.3,3.4,3.5 | 3.0.0 |x86,x86-64 | | | | PyPy2.4,PyPy3,v2.3 | | | | | | | | | | | | 2.7,3.2 | 2.6.1 |ppc | @@ -271,7 +271,7 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Gentoo Linux |Yes | 2.7,3.2 | 2.1.0 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| FreeBSD 10 |Yes | 2.7,3.4 | 2.4,2.3.1 |x86-64 | +| FreeBSD 10 |Yes | 2.7,3.4 | 2.4.0 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Windows 7 Pro |Yes | 2.7,3.2,3.3 | 2.2.1 |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ @@ -279,7 +279,7 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Windows 8 Pro |Yes | 2.6,2.7,3.2,3.3,3.4a3 | 2.2.0 |x86,x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ -| Windows 8.1 Pro |Yes | 2.6,2.7,3.2,3.3,3.4 | 2.3.0, 2.4.0 |x86,x86-64 | +| Windows 8.1 Pro |Yes | 2.6,2.7,3.2,3.3,3.4 | 2.4.0 |x86,x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ Old Versions From 2570354069fa9a40094c483e6878b6a652eeba1b Mon Sep 17 00:00:00 2001 From: hugovk Date: Fri, 2 Oct 2015 15:46:26 +0300 Subject: [PATCH 3/3] Add AppVeyor build to support matrix --- docs/installation.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation.rst b/docs/installation.rst index f35d6526d..d4a00c16a 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -277,6 +277,8 @@ current versions of Linux, OS X, and Windows. +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Windows Server 2008 R2 Enterprise|Yes | 3.3 | |x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ +| Windows Server 2012 R2 |Yes | 2.7,3.3,3.4 | 3.0.0 |x86-64 | ++----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Windows 8 Pro |Yes | 2.6,2.7,3.2,3.3,3.4a3 | 2.2.0 |x86,x86-64 | +----------------------------------+-------------+------------------------------+------------------------------+-----------------------+ | Windows 8.1 Pro |Yes | 2.6,2.7,3.2,3.3,3.4 | 2.4.0 |x86,x86-64 |