Commit Graph

222 Commits

Author SHA1 Message Date
Hugo van Kemenade
1bc67c9f0f
Merge pull request #4700 from nulano/features-version 2020-06-21 21:36:46 +03:00
nulano
12ddff729b
Merge branch 'master' into skips 2020-06-21 18:05:27 +01:00
Hugo van Kemenade
390b34c231
Merge pull request #4664 from nulano/ft-getsize-mode 2020-06-21 18:53:03 +03:00
nulano
a324f4a466 add version to features info block 2020-06-21 18:58:39 +10:00
Hugo van Kemenade
b9a087d482
Merge pull request #4566 from radarhere/text
Consider transparency when pasting text on an RGBA image
2020-06-20 15:02:59 +03:00
nulano
12cd02bd2d use xfail for failing tests 2020-06-14 19:38:21 +02:00
Andrew Murray
7d1f5ba91b Removed test skips for MinGW 2020-06-14 23:08:21 +10:00
Andrew Murray
05932c4cbc Updated harfbuzz to 2.6.7 2020-06-14 22:23:19 +10:00
nulano
2dd9324df2 add mono color text test 2020-06-01 22:18:38 +02:00
nulano
d2f90d6cac fix freetype and raqm on MSYS 2020-05-23 23:16:06 +02:00
Andrew Murray
e10cab42f1 Consider transparency when drawing text on an RGBA image 2020-04-19 20:56:17 +10:00
Hugo
dda6145fce Since Python 3.3 IOError and WindowsError have been merged into OSError 2020-04-10 12:57:29 +03:00
Andrew Murray
30a2d694cf Converted unittest mock to pytest monkeypatch 2020-03-29 10:43:44 +11:00
Andrew Murray
b602f365ae Removed PillowTestCase helper class 2020-03-28 12:51:28 +11:00
Andrew Murray
7859f81828 Use pytest to skip tests 2020-03-23 07:05:40 +11:00
Hugo
699a9dadf1 Convert asserts 2020-02-22 18:07:04 +02:00
Andrew Murray
8482919a37 Converted most assert statements to pytest 2020-02-23 00:06:21 +11:00
Jon Dufresne
4f185329f4 Streamline test skipping based on supported features
This adds a new test decorator: skip_unless_feature(). The argument is
the same as passed to features.check(). If the feature is not supported,
the test will be skipped.

This removes several kinds of boilerplate copied and pasted around tests
so test feature checking is handled and displayed more consistently.

