Commit Graph

408 Commits

Author SHA1 Message Date
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
wiredfool
c4758452bb try/except around homebrew, fixes #356 2013-10-02 08:36:47 -07:00
wiredfool
e9e5599412 buildable, selftest registers properly 2013-10-01 23:05:56 -07:00
Alex Clark
9cb8486581 Bump all the things 2013-09-28 11:02:35 -04:00
Alex Clark
2b32882a1a Add pyroma rating 2013-09-28 09:28:16 -04:00
Alex Clark
f7393d8977 Add faux test suite
It would be great if we could start moving PIL's tests in to a proper test suite i.e. inside a Python package
2013-09-28 09:26:28 -04:00
Alex Clark
a2cca80eae Test failed
See: 6d8c6f582a
2013-09-28 08:56:44 -04:00
Alex Clark
cb4eafec17 Py3 compat 2013-09-27 17:10:38 -04:00
Alex Clark ☺
5881d67eea Merge pull request #336 from nu774/issue329
issue 329: setup.py: better support for C_INCLUDE_PATH, LD_RUN_PATH, etc...
2013-09-27 04:33:15 -07:00
Alex Clark
6404d5c1f8 Rename 2013-09-27 07:30:05 -04:00
nu774
2b8225615b issue 329: setup.py: better support for C_INCLUDE_PATH, LD_RUN_PATH, etc.
Fix to support colon separated path list, and also support INCLUDE and LIB
environment variable used by MSVC.
2013-09-27 20:19:52 +09:00
Alex Clark
6d8c6f582a Add provides PIL
Testing http://www.python.org/dev/peps/pep-0426/#provides
2013-09-27 06:27:27 -04:00
Don Spaulding
6568cb0deb Automatically discover homebrew lib/ and include/ paths if installed on OSX.
This change allows Pillow to discover installed libs on OSX when using the homebrew package manager outside of `/usr/local/`.

It relies on the commands module, which goes away in Python 3.  If it seems like a good change to add, I can switch the code over to subprocess.
2013-09-20 11:52:45 -05:00
Sean Upton
1869ed5272 Add respective paths for C_INCLUDE_PATH, LD_RUN_PATH (rpath) to build if specified as environment variables. 2013-08-26 07:35:55 -06:00
Alex Clark
e0d8a198e8 Add history [ci skip] 2013-08-21 18:29:54 -04:00
Alex Clark
2f803e653c Rename 2013-07-22 14:08:45 -04:00
Alex Clark
0884edd7f3 Rename 2013-07-22 13:47:47 -04:00
Bernardo Heynemann
b4735f7829 Adding support for metadata in webp images.
Pillow now uses the webpmux library to envelop the webp images in RIFF. This allows for easy support of exif and icc_profile metadata.

Also included tests that verify compatibility with jpeg for exif and icc_profile metadata.

If the user does not have webp with webpmux enabled, pillow will fall back to the previous approach, meaning no exif or icc_profile metadata will be read or written to.
2013-07-04 18:04:07 -03:00
Alex Clark
b4ec2f705a Clean up 2013-07-01 12:29:57 -04:00
Michał Górny
e09580e12c Introduce --enable-x and fail if it is given and x is not available. 2013-06-08 08:24:06 +02:00
Michał Górny
570c2adeaf Introduce abstraction over --disable-feature. 2013-06-08 08:24:06 +02:00
Michał Górny
810e916342 Support --disable-* switches to disable features.
For example, --disable-jpeg unconditionally disables both checks jpeg
support and checks for libjpeg.
2013-05-31 00:17:30 +02:00
Alex Clark ☺
5c11e27a97 Merge pull request #228 from d-schmidt/master
working gif optimization
2013-05-24 05:59:23 -07:00
David Schmidt
a9cb1281f4 fix Python 2 compatibility 2013-05-24 11:55:31 +02:00
wiredfool
310341cec7 merge from master 2013-05-13 09:17:52 -07:00
Alex Clark
717b9599a3 Bump 2013-05-11 20:13:16 -04:00
Alex Clark
5d38c76899 Clean up SETUP SUMMARY; remove PIL_VERSION 2013-05-11 20:12:27 -04:00
Alex Clark
79186baec7 _find_version appears unused 2013-05-11 20:01:03 -04:00
Alex Clark
714211b327 Update URL 2013-05-11 19:57:26 -04:00
Alex Clark
1e54021afc Flake8 fixes 2013-05-11 19:56:02 -04:00
Alex Clark
290e3e92a6 Wording 2013-05-08 16:06:16 -04:00
wiredfool
315503e9d5 Workaround for python issue: http://bugs.python.org/16754 in 3.2.x < 3.2.4 and 3.3.0 2013-04-23 21:09:32 -07:00
wiredfool
026f6bb61e namespaced operation works when installed as a zipped egg using 'sudo python[3] setup.py easy_install -l --zip-ok .' 2013-04-15 10:57:37 -07:00
wiredfool
8295e33390 moved _webp into the PIL namespace 2013-04-08 21:53:59 -07:00
wiredfool
c774f9ab4c merged pull request #88 to master, resolved conflicts 2013-04-08 20:31:28 -07:00
wiredfool
8c55b8305c fixed duplicate dpkg 2013-03-27 09:04:11 -07:00
Alex Clark
3b3b1d5497 Change URL to http://python-imaging.github.com/ 2013-03-15 13:42:19 -04:00
Alex Clark
10da86b601 Wording 2013-03-15 08:47:10 -04:00
user
416910dd44 Making Linux platform testing try both in case processor() returns
something stupid.
2013-03-15 04:31:16 +00:00
Alex Clark
a5a6eb1870 Rename 2013-03-14 07:25:22 -04:00
Alex Clark
e5d169a440 Clean up new lines 2013-03-14 07:07:46 -04:00
Alex Clark
2f684cf3a5 Wording, get rid of newline 2013-03-13 22:20:25 -04:00
Alex Clark
a60a987866 Move experimental notation 2013-03-13 20:43:01 -04:00
Alex Clark ☺
62bb9aaaa2 Merge pull request #98 from wiredfool/g4_support
G4 Tiff support
2013-03-13 15:41:33 -07:00
wiredfool
dd78115f0a following rename of find_library_file to _find_library_file 2013-03-13 13:40:12 -07:00
Alex Clark ☺
bb186fe516 Merge pull request #96 from lqs/master
add support for webp
2013-03-13 04:39:42 -07:00
wiredfool
7226d0dc26 Merge branch 'master' into g4_support 2013-03-12 22:24:36 -07:00
Liu Qishuai
a49ea5d326 add support for webp 2013-03-12 22:30:59 +08:00
Oliver Tonnhofer
6537ba19c3 backport PIL's PNG/Zip improvements
- add new FASTOCTREE quantizer with alpha support
- make ZIP compress level and type configurable
- support reading/writing PNGs with paletted alpha

