8000 Merge branch 'master' into api · libvips/pyvips@44c487e · GitHub
[go: up one dir, main page]
Skip to content

Commit 44c487e

Browse files
jcupittjcupitt
committed
Merge branch 'master' into api
2 parents d39041b + 1b1f294 commit 44c487e

File tree

9 files changed

+332
-164
lines changed

9 files changed

+332
-164
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.pytest_cache
12
.*.swp
23
*.pyc
34
*.egg-info

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ python:
5050
- "pypy"
5151
- "pypy3"
5252

53+
# some strange package versioning issue with pypy?
5354
matrix:
5455
allow_failures:
5556
- python: nightly
5657
- python: "3.3"
58+
- python: "3.4"
59+
- python: "pypy"
60+
- python: "pypy3"
5761

5862
install:
5963
- pip install .[test]

‎CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
back to ABI mode [jcupitt]
99
* better error for bad kwarg [geniass]
1010

11+
## Version 2.0.6 (22 February 2017)
12+
13+
* add version numbers to library names on linux
14+
1115
## Version 2.0.5 (8 September 2017)
1216

1317
* minor polish

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ binary extension for your Python.
1919

2020
If it is unable to build a binary extension, it will use cffi ABI mode instead
2121
and only needs the libvips shared library. This takes longer to start up and is
22-
typically 20% slower.
22+
typically ~20% slower in execution.
2323

2424
This binding passes the vips test suite cleanly and with no leaks under
2525
python2.7 - python3.6, pypy and pypy3 on Windows, macOS and Linux.
@@ -44,7 +44,7 @@ speed and memory use benchmark:
4444
https://github.com/jcupitt/libvips/wiki/Speed-and-memory-use
4545

4646
Loads a large tiff image, shrinks by 10%, sharpens, and saves again. On this
47-
test ``pyvips`` is typically 2x faster than Pillow-SIMD and needs 4x less
47+
test ``pyvips`` is typically 3x faster than ImageMagick and needs 5x less
4848
memory.
4949

5050
There's a handy blog post explaining how libvips opens files, which gives

0 commit comments

Comments
 (0)
0