Commit Graph

164 Commits

Author SHA1 Message Date
Alex Clark
4b40839970 Revert "Bump"
This reverts commit 4fe5d520fb.

Hah, foiled by PEP8
2014-07-15 06:15:31 -04:00
Alex Clark
4fe5d520fb Bump
Though I hate the 'dev' designation I want something to indicate master is where development for the next major version happens. I think we've previously disagreed on simply 'X.X.X' so I'm going with 'X.X.Xdev' to see if that is more palatable. :-)
2014-07-15 06:02:34 -04:00
Alex Clark
f8b6163d9f Bump 2.4.0 -> 2.5.0 2014-07-01 07:42:50 -04:00
Alex Clark
176987f8aa Rename VERSION -> PILLOW_VERSION
Provide consistency with version variables elsewhere in package.
2014-07-01 07:39:03 -04:00
wiredfool
3e8593e1b2 Reenable mp_compile 2014-06-30 14:34:16 -07:00
cgohlke
526ac7e278 Fix build failure when compiler.include_dirs refers to nonexistent directory 2014-06-28 16:15:06 -07:00
Alex Clark ☺
c1035c2832 Merge pull request #744 from matthew-brett/py3-setup-fix
FIX: fix error for setup.py for Python 3
2014-06-28 17:47:36 -04:00
Matthew Brett
29a65c1373 FIX: fix error for setup.py for Python 3
The subprocess command in Python 3 returns a bytes object.  If the
homebrew subprocess check returns a not-empty result, then setup crashes
trying to combine the bytes with the string constants with and error
like "TypeError: Can't mix strings and bytes in path components."
2014-06-28 22:03:40 +01:00
Alex Clark
2f09622516 Top level flake8 fixes 2014-06-27 19:13:00 -04:00
wiredfool
9305e8499b Added python 3.4 2014-06-27 08:58:27 -07:00
wiredfool
c23f900250 reverted __main__ guard 2014-06-27 08:57:49 -07:00
wiredfool
2be4e9f3e5 Multithreaded build 2014-06-24 15:57:24 -07:00
hugovk
fd97d30831 flake8 on morphology changes 2014-06-24 09:34:05 +03:00
wiredfool
6dce921dad Merge branch 'master' into morphology 2014-06-23 16:21:33 -07:00
Dov Grobgeld
5fe80c6d4a Initial commit of binary morphology addon. 2014-06-04 23:03:00 +03:00
wiredfool
da1523d877 Merge from master, pre-unittest conversion 2014-06-03 14:29:16 -07:00
hugovk
c9a4272af6 Replace python-imaging with python-pillow (but yet not Coveralls) 2014-06-03 13:02:44 +03:00
Eric Soroos
bc2c7bee70 Defer initialization of openjpeg_version 2014-05-30 15:47:27 -07:00
Eric Soroos
f4ddf1be97 Initialize openjpeg_version 2014-05-30 15:08:21 -07:00
Alastair Houghton
1011e51083 Added support for OpenJPEG 2.1. 2014-05-27 12:43:54 +01:00
Jack Nagel
29ddeaa81a Adjust Homebrew freetype detection logic
XQuartz ships an older freetype that still has a top-level "ft2build.h"
header file. Homebrew's freetype is newer and does not have this file,
it only has "freetype2/ft2build.h".

setup.py finds the header in XQuartz first, but Homebrew's compiler
wrappers intentionally strip out the XQuartz include paths during the
build unless the package depends on it explicitly.