source 3637439d51
2013-03-11 20:33:04 +01:00
wiredfool
5ba6564e26 initial merge of wiredfool/Python-Imaging-Library-G4-Tiff-Support 2013-03-08 19:51:59 -08:00
Alex Clark
deca17accd Fix setup ; wording 2013-03-08 19:47:20 -05:00
Alex Clark
3971be1b00 Revert "Do not install extension modules into sys.path"
This reverts commit 3ca5aed602.
2013-03-08 18:36:42 -05:00
Christoph Gohlke
3ca5aed602 Do not install extension modules into sys.path 2013-03-08 13:22:49 -08:00
Alex Clark
bb2871c6dd Make pyroma slightly happier 2013-03-08 09:54:43 -05:00
Alex Clark
955dfc07d3 Only test 2.6, 2.7, and 3.3 2013-03-08 09:12:06 -05:00
Alex Clark
ae17d254fc Restore orig readme and add changes to history 2013-03-08 09:00:23 -05:00
Alex Clark
6f3158528f Fix manifest 2013-03-08 08:21:12 -05:00
Alex Clark
5c9c5e45fd Master is 2.0 2013-03-06 06:14:32 -05:00
Alex Clark ☺
7866759827 Merge pull request #60 from Sapphire64/master
Py3k libraries path fix (issue #41)
2013-03-05 12:18:16 -08:00
Anton Vlasenko
c44994b78c Fixing #41 issue with Py3k libs path 2013-02-18 18:16:13 +02:00
David Schmidt
bc0e446340 removed doubled variable from setup.py 2013-01-29 15:25:55 +01:00
Mikhail Korobov
decabcf96a Fix tox test running: port selftest.py to Python 3; make it clear Python 2.5 is no longer supported (its support is broken in many ways in this branch); remove bundled doctest.py module (it is in stdlib since forever); remove extra stuff from tox.ini 2013-01-10 08:50:52 -06:00
Brian Crowell
ec961de303 py3k: Remove use_2to3 from setup.py
This is unnecessary now.
2013-01-10 08:47:04 -06:00
Brian Crowell
009eee0577 py3k: Get setup.py to run under python3
First real fix: open the temp file in text mode.
2013-01-10 08:46:34 -06:00
Alex Po
8b14c9721a Move custom path of JPEG_ROOT, TIFF_ROOT, etc. before system. 2013-01-09 15:48:06 +04:00
Tom Payne
e414c66070 Add Image.alpha_composite 2012-12-04 16:44:26 +01:00
Alex Clark
5ab5406010 Fix formatting of installation summary 2012-11-01 17:08:29 -04:00
Alex Clark
f26c5fc16d Change URL 2012-07-24 17:44:21 -04:00
Marc Abramowitz
01917a4faf Make things more Python 3 friendly. Python 3 still doesn't work because
of C code that doesn't compile with Python 3.
2012-06-12 13:48:27 -07:00
Alex Clark
9488cb1e53 Onwards 2012-04-05 23:25:24 -04:00
Alex Clark
ea0989ad17 Add sphinx docs 2012-02-16 20:10:57 -05:00
Alex Clark
f170eced0b Merge branch 'master' of github.com:collective/Pillow 2011-10-26 21:12:53 -04:00
Alex Clark
45da68c14d Prepare release 2011-10-26 21:12:43 -04:00
OCHIAI, Gouji
95a39e2a94 Fixes library paths on Mac OS X for Case sensitive file system. 2011-10-22 14:35:35 +09:00
Alex Clark
9e99408f7b Fix url 2011-09-23 22:27:58 -04:00
Alex Clark
3eeae008a7 Clean up setup summary 2011-09-07 14:28:38 -04:00
Alex Clark
163847b161 More detail 2011-09-07 14:10:25 -04:00
Alex Clark
7903d20a9d Flake8 fixes 2011-09-07 13:40:53 -04:00
Daniel Hahler
444598eaca Fix library_dirs for sys.platform="linux3". 2011-09-07 17:08:35 +03:00
Alex Clark
54e83950ce WTF is going on 2011-07-21 10:52:24 -04:00
Alex Clark
bf59b2239c Python 2.4 compat 2011-06-02 13:03:05 -04:00
Alex Clark
845bee063d On to 1.7.2 2011-05-31 12:05:21 -04:00
Alex Clark
f4fe73c4fe Add the rest of the code ;-) 2011-05-31 11:33:28 -04:00
Alex Clark
fd1a64dccd Kludge fix for multiarch support 2011-05-31 11:24:38 -04:00
Alex Clark
a55cdddb20 Prepare Pillow 1.7.0. 2011-05-27 22:40:39 -04:00
Alex Clark
8d2e0a9570 Prep 1.6 2010-12-01 14:39:00 -05:00
Alex Clark
41c7ae72f5 Fix buglet noticed by elro 2010-12-01 14:32:06 -05:00
Alex Clark
e7e322a4a3 Fix PIL module 2010-11-28 15:58:32 -05:00
Alex Clark
fc250de6e2 Actually include the PIL module 2010-11-28 15:55:38 -05:00
Alex Clark
3ca59544b7 Doc fixes 2010-11-28 15:42:59 -05:00
Alex Clark
8508f17691 Doh! Can't rename package right now I guess (due to conflicts with Pillow on PyPI) 2010-11-28 15:31:09 -05:00
Alex Clark
c931fefb85 Clean up 2010-11-28 15:26:48 -05:00
Alex Clark
acad11af29 Prepare pillow 1.3. 2010-11-28 15:20:53 -05:00
Alex Clark
3b8ae9783e Make it work 2010-11-28 15:15:53 -05:00
Alex Clark
55e7e4da72 Prepare pillow 1.3. 2010-11-28 13:44:03 -05:00
Alex Clark
7459016933 Prepare pillow 1.3. 2010-11-28 13:40:56 -05:00
Alex Clark
ba7a5edf0a Simplify 2010-11-28 13:40:10 -05:00
Alex Clark
63e4ba0459 mkrelease fails for some unknown reason on "egg_info"; Rewrite setup.py from scratch to work around problem. 2010-11-28 13:35:36 -05:00
Alex Clark
09de42da9a Doc fixes; version 1.3 instead of 1.2.1 2010-11-28 10:54:57 -05:00
Alex Clark
fc970b29a6 Lower case the package name and fix website url 2010-11-28 10:24:57 -05:00
Alex Clark
48f8dbc2c6 Add /lib64 2010-11-28 10:15:36 -05:00
Alex Clark
36abd6341a Call the func 2010-11-26 15:47:00 -05:00
Alex Clark
0c50a76dbe Platform is linux2 2010-11-26 15:30:24 -05:00
Alex Clark
3c7f9152c6 PEP8 fixes 2010-11-26 10:01:37 -05:00
Alex Clark
1e686fddf9 This whole dir add business seems insane, but I'll play along 2010-11-26 09:57:58 -05:00
Alex Clark
3089d38787 Fix url 2010-11-26 09:50:32 -05:00
Jannis Leidel
8a282c9ea4 On OS X also check for freetype2 in the X11 path. 2010-08-02 23:26:52 +08:00
Alex Clark
31fd6a2464 Further clarify this is a fork 2010-07-31 20:32:12 -04:00
Alex Clark
5aeb7dc342 On to 1.2, and rename PIL to Pillow in setup summary output. 2010-07-31 20:21:10 -04:00
Alex Clark
e592de01fd Remove setuptools_hg requirement 2010-07-31 19:24:31 -04:00
Alex Clark
22f08d1fbb Onward to 1.1, I think? And some doc fixes. 2010-07-31 02:14:07 -04:00
Alex Clark
8dfa8281d1 Rename docs to doc 2010-07-31 00:18:52 -04:00
Alex Clark
a191e0b8a9 Prepare Pillow 1.0. 2010-07-30 23:56:05 -04:00
Alex Clark
8f79274ca4 "Fix" INSTALL and HISTORY 2010-07-30 23:19:31 -04:00
Alex Clark
9a640e3157 Forking PIL 2010-07-30 22:52:47 -04:00