Refs #4193
2020-02-18 13:07:01 -08:00
Jon Dufresne
1a3ebafdd2 Replace SimplePatcher with builtin unittest.mock module
The class more or less duplicates the features of the mock module. Can
avoid the duplication by using the stdlib.
2020-02-17 10:06:19 -08:00
Hugo
a4bf9fa036 Convert most PillowTestCase methods to pytest 2020-02-02 12:26:01 +02:00
Andrew Murray
c0048ad7de Use context managers 2019-11-26 07:03:23 +11:00
Hugo van Kemenade
37be3b0dda
Merge pull request #4145 from nulano/ucs4-pypy
Fix Unicode support for PyPy
2019-11-24 13:51:27 +02:00
Jon Dufresne
33dabf986f Import unittest from stdlib rather than helper.py
The unittest in helper.py has not offered an interesting abstraction
since dbe9f85c7d so import from the more
typical stdlib location.
2019-11-20 18:42:52 -08:00
nulano
837d8ae984 fix support for extended unicode characters in PyPy 2019-11-20 17:02:44 +00:00
Andrew Murray
4140cd807b
Merge branch 'master' into rm-2.7 2019-10-12 18:03:58 +11:00
Hugo
865b17d5cf Remove Python 2-compatibility code 2019-10-07 16:23:22 +03:00
Hugo
538d9e2e5d Upgrade Python syntax with pyupgrade --py3-plus 2019-10-07 14:30:59 +03:00
nulano
cf1f8b0498 Tests.helper cleanup 2019-09-25 11:58:02 +02:00
Andrew Murray
f93a5d0972 Added text stroking 2019-07-29 06:40:03 +10:00
Hugo van Kemenade
1ab5670eb1
Introduce isort to automate import ordering and formatting (#3954)
Introduce isort to automate import ordering and formatting
2019-07-16 23:02:31 +03:00
Jon Dufresne
d50445ff30 Introduce isort to automate import ordering and formatting
Similar to the recent adoption of Black. isort is a Python utility to
sort imports alphabetically and automatically separate into sections. By
using isort, contributors can quickly and automatically conform to the
projects style without thinking. Just let the tool do it.

Uses the configuration recommended by the Black to avoid conflicts of
style.

Rewrite TestImageQt.test_deprecated to no rely on import order.
2019-07-06 16:11:35 -07:00
nulano
0b0dc1112e Merge branch 'master' into revert-3931-update-freetype-epsilon
# Conflicts:
#	Tests/test_imagefont.py
2019-07-02 22:49:45 +02:00
nulano
d7c69ea2b4 skip test_unicode_extended on Python 2.x 2019-07-02 11:14:09 +02:00
nulano
22ce5cc0c7
Revert "Update epsilon for FreeType 2.10 with eg. Unicode width 16" 2019-07-02 11:08:48 +02:00
nulano
14ddfd30b2 fix lint 2019-07-02 09:31:05 +02:00
nulano
86d4c53d79 revert #3780 for PyPy as it hasn't been updated 2019-07-02 08:52:15 +02:00
Hugo
46535df8f3 Update epsilon for FreeType 2.10 with eg. Unicode width 16 2019-07-01 16:32:22 +03:00
Hugo
8d4bb339a6
Merge pull request #3780 from nulano/update_py_unicode
Update Py_UNICODE to Py_UCS4
2019-06-30 13:21:46 +03:00
Andrew Murray
25cf1010eb Lint fixes 2019-06-25 22:20:57 +10:00
nulano
983371d4d8 fix centos, amazon 2019-06-25 22:16:00 +10:00
nulano
be192d8f69 fix lint 2019-06-25 22:16:00 +10:00
nulano
5f65f10191 add test for #3777 2019-06-25 22:16:00 +10:00
Andrew Murray
7bb16de81c Fixed crash when loading non-font bytes 2019-06-23 11:53:01 +10:00
Andrew Murray
68fac40147 Fixed black formatting 2019-06-22 14:47:56 +10:00
Hugo
f5cd8b4b0d
Merge pull request #3909 from hugovk/run-black
Format code with Black
2019-06-22 06:46:15 +03:00
Andrew Murray
da16b7ec45 Added variation font support 2019-06-19 20:27:49 +10:00
Hugo
5631718a8d Format with Black 2019-06-13 18:54:46 +03:00
Andrew Murray
124c1f6bce Added tests 2019-05-04 23:05:41 +10:00
Andrew Murray
4e6aa7d6d3 Fixed loading font with non-Unicode path on Windows 2019-04-10 07:04:59 +10:00
Andrew Murray
15f8ef02c9 Updated freetype to 2.10.0 2019-03-22 21:14:39 +11:00
Ben Yang
9f390a5192 uncommented test 2019-03-11 18:56:22 -07:00
Ben Yang
5cdbec0cfe added test for attempting to apply complex settings to fonts when using basic layout engine 2019-03-11 18:56:22 -07:00
Jon Dufresne
4de5477b61 Remove unnecessary unittest.main() boilerplate from test files
With the introduction and use of pytest, it is simple and easy to
execute specific tests in isolation through documented command line
arguments. Either by specifying the module path or through the `-k
EXPRESSION` argument. There is no longer any need to provide the
boilerplate:

    if __name__ == '__main__':
        unittest.main()

To every test file. It is simply noise.

The pattern remains in test files that aren't named with `test_*` as
those files are not discovered and executed by pytest by default.
2019-02-03 10:10:16 -08:00
Jon Dufresne
7da17ad41e Improve pytest configuration to allow specific tests as CLI args
The previous test configuration made it difficult to run a single test
with the pytest CLI. There were two major issues:

- The Tests directory was not a package. It now includes a __init__.py
  file and imports from other tests modules are done with relative
  imports.

- setup.cfg always specified the Tests directory. So even if a specific
  test were specified as a CLI arg, this configuration would also always
  include all tests. This configuration has been removed to allow
  specifying a single test on the command line.

Contributors can now run specific tests with a single command such as:

  $ tox -e py37 -- Tests/test_file_pdf.py::TestFilePdf.test_rgb

This makes it easy and faster to iterate on a single test failure and is
very familiar to those that have previously used tox and pytest.

When running tox or pytest with no arguments, they still discover and
runs all tests in the Tests directory.
2019-01-13 09:00:12 -08:00
Hugo
d7e4d3db3f Convert assert into exception 2018-08-25 19:06:11 +03:00
Andrew Murray
c2189235af Line too long 2018-07-02 19:26:02 +10:00
Andrew Murray
58cc23695d Continuation line over-indented for visual indent 2018-07-02 19:21:44 +10:00
Andrew Murray
e7815ccd62 Block comment should start with '# ' 2018-07-02 19:21:44 +10:00
Hugo
abae745da1
Merge pull request #3114 from tianyu139/hotfix
Fixed bug in ImageDraw.multiline_textsize()
2018-07-01 21:34:45 +03:00
Hugo
490464010a
Merge pull request #3113 from tianyu139/develop
Added getsize_multiline support for PIL.ImageFont
2018-07-01 21:33:21 +03:00
Hugo
40a0398657
Add spacing 2018-07-01 20:55:53 +03:00
Hugo
488161ebba
flake8 2018-07-01 20:54:12 +03:00
Hugo
67e5540021 Skip font tests when ImageFont not available 2018-05-31 15:11:50 +03:00
tianyu
58474d1c8d Added test to ensure ImageDraw.multiline_textsize returns same value as ImageFont.getsize for single lines 2018-04-24 22:55:17 +08:00
tianyu
3fda581963 Added test for getsize_multiline 2018-04-24 22:27:29 +08:00
Hugo
ecc4c7fecc Remove unittest regex deprecation warnings 2018-04-14 21:54:40 +03:00
Andrew Murray
4a781d0013 Replaced MacOS with macOS 2018-03-19 19:38:17 +11:00
Andrew Murray
2202196162 Flake8 blank line fixes 2018-03-04 21:36:33 +11:00
Andrew Murray
4afed260dc Updated freetype to 2.9 2018-01-13 06:26:42 +11:00
Eric Soroos
3f4abf6caa Fix/test for #2826, unchecked exception leading to null pointer dereference, segfault 2017-11-02 20:46:17 +00:00
wiredfool
39df75bd07 Merge pull request #2706 from wiredfool/issue_2666
Fix for crash drawing empty strings
2017-09-04 11:26:28 +01:00
Andrew Murray
5c2df30ac3 Removed ImageDraw.Draw del calls 2017-09-01 21:06:22 +10:00
Andrew Murray
9e843a2d9b Changed format of lambda calls 2017-09-01 21:05:40 +10:00
wiredfool
c3fbd9de01 test for issue #2666 2017-08-31 08:56:06 -07:00
Hugo
10c7e20045 Test for #2639 2017-07-23 23:56:02 +03:00
wiredfool
d2b3e60bbb test for issue #2614 2017-07-16 17:23:08 +10:00
Andrew Murray
844b812ebd Removed debugging code 2017-07-15 17:12:33 +10:00
Eric Soroos
20da797fce updates for centos/amazonlinux 2017-07-01 03:46:49 -07:00
wiredfool
8d9f6029e1 remove non-tempfile usage from tests 2017-06-21 14:00:15 -07:00
wiredfool
39327332df test both layout engines, if available 2017-06-21 14:00:15 -07:00
wiredfool
b8c04de043 added layout engine switch 2017-06-21 14:00:15 -07:00
hugovk
acf68c835c Increase epsilon for FreeType 2.7 2016-12-12 15:16:43 +02: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
Andrew Murray
b58f76dc4f Renamed references to OS X to macOS 2016-09-23 21:12:03 +10:00
homm
1ba4e9e5ba remove end of file banner from all files 2016-07-10 14:11:28 +03:00
Andrew Murray
a653afb10d Allowed textsize method to pass on multiline_textsize method specific arguments 2016-01-06 17:13:16 +11:00
Andrew Murray
89e3758fb8 Allowed text method to pass on multiline_text method specific arguments 2016-01-06 10:42:03 +11:00
hugovk
1110978fc7 Test another ImageFont getter 2015-12-07 20:44:03 +02:00
hugovk
1ae23a807f Test ImageFont getters 2015-12-07 20:24:57 +02:00
Andrew Murray
5835c1e09c Added deprecation warning to ImageDraw setfont method, as specified in docs 2015-09-19 21:12:10 +10:00
Andrew Murray
3841a11fb5 Removed ImageFont filename param, deprecated in 2.1 2015-09-19 21:06:12 +10:00
hugovk
bfa6b07741 flake8 2015-07-01 22:53:18 +03:00
hugovk
efa0fa1b4f More ImageFont tests 2015-07-01 22:51:38 +03:00
Andrew Murray
b7335ec9d9 Added multiline tests 2015-06-18 17:51:33 +10:00
Andrew Murray
3c7e37d2d7 Replaced old-style classes 2015-05-27 00:07:21 +10:00
Hugo
7e02582931 Merge pull request #1210 from toabctl/issue-1202
Fix test TestImageFont.test_textsize_equal for SLE11SP3
2015-04-29 15:39:50 +03:00
Thomas Bechtold
80a8463225 Fix test TestImageFont.test_textsize_equal
The current test failed on SLE11SP3 so use assert_image_similar() for
the test.
This fixes issue 1202.
2015-04-29 14:21:42 +02:00
Andrew Murray
ee34d6843b Further health fixes 2015-04-24 18:24:52 +10:00
hugovk
2879819ce7 Style/health fixes 2015-04-01 16:47:01 +03:00
Andrew Murray
b75ee4c5b6 Added tests for font paths without extensions and for preferring ttf extensions 2015-04-01 15:26:00 +11:00
Andrew Murray
84ec2af495 Allow truetype() to search for extensions other than .ttf 2015-03-21 21:13:15 +11:00
Andrew Murray
7a798f8724 Added copy method font_variant() and accessible properties to truetype() 2015-03-04 00:00:18 +11:00
wiredfool
96c06de695 Restrict tests to linux/osx 2014-12-31 19:59:50 -08:00
Charles Law
ee7b15c924 Add tests for finding fonts in linux and osx 2014-12-29 10:09:37 -08:00
wiredfool
b5c3eb5830 ucase(font_path,font_size) 2014-07-08 10:37:27 -07:00
wiredfool
552effb90d Merge #772 and master 2014-07-08 10:29:53 -07:00
Alex Clark ☺
962f1b46af Merge pull request #784 from tk0miya/master
Fix return value of FreeTypeFont.textsize() does not include font offsets
2014-07-08 05:14:01 -04:00
hugovk
cf04a9a0d2 Remove unused tearDownModule 2014-07-07 20:03:50 +03:00
Takeshi KOMIYA
60628c77b3 Fix return value of FreeTypeFont.textsize() does not include font offsets 2014-07-07 14:42:46 +09:00
hugovk
65593a3827 More tests for ImageFont.py 2014-07-05 00:04:19 +03:00
hugovk
3ec505958e Convert old tests to use unittest 2014-06-10 12:10:47 +03:00
hugovk
c91bd27eec Add tests for rotated and non-rotated transposed font
Check the box size of an ImageFont.TransposedFont matches that of the original ImageFont.
2013-10-17 17:36:38 +03:00
wiredfool
f6e1313337 Made linespacing test more forgiving of font rendering differences 2013-09-30 16:41:11 -07:00
wiredfool
ae6eb8733a actually cleaning 2013-09-24 14:23:43 -07:00
wiredfool
35c9f59c38 testcase for multiline text spacing 2013-09-24 14:23:17 -07:00
Alex Clark
172dae9e35 Fixes #262
Apply patch from @arfrever to resolve Tests/test_imagefont.py tests leave font.png
2013-06-30 18:47:02 -04:00
Alex Clark
bb1b3a532c Cleanup WS, courtesy of @Arfrever
find * -type f "-(" -name "*.bdf" -o -name "*.c" -o -name "*.h" -o -name "*.py" -o -name "*.rst" -o -name "*.txt" "-)" -exec sed -e "s/[[:space:]]*$//" -i {} \;
2013-06-30 18:42:19 -04:00
wiredfool
2e3cc80aa5 Added font rendering tests 2013-04-25 21:58:04 -07:00
Nicolas Pieuchot
5577801aaa Changing StringIO to BytesIO 2013-04-25 21:45:12 +02:00
Nicolas Pieuchot
6d8ba56c44 Adding Python 3 support for StringIO 2013-04-25 21:25:06 +02:00
Nicolas Pieuchot
450a068ccb Removing buffer from imagefont 2013-04-25 18:48:43 +02:00
Brian Crowell
ad784eb808 py3k: Import Christoph Gohlke's test suite
This is Christoph Gohlke's test suite from his personal PIL package found
at http://www.lfd.uci.edu/~gohlke/pythonlibs/.

This is just to bring it in as a separate commit. Future commits will align
it with Pillow.
2013-01-10 08:46:39 -06:00