Commit Graph

387 Commits

Author SHA1 Message Date
Melvyn Sopacua
5d7480a91b Add the FIXME and remove debug code 2017-05-26 13:48:38 +02:00
Melvyn Sopacua
092d97f829 Fix compilation on FreeBSD with 2 openjpegs
When openjpeg 1.5 is installed (Calligra 2.x, for example) and OpenJPEG
2.1 is installed, the subdirectory is added twice.

Since the 2nd time is ignored, it is ranked after the more general
/usr/local/include and openjpeg.h from the 1.5 version is picked up.

Fix this in a more general way:
- If a directory is added that already is in path
- But where is specified

Then remove the subdir from path and insert it at the spot requested.

A FIXME is added to the code bit explaining the real issue, but lack
investigative spirit / time to dive down the rabbit hole.
2017-05-26 13:44:26 +02:00
wiredfool
67d6e00751 py3x fixes 2017-05-10 04:59:37 -07:00
wiredfool
8999ccb570 single version for build 2017-05-10 03:47:02 -07:00
wiredfool
2ac4f79e8c 4.2.0.pre0 version bump 2017-04-19 03:02:45 -07:00
wiredfool
38eff74004 4.1.0 version bump 2017-04-04 11:10:22 -07:00
wiredfool
949932f45f Pure Python MSP Decoder 2017-03-11 13:50:19 +00:00
Andrew Murray
0f383d7c7e Removed unused private functions 2017-02-18 16:29:26 +11:00
Hugo
53e5702557 Update http to https 2017-02-14 11:27:02 +02:00
Hugo
8b2681e369 Merge pull request #2357 from radarhere/zlib
Updated zlib to 1.2.11
2017-01-19 20:51:58 +02:00
Andrew Murray
a46ce022e7 Removed warning about zlib 1.2.2 security vulnerability 2017-01-19 19:46:09 +11:00
wiredfool
c1b510c72c Merge pull request #2307 from radarhere/contextmanagers
Added context managers
2017-01-17 13:20:41 +00:00
wiredfool
296fb5fe1d 4.1.0.dev0 version bump 2017-01-02 04:06:48 -08:00
wiredfool
3f6db91ccc Fixed typo in version 2017-01-02 03:45:39 -08:00
wiredfool
a021d4978d 4.0.0 version bump 2017-01-01 20:20:06 +00:00
Andrew Murray
a06dd59df7 Added context managers 2016-12-28 09:54:10 +11:00
Andrew Murray
d4a6e07367 Added documentation for Python 3.6 support 2016-12-27 02:28:11 -08:00
wiredfool
80b78be21a Merge pull request #2199 from jdufresne/dep-olefile
Remove vendored version of olefile Python package in favor of upstream
2016-12-13 20:12:29 +00:00
Alexander
9c38253733 set executable flag on setup.py and add shebang 2016-12-04 18:59:53 +03:00
Jon Dufresne
52b1f46b12 Deprecate vendored version of olefile Python package in favor of upstream
Pillow now requires the olefile Python package through setup.py.

This removes Pillow's maintenance of this library by instead relying on
and reusing the upstream version. No longer need to regularly update the
vendored package and docs. olefile bug fixes and features can go
directly upstream.

