Commit Graph

525 Commits

Author SHA1 Message Date
Hugo van Kemenade
5fb892a9e2 Move version from setup.py to pyproject.toml 2023-10-22 20:35:21 +03:00
Andrew Murray
414694e190 Increment Python version check to support Python 3.12 2023-07-13 17:21:06 +10:00
Rudi Heitbaum
d17947e802 Fix missing symbols as libtiff can depend on libjpeg
when compiling Pillow with libtiff and libjpeg (with jpeg12 enabled -
which is the default with libjpeg-3.0.0) the libtiff object
tif_jpeg_12.c.o uses the following libjpeg12 functions:
jpeg12_read_raw_data, jpeg12_read_scanlines, jpeg12_write_raw_data,
jpeg12_write_scanlines.

update the ordering of libs.append(feature.tiff) to be before
libs.append(feature.jpeg) to allow the linker to include the required
functions.

this issue occurs when the libtiff and libjpeg libraries are static
(not shared.)

Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
2023-07-08 12:46:34 +00:00
Andrew Murray
b2d7f1e899
Merge branch 'main' into add-pyproject.toml 2023-06-28 17:44:08 +10:00
Andrew Murray
45c9dcf123 Restored 32-bit support 2023-06-27 14:43:58 +10:00
Andrew Murray
10ad87cd2d
Merge branch 'main' into add-pyproject.toml 2023-06-25 07:14:01 +10:00
Andrew Murray
25c24a8a91
Removed unused code
(cherry picked from commit 600b823de6)
2023-06-24 15:54:07 +01:00
nulano
c068af7630
Merge remote-tracking branch 'upstream/main' into add-pyproject.toml
# Conflicts:
#	pyproject.toml
2023-06-24 13:30:15 +01:00
Andrew Murray
d6f19625e8 Removed support for 32-bit 2023-06-23 21:52:00 +10:00
Hugo van Kemenade
3a0881dffe Disable extra quotes 2023-05-27 23:39:51 +03:00
Andrew Murray
053cb3de52 Fixed finding dependencies on Cygwin 2023-05-21 14:38:05 +10:00
Hugo van Kemenade
86a70fc768
Merge pull request #7068 from radarhere/ldconfig 2023-05-15 15:28:21 +03:00
Andrew Murray
6fce7d6ed4 Merge branch 'main' into include-dir-type-confusion 2023-04-10 22:49:32 +10:00
Andrew Murray
fe4e52deac Rearranged code 2023-04-10 19:35:04 +10:00
Andrew Murray
b2b660e2c0 Removed FIXME comment 2023-04-06 18:53:28 +10:00
adisbladis
d94239ae3d Handle polymorphic types for lib_root and include_root in setup.py
Depending on whether these are created by pkg_config or not they might
be a list of directories or just a string with a single directory.
2023-04-05 16:19:58 +12:00
Andrew Murray
ca2bf046d3 Use "/sbin/ldconfig" if ldconfig is not found 2023-04-05 09:57:16 +10:00
Andrew Murray
17a0a2ee3e Removed unnecessary silencing of stderr 2023-03-31 06:14:45 +11:00
Andrew Murray
c3364a4245 Do not use absolute path for ldconfig 2023-03-30 16:55:18 +11:00
Andrew Murray
5b3d39c116
Merge pull request #6935 from radarhere/path
Do not raise an error if os.environ does not contain PATH
2023-03-13 00:19:38 +11:00
Andrew Murray
7670736e18
Use type hint
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
2023-03-12 23:17:39 +11:00
Hugo van Kemenade
8ef6503801
Merge pull request #6914 from radarhere/default 2023-03-12 12:39:45 +02:00
Andrew Murray
5059e5c143 Do not raise an error if os.environ does not contain PATH 2023-02-10 08:11:50 +11:00
pre-commit-ci[bot]
24183d652e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-06 19:27:19 +00:00
Andrew Murray
a0492f7968 Ensure that pkg-config paths are split by spaces 2023-01-28 20:17:54 +11:00
nulano
73f55b4e01 remove redundant default value
Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
2023-01-28 15:35:33 +11:00
Bas Couwenberg
04cf5e2cfc Handle more than one directory returned by pkg-config.
tiff (4.5.0-1) in Debian results in two include directories being returned:
```
-I/usr/include/x86_64-linux-gnu -I/usr/include
```
2023-01-15 13:48:07 +01:00
Hugo van Kemenade
2ae55ccbda Improve exception traceback readability 2022-12-30 00:07:52 +02:00
Hugo van Kemenade
3ffd2b2b8f Double quotes for old CPython on Windows 2022-10-28 13:02:19 +03:00
Mark Mayo
69baeccf2e some pylint warnings
Fixed some pylint issues
2022-10-13 15:20:11 +13:00
Hugo van Kemenade
7d8b2fb19c Move some static config to setup.cfg 2022-09-12 10:25:18 +03:00
pre-commit-ci[bot]
aba0859db9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-07-18 06:17:10 +00:00
Andrew Murray
08db23c61c Do not quote Pillow version for setuptools >= 60 2022-07-18 16:16:06 +10:00
Hugo van Kemenade
6801a255a3 Add support for Python 3.11 2022-07-15 13:42:36 +03:00
Andrew Murray
0c1720d358 Hide stderr from --keep-system-libs 2022-05-03 09:19:09 +10:00
Andrew Murray
6ec9dfb9c0 If an exception is raised, try again without system paths 2022-04-26 11:14:31 -06:00
James Hilliard
9ea4624704 Search pkg-config system libs/cflags.
We need to search the system paths as well from pkg-config for
some packages to be found properly.
2022-04-26 11:12:52 -06:00
Hugo van Kemenade
ee85e387ba Remove redundant parentheses 2022-04-10 23:39:54 +03:00
Andrew Murray
72b7ab54bd pre-commit autoupdate --freeze 2022-03-04 16:42:24 +11:00
Andrew Murray
4d1d2c9855
Merge pull request #5807 from DWesl/tkimaging-on-cygwin
Use the Windows method to get TCL functions on Cygwin
2021-12-30 00:08:31 +11:00
Andrew Murray
722126aa0a Use latin1 encoding to decode bytes 2021-12-05 15:59:27 +11:00
Andrew Murray
2ce7dd5ef6 Moved macOS SDK logic into a separate method 2021-11-11 20:51:13 +11:00
Andrew Murray
3b701dcc16 Only prefer command line tools SDK on macOS over the default 2021-11-11 20:47:46 +11:00
DWesl
29b92391bc Suggestion: use 'var in tuple' instead of chained comparisons. 2021-11-03 21:26:55 -04:00
pre-commit-ci[bot]
b542da8eb5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-11-03 17:16:23 +00:00
DWesl
c8391aaa4b Use the Windows functions to get TCL functions on Cygwin.
This is related to linking semantics, so Cygwin should follow the Windows codepath.
2021-11-03 13:03:55 -04:00
Andrew Murray
2ae150ddb9
Merge pull request #5793 from landfillbaby/patch-1
Fix compilation on Termux
2021-10-31 17:49:46 +11:00
pre-commit-ci[bot]
f246049c4a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-10-24 11:39:10 +00:00
Lucy Phipps
e3c8ef980b
fix compilation on Termux 2021-10-24 12:38:13 +01:00
Hugo van Kemenade
a44e8e626d Use declarative package configuration 2021-10-21 09:41:34 +03:00
Hugo van Kemenade
a8c18d0817 Rename master to main 2021-10-15 17:30:05 +03:00
Andrew Murray
e7270eb5a1 Prefer command line tools SDK on macOS 2021-07-21 22:45:35 +10:00
Hugo van Kemenade
e7d1b2f4cb Add support for Python 3.10 2021-07-01 13:29:44 +03:00
Hugo van Kemenade
fdfef46460 Add Twitter to PyPI project URLs 2021-06-29 15:27:32 +03:00
Andrew Murray
b8c8375d0c Use python3 in shebang line 2021-04-09 19:10:36 +10:00
Hugo van Kemenade
cafd389770
Merge pull request #5359 from nulano/libtiff-cmake 2021-04-01 12:03:42 +03:00
nulano
7c48f12207 add explanatory comment for USE_WIN32_FILEIO 2021-03-26 02:54:11 +01:00
nulano
f4deb4df30 compile libtiff with cmake
(cherry picked from commit 3f17d61fed513ac6bb569ac687c77db1564f056f)
2021-03-24 21:31:07 +01:00
nulano
e4cc42265d add Raqm build configuration info to build summary 2021-02-27 16:52:46 +01:00
Andrew Murray
9b56833300
Merge branch 'master' into fribidi-link 2021-02-07 16:02:16 +11:00
Eric Soroos
77bf0aa673 lint off 2021-01-09 17:00:27 +01:00
Eric Soroos
3775d36398 Do fuzzing linking in setup.py options, rather than post-hoc manually linking 2021-01-09 16:47:12 +01:00
Eric Soroos
37a7c601cc uglify 2021-01-07 13:07:28 +01:00
Eric Soroos
ffbaa6523d Internal support for oss-fuzz testing 2021-01-07 12:55:11 +01:00
nulano
0488a2761a can't use underscore prefix for distutils options 2021-01-05 00:07:03 +11:00
nulano
43bde01623 disable Raqm/FriBiDi vendoring by default, except in Windows tests 2021-01-05 00:07:03 +11:00
nulano
db0dad909e test 2021-01-05 00:07:03 +11:00
nulano
834c2e5e5d lint 2021-01-05 00:07:03 +11:00
nulano
be0d0a3a48 fix finding raqm deps 2021-01-05 00:07:03 +11:00
nulano
5cd688fc82 add option to statically link fribidi, version info 2021-01-05 00:06:29 +11:00
nulano
8bc1ff35b4 use FriBiDi shim in Raqm 2021-01-05 00:03:52 +11:00
Hugo van Kemenade
8c110b7232 Add 'Release notes' and 'Changelog' links to PyPI [CI skip] 2020-12-02 18:15:09 +02:00
Hugo van Kemenade
1b4ecdf8cd
Merge pull request #4965 from radarhere/warning 2020-11-22 23:56:46 +02:00
Hugo van Kemenade
1a66e2f338
Merge pull request #4974 from radarhere/sdk
Added macOS SDK install path to library and include directories
2020-10-14 16:39:10 +03:00
Hugo van Kemenade
f9852c0381
Merge branch 'master' into fix-imagingHinclude 2020-10-14 14:50:36 +03:00
Axel Huebl
115add2fa0
do not add extra include directories (#3)
Co-authored-by: nulano <nulano@nulano.eu>
2020-10-14 01:59:34 -07:00
Andrew Murray
928e5c6e8f Added macOS SDK install path to library and include dirs 2020-10-14 01:02:04 +11:00
Andrew Murray
c2890d1f10 Moved warning to end of execution 2020-10-12 18:38:36 +11:00
Hugo van Kemenade
6f7231eb5a Add Trove classifier, update setup.py version check, add to tox.ini 2020-10-06 19:16:49 +03:00
Hugo van Kemenade
63d8a600cb
Merge pull request #4890 from nulano/mingw-setup 2020-09-03 21:11:39 +03:00
Hugo van Kemenade
e0eec1eb56 Merge branch 'master' into rm-3.5 2020-09-01 20:16:46 +03:00
nulano
3cabcf242f fix libtiff in MSYS2 2020-08-30 04:31:46 +02:00
nulano
db6253c927 remove msys2 gcc workaround 2020-08-30 01:43:55 +02:00
nulano
3b38eb317b remove legacy include directory for libimagequant
1) it is hardcoded to 32-bit C:\msys64\mingw32
2) current library version uses \mingw64\include\libimagequant.h directly
2020-08-30 00:57:27 +02:00
Andrew Murray
101e8f84b6
Merge pull request #4872 from hugovk/add-logo-to-readme
Add Pillow logo to README and PyPI
2020-08-27 19:38:28 +10:00
Hugo van Kemenade
7f711ce91a Convert README to Markdown and add logo
[CI skip]
2020-08-17 10:29:52 +03:00
Andrew Murray
5aae369c94 Added homebrew zlib include directory 2020-08-06 23:14:49 +10:00
Andrew Murray
43fca3dcd3 Replaced distutils build_ext with setuptools 2020-07-31 19:14:43 +10:00
Hugo van Kemenade
10615a7da7 Upgrade Python syntax for 3.6+
Co-authored-by: nulano <nulano@nulano.eu>
2020-07-30 10:09:18 +03:00
Andrew Murray
73f51ae484 Removed distutils from MinGW detection 2020-07-26 21:01:25 +10:00
Andrew Murray
7c576adb19 Simplified code 2020-07-24 19:58:17 +10:00
Hugo van Kemenade
307239b234 Replace distutils.sysconfig.get_config_var("prefix") with os.path.normpath(sys.prefix) 2020-07-21 11:23:38 +03:00
Hugo
6cdeb55118 Drop support for soon-EOL Python 3.5 2020-06-30 13:55:08 +03:00
nulano
82204d54cf fix #2848 2020-05-24 01:07:42 +02:00
Andrew Murray
ac7848c781 Lint fix 2020-05-20 20:31:14 +10:00
Christoph Gohlke
7daca6733d
Fix ImportError on Python 3.9.0b1 for Windows 2020-05-19 15:35:32 -07:00
Hugo
dda6145fce Since Python 3.3 IOError and WindowsError have been merged into OSError 2020-04-10 12:57:29 +03:00
Hugo van Kemenade
b5cf165f9e
Merge pull request #4260 from nulano/imagegrab_xcb
ImageGrab.grab() for Linux with XCB
2020-03-31 23:03:21 +03:00
Blaine Bublitz
aa2ecc9afe
Update setup.py per suggestion [ci skip]
Co-Authored-By: Hugo van Kemenade <hugovk@users.noreply.github.com>
2020-03-31 13:04:28 -06:00
Blaine Bublitz
137566e018 Update Tidelift UTM params [ci skip] 2020-03-31 10:25:01 -07:00