We want to prefer Homebrew's freetype anyway, so if it's installed,
let's not even bother to search the XQuartz paths.
2014-05-10 10:15:39 -05:00
wiredfool
7b4768a9fa Bump all the version numbers 2014-04-02 15:25:46 -07:00
Eric Soroos
cde7e3e279 Rearrange lib directory detection, fixes #587 2014-03-31 18:59:29 +00:00
cgohlke
e7e103b1a5 Link openjpeg2 statically on Windows 2014-03-28 20:29:58 -07:00
wiredfool
7a8025b947 Merge of travis-tweaks into jpeg2k 2014-03-27 20:36:15 -07:00
wiredfool
2b81156619 merge to master 2014-03-26 18:46:35 -07:00
wiredfool
d4ecef390f Try catching the tk error in pypy 2014-03-26 13:12:20 -07:00
Alastair Houghton
5cb73c94e9 Fixed some Windows issues. 2014-03-14 14:35:09 +00:00
Alastair Houghton
61fb89ec54 Added a JPEG 2000 encoder. 2014-03-13 18:27:16 +00:00
Alastair Houghton
d6b8f0f666 Added a JPEG 2000 decoder based on OpenJPEG. 2014-03-13 11:46:47 +00:00
Christian E. Hopps
2867d203cf Handle 32bit compiled python on 64bit architecture
platforma.processor() will return x86_64 on a 64 bit linux system;
however, this it wrong for 32 bit compiled python. By looking at
platform.architecture() first it correctly notes the 32bit
compile.
2014-02-11 15:05:09 -08:00
Alex Clark
cb309c9f59 setup: look in multiarch paths in GNU platforms
Somehow I merged pino's commit into rel_2.3 branch (which I since removed because it was confusing me). Not sure what happened, but this is his code that got lost.
2014-02-01 06:06:21 -05:00
Sandro Mani
04616ba9ea Add arch support for pcc64, s390, s390x, armv7l, aarch64 2014-01-08 11:38:53 +01:00
Eric Soroos
547c668b30 PPC platform specific library files 2014-01-07 23:34:15 +00:00
David McKeone
56ab4fd475 Prefer homebrew freetype over X11 freetype (but still allow both)
I've recently included Pillow with a py2app build of a frozen application on OS X. When Pillow is installed on a machine that has X11, the preference for X11's libfreetype causes a new dependency for my frozen app. I don't want my users to be required to install X11 if they don't have to (it's not included by default after OS X 10.8).

This PR adds a preference for homebrew's libfreetype (if available), which py2app detects and includes, and which doesn't create an X11 dependency in apps that are frozen and use Pillow (PIL).
2014-01-01 15:47:42 -07:00
cgohlke
d85b803440 Report availability of LIBTIFF during setup 2013-12-29 19:10:49 -08:00
Alex Clark ☺
289198b220 Merge pull request #442 from ohanar/path_fixes
Include and library path fixes
2013-12-28 06:09:51 -08:00
wiredfool
549a22e99a restoring byte decode to utf-8 string 2013-12-20 10:39:58 -08:00
R. Andrew Ohana
d999a8b170 setup.py: only use real paths 2013-12-11 01:20:32 -08:00
R. Andrew Ohana
3f3a7b1b06 setup.py: user specified paths and prefix should come before platform 2013-12-11 01:12:58 -08:00
R. Andrew Ohana
3d89ce2078 setup.py: CPATH is an alternative for C_INCLUDE_PATH 2013-12-11 00:58:22 -08:00
R. Andrew Ohana
3cc3548c15 setup.py: remove redundant /usr/local path line 2013-12-11 00:56:40 -08:00
Alex Clark
79603af528 Too many contributors to effectively list
This list was outdated so I'm removing it. At some point I'll do another pass
2013-12-05 05:29:18 -05:00
Alex Clark
18fe7ee519 Prepare for 2.3.0 release in < 30 days 2013-12-05 05:15:58 -05:00
Alexander Nordlund
4ab7c2a782 Adds directories for NetBSD. 2013-11-14 12:10:19 +00:00
Alex Clark ☺
55a0792815 Merge pull request #380 from wiredfool/lcms2
LCMS1 replaced with LCMS2
2013-10-16 09:09:15 -07:00
wiredfool
473f5d8fc7 Changed ''.split to tuples 2013-10-09 21:44:05 -07:00
Domen Kožar
9b6af55702 respect CFLAGS/LDFLAGS when searching for headers/libs 2013-10-07 21:43:39 +02:00
Alex Clark
3c2496e117 Bump 2013-10-02 13:07:32 -04:00
Alex Clark
b145d302d9 Wording [ci skip] 2013-10-02 13:06:06 -04:00