During travis tests, now installs Pillow package before tests; this will
also install all dependencies (currently, only olefile).
2016-11-22 18:17:31 -08:00
Jon Dufresne
85cf6d3140 Drop support for Python 3.2 2016-11-22 04:24:40 -08:00
Jon Dufresne
dbe9f85c7d Drop support for Python 2.6
* Drop unittest2 requirement
* Use set literals
* Use dict/set comprehension
* Use str.format() automatic numbering
2016-11-22 04:23:55 -08:00
wiredfool
70c2df21ca Merge pull request #2213 from wiredfool/setup
Raise custom exceptions when required/requested items are not found
2016-11-22 12:14:57 +00:00
Jon Dufresne
ffa5bc2726 Use generator expressions instead of list comprehension
Avoids unnecessary temporary lists in memory.
2016-11-14 18:11:15 -08:00
wiredfool
8b596600af renamed Default->Required dependency exception 2016-11-11 09:12:07 -08:00
wiredfool
015e8cc266 raise custom exceptions when required/requested items are not found 2016-11-11 09:09:19 -08:00
wiredfool
915dd05f22 Merge pull request #2208 from jdufresne/setup-py-open
Close file in setup.py after finished reading
2016-11-11 16:58:59 +00:00
Rok Garbas
993969790b optionaly use pkg-config (when present) to detect *_ROOTs
* only run pkg-config when building exttensions
* print debug messages when using pkg-config
* silance error from pkg-config by default
* first search for libtiff-5 then libtiff-4
2016-11-11 08:33:58 -08:00
Jon Dufresne
e2e4d180f9 Close file in setup.py after finished reading
Fixes a "ResourceWarning: unclosed file" during tests.
2016-11-08 17:55:46 -08:00
Jon Dufresne
e44bb42ae9 Replace type() equality checks with isinstance 2016-10-31 06:41:43 -07:00
Andrew Murray
0be156936a Updated setup url to https 2016-10-23 12:44:23 +11:00
wiredfool
35e1237b7e 3.5.0.dev0 Dev Version bump 2016-10-04 00:18:33 -07:00
wiredfool
ac5a212cee 3.4.0 Release Version bump 2016-10-03 08:00:29 -07:00
Tim Graham
0c66b80a95 Fix "invalid escape sequence" warning in Python 3.6
http://bugs.python.org/issue27364
2016-09-27 19:26:57 -04:00
Robert Nix
18a91cebcf Move DDS decoders to C
- Fixed inaccurate BC1/BC3 texture decoding
2016-08-25 19:27:48 -05:00
homm
1ba4e9e5ba remove end of file banner from all files 2016-07-10 14:11:28 +03:00
wiredfool
2023c7cea1 Version 3.4.0.pre version bump 2016-07-01 07:20:31 -07:00
wiredfool
4f4c982229 3.3.0 Release Version Bump 2016-07-01 05:57:19 -07:00
wiredfool
b152d99d66 refactor to different file 2016-06-27 00:58:06 -07:00
wiredfool
d3b0413780 Initial take for removing the Incremental decoder due to threading issues. J2k tests pass, other tests fail 2016-06-27 00:58:05 -07:00
wiredfool
eb28cc9d0f Merge pull request #1932 from matthew-brett/run-time-tcl-tk
RF: run-time loading of Tcl / Tk functions
2016-06-11 15:27:29 +01:00
wiredfool
ac51f1ee37 Fixes to run cleanly on alpine linux 2016-05-30 06:28:08 -07:00
Matthew Brett
659e294676 RF: run-time loading of Tcl / Tk functions
Discover Tcl / Tk functions at run-time by looking in libs loaded by
Tkinter Python module.

Use header excerpts from Tcl / Tk so we don't need an installed Tcl / Tk
to build.
2016-05-27 16:51:08 -04:00
wiredfool
3657bc10a6 Merge pull request #1889 from rr-/libpngquant
Add libimagequant support in quantize()
2016-05-26 21:12:25 +01:00
wiredfool
f0fee4bec4 Merge pull request #1883 from wiredfool/pr_1768_alt
Added --disable-osx-tcltk-framework in setup.py
2016-05-23 22:40:27 +01:00
rr-
eb354be7c4 Add method=Image.LIBIMAGEQUANT for quantize() 2016-05-05 21:39:16 +02:00
wiredfool
85386c5ac7 Merge pull request #1879 from radarhere/subprocess
Replaced os.system with subprocess.call
2016-05-05 16:30:49 +01:00
Andrew Murray
31993b09ec Replaced os.system with subprocess.call 2016-05-05 06:36:08 +10:00
wiredfool
03576bd744 Added --disable-osx-tcltk-framework in setup.py 2016-05-03 20:26:58 +01:00
wiredfool
db4b41e78f Merge pull request #1875 from wiredfool/pr_1861
Disable-platform-guessing in setup.py
2016-05-03 19:53:09 +01:00
wiredfool
d7f2698718 unnest disable-platform-guessing code 2016-05-01 10:57:50 +01:00
hugovk
11b8faa761 Update RTD links https://blog.readthedocs.com/securing-subdomains/ 2016-04-28 09:35:03 +03:00
Angelo Compagnucci
ce2bb05a2b setup.py: add option to disable platform guessing
When cross-compiling (ex on Buildroot) platform guessing is not needed
cause the environment is correctly built externally.
This patch adds an option to disable platform guessing on Linux.
2016-04-25 17:03:36 +02:00
Andrew Murray
89901e089c Updated redirected URL 2016-04-16 01:09:46 +10:00
wiredfool
371e981628 Merge pull request #1823 from radarhere/classifier
Removed outdated classifier
2016-04-12 20:53:53 +01:00
Andrew Murray
dbecf25945 Removed outdated classifier 2016-04-11 00:16:02 +10:00
wiredfool
80758e1bd7 Merge pull request #1790 from wiredfool/setup_cleanup
Setup cleanup
2016-04-10 10:15:43 +01:00
wiredfool
a2bc14c526 changed docs link to https 2016-04-10 02:11:56 -07:00
Alex Clark
33ed45c762 Clean up (yapf)
Sorry, couldn't resist. As for the issues you raised, they are unfortunately not surprising. Our setup.py has to be complex, but doesn't need to be complicated. I've been trying to avoid a complete rewrite, but maybe it's time.
2016-04-09 08:11:18 -07:00
Eric Soroos
6ab84373be debug logging for setup.py 2016-04-09 08:11:18 -07:00
wiredfool
fd7fa4e61d 3.3.0.dev0 versioning 2016-04-01 07:39:35 -07:00
wiredfool
344cb709ed 3.2.0 Release Version Bump 2016-04-01 05:17:23 -07:00
Eric Soroos
999b0a1e8c file is not a variable name 2016-03-30 11:12:25 -07:00
Eric Soroos
bf2df86807 require, required, and want are not features 2016-03-30 11:12:25 -07:00
Eric Soroos
f869ecd808 Dir is not a variable name 2016-03-30 11:12:25 -07:00
Alex Clark
57d7873288 yapf-formatting for setup.py
I know folks don't universally agree on using yapf, but I've been using it a lot lately elsewhere & propose we start using it on a file-by-file basis here.
2016-03-15 07:16:22 -04:00
Alex Clark
54925c492c Update website URL [ci skip] 2016-03-15 07:15:03 -04:00
Alex Clark
6d5e7c69e6 Revert "Update website URL [ci skip]"
This reverts commit 838986349c.

OOPS, tried to sneak in yapf-formatting :-)
2016-03-15 07:14:03 -04:00
Alex Clark
838986349c Update website URL [ci skip] 2016-03-15 07:10:42 -04:00
wiredfool
ac92468808 Fix the error reported when libz is not found 2016-03-08 10:30:37 -08:00
Christoph Gohlke
0b38dbb8e2 Add Python 3.5 to classifiers 2016-01-04 11:50:03 -08:00
wiredfool
8d518a3f4d 3.2.0-dev versioning 2016-01-04 03:03:26 -08:00
wiredfool
fff5536b37 3.1.0 version 2016-01-04 02:04:23 -08:00
wiredfool
0f9f5cd8db 3.1.0-rc1 versioning 2016-01-01 16:00:32 +00:00
Benjamin Le Forestier
e5b6018b46 add include and library directories for freebsd 2015-12-27 20:43:27 +01:00
wiredfool
0cf0e948c7 Merge pull request #1499 from hugovk/remove_imagingtiff
Remove old _imagingtiff.c and pilplus stuff
2015-10-24 09:44:29 -07:00
Chris Brackert
27ced01022 Fix Exception when installing jpeg 2015-10-22 16:48:03 -07:00
hugovk
baea664477 Remove _imagingtiff.c stuff 2015-10-16 18:12:22 +03:00
Andrew Murray
9a2903bf5b Changed 32 bit to 32-bit and 64 bit to 64-bit 2015-10-15 00:49:03 +11:00
Alex Clark
a6d9452986 PEP 0440 compliance [ci skip]
``3.1.0.dev`` should be ``3.1.0.dev0`` to be compliant with PEP 0386 (which has since been superceded by PEP 0440 https://www.python.org/dev/peps/pep-0440/)
2015-10-03 18:49:49 -04:00
wiredfool
58fedea740 3.1 Dev versioning 2015-10-01 21:39:00 +01:00
wiredfool
0177cceac4 3.0 Release versioning 2015-10-01 21:39:00 +01:00
wiredfool
29601ca119 Make zlib and jpeg required by default 2015-09-22 21:07:31 +01:00
Andrew Murray
105e963505 Flake8 fixes 2015-09-11 19:28:19 +10:00
wiredfool
fc17f31626 Merge pull request #1356 from njones11/master
Add Solaris/SmartOS include and library directories
2015-09-09 22:07:55 +01:00
Andrew Murray
545154a61f Corrected scripts path 2015-09-07 19:24:39 +10:00
Andrew Murray
9e994b9e42 Changed indentation to be consistent 2015-07-28 19:59:52 +10:00
Nicholas Jones
1589052fb5 Fix setup.py for Solaris/SmartOS 2015-07-27 13:07:35 -04:00
Andrew Murray
60a3702fd5 Flake8 fix 2015-07-08 15:32:50 +10:00
Andrew Murray
7e991a8043 Allow Tcl/Tk frameworks to be disabled on OS X by setup arguments 2015-07-08 15:32:24 +10:00
Andrew Murray
d92879f379 Updated example Tcl version numbers 2015-07-08 14:04:02 +10:00
Alex Clark
93eb15bec7 Commence 3.0.0.dev0 2015-07-02 05:20:15 -04:00
Alex Clark
80672b61e8 This is 2.9.0
Fixes #1174
2015-07-01 14:33:56 -04:00
Alex Clark
445a8c06fc Bump 2015-06-30 08:04:35 -04:00
Alex Clark
96944e2dd6 Bump 2015-06-29 08:57:55 -04:00
Andrew Murray
bbf3b52357 Flake8 fixes 2015-06-20 14:46:04 +10:00
wiredfool
a92d737177 Merge pull request #1278 from wiredfool/winbuild
Windows Build/CI
2015-06-18 09:03:38 -07:00
wiredfool
cedb226ef2 Style nits 2015-06-16 13:29:30 -07:00
wiredfool
7d9a617517 Merge pull request #1214 from hugovk/setup_classifiers
Add CPython/PyPy classifiers to setup.py
2015-06-16 11:50:17 -07:00
wiredfool
fd55099ffc merge a year of master into winbuild 2015-06-10 12:49:07 -07:00
Andrew Murray
045190d3dd Removed support for FreeType 2.0 2015-06-01 18:50:37 +10:00
hugovk
cb6fa8a20f Add CPython/PyPy classifiers 2015-05-05 00:52:56 +03:00
Andrew Murray
87c4c6a72d Various Flake8 fixes to base scripts 2015-04-24 10:15:14 +10:00
Alex Clark
5cfc34b287 Begin 2.9.0 development with 2.9.0.dev0
Use PEP440 syntax to identify development branch and keep pyroma happy: https://www.python.org/dev/peps/pep-0440/#developmental-releases.
2015-04-02 14:53:49 -04:00
Alex Clark
3f09b8f171 Prep 2.8.1 2015-04-02 10:59:03 -04:00
Alex Clark
c562c55788 Camel case nit [ci skip] 2015-03-31 22:00:53 -04:00
Alex Clark
0d64171481 Configure setuptools to run nosetests, fixes #729
http://nose.readthedocs.org/en/latest/setuptools_integration.html
2015-03-31 20:22:09 -04:00
Alex Clark
860a1dedf1 Prep 2.8.0
No ci skip here because let's see CI run w/new version numbers. I'm starting to think (again) this bump should happen immediately after the release instead of right before the next? But I know @wiredfool had some objection to this at some point. As a compromise, maybe we could change to 2.9.0dev immediately following the release of 2.8.0.
2015-03-27 07:02:02 -04:00
Eric Soroos
5061f7bdde Turn off zip-safe flag for debug builds 2015-01-20 15:00:58 -08:00
wiredfool
0f05eb287a Version Bump --2.7.0 2014-12-31 20:42:57 -08:00
wiredfool
e16ee15f2c Merge pull request #997 from homm/replace-resize
Replace resize method
2014-11-27 10:26:48 -08:00
homm
bc0f896a47 rename Antialias and stretch to resample 2014-11-19 14:36:00 +03:00
homm
d49459f5b2 box blur dummy 2014-10-12 16:30:00 +04:00
wiredfool
9634e437ef Version Bump -- 2.6.0 2014-10-01 09:59:00 -07:00
wiredfool
6abc0d2f40 Version Bump - 2.6.0-rc1 2014-09-29 13:14:49 -07:00
hugovk
1de128d6b6 Merge branch 'master' into flake8 2014-09-14 10:23:51 +03:00
hugovk
1335006cd7 flake8 2014-08-28 14:44:19 +03:00
wiredfool
136345a5a5 allowing for libwebp* library names 2014-08-24 16:38:22 -07:00
wiredfool
aa105bf89d allowing for libwebp* library names 2014-08-22 17:04:26 -07:00
wiredfool
b2ea0941f7 working lcms2 build 2014-08-22 16:14:19 -07:00
wiredfool
2d634d3019 Bump Version/Changelog 2014-08-19 08:52:29 -07:00
Hugo
b56043c036 Remove 2,505-line changelog from description
It made the PyPI listing page very long and requires a lot of scrolling to get down to the files, annoying for downstream packagers.

Instead it's linked from the README. 

[CI skip]
2014-08-19 11:03:08 +03:00
David Cook
3bde04b263 setup.py: Close open file handle before deleting
When installing Pillow onto a Vagrant virtual machine with Linux as the guest OS, and Windows as the host OS, setup.py fails with the error "Text file busy." The temporary installation directory is a shared folder from the host OS, mounted in the guest OS, and the underlying Windows file system doesn't allow deleting the "multiarch" temporary file while a file handle for it is still open. This change closes the file handle once it is no longer being used, but before the file itself is unlinked.
2014-08-11 01:14:07 -05:00
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