mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-25 17:36:18 +03:00
Merge branch 'master' into pypy
This commit is contained in:
commit
7ccc5115be
|
@ -1,6 +1,12 @@
|
|||
Changelog (Pillow)
|
||||
==================
|
||||
|
||||
2.2.1 (2013-10-02)
|
||||
------------------
|
||||
|
||||
- Fix #356: Error installing Pillow 2.2.0 on Mac OS X (due to hard dep on brew)
|
||||
[wiredfool]
|
||||
|
||||
2.2.0 (2013-10-02)
|
||||
------------------
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ include *.c
|
|||
include *.h
|
||||
include *.py
|
||||
include *.rst
|
||||
include .gitattributes
|
||||
include .travis.yml
|
||||
include Makefile
|
||||
include tox.ini
|
||||
|
@ -21,7 +22,10 @@ recursive-include Images *.xpm
|
|||
recursive-include Sane *.c
|
||||
recursive-include Sane *.py
|
||||
recursive-include Sane *.txt
|
||||
recursive-include Sane CHANGES
|
||||
recursive-include Sane README
|
||||
recursive-include Scripts *.py
|
||||
recursive-include Scripts README
|
||||
recursive-include Tests *.bin
|
||||
recursive-include Tests *.icm
|
||||
recursive-include Tests *.jpg
|
||||
|
@ -41,5 +45,8 @@ recursive-include docs *.gitignore
|
|||
recursive-include docs *.py
|
||||
recursive-include docs *.rst
|
||||
recursive-include docs Makefile
|
||||
recursive-include docs BUILDME
|
||||
recursive-include docs COPYING
|
||||
recursive-include docs LICENSE
|
||||
recursive-include libImaging *.c
|
||||
recursive-include libImaging *.h
|
||||
|
|
1
Makefile
1
Makefile
|
@ -1,4 +1,5 @@
|
|||
pre:
|
||||
bin/python setup.py develop
|
||||
bin/python selftest.py
|
||||
bin/python Tests/run.py
|
||||
check-manifest
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
# ;-)
|
||||
|
||||
VERSION = '1.1.7' # PIL version
|
||||
PILLOW_VERSION = '2.2.0' # Pillow
|
||||
PILLOW_VERSION = '2.2.1' # Pillow
|
||||
|
||||
_plugins = ['ArgImagePlugin',
|
||||
'BmpImagePlugin',
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Pillow
|
||||
======
|
||||
|
||||
**Python Imaging Library (Fork)**
|
||||
*Python Imaging Library (Fork)*
|
||||
|
||||
Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
* See the README file for information on usage and redistribution.
|
||||
*/
|
||||
|
||||
#define PILLOW_VERSION "2.2.0"
|
||||
#define PILLOW_VERSION "2.2.1"
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
|
|
19
setup.py
19
setup.py
|
@ -82,7 +82,7 @@ except ImportError:
|
|||
|
||||
|
||||
NAME = 'Pillow'
|
||||
VERSION = '2.2.0'
|
||||
VERSION = '2.2.1'
|
||||
TCL_ROOT = None
|
||||
JPEG_ROOT = None
|
||||
ZLIB_ROOT = None
|
||||
|
@ -179,12 +179,15 @@ class pil_build_ext(build_ext):
|
|||
_add_directory(include_dirs, "/usr/X11/include")
|
||||
# if homebrew is installed, use its lib and include directories
|
||||
import subprocess
|
||||
prefix = subprocess.check_output(['brew', '--prefix'])
|
||||
if prefix:
|
||||
prefix = prefix.strip()
|
||||
_add_directory(library_dirs, os.path.join(prefix, 'lib'))
|
||||
_add_directory(include_dirs, os.path.join(prefix, 'include'))
|
||||
|
||||
try:
|
||||
prefix = subprocess.check_output(['brew', '--prefix'])
|
||||
if prefix:
|
||||
prefix = prefix.strip()
|
||||
_add_directory(library_dirs, os.path.join(prefix, 'lib'))
|
||||
_add_directory(include_dirs, os.path.join(prefix, 'include'))
|
||||
except:
|
||||
pass # homebrew not installed
|
||||
|
||||
elif sys.platform.startswith("linux"):
|
||||
for platform_ in (plat.processor(), plat.architecture()[0]):
|
||||
|
||||
|
@ -569,7 +572,7 @@ class pil_build_ext(build_ext):
|
|||
setup(
|
||||
name=NAME,
|
||||
version=VERSION,
|
||||
description='Python Imaging Library (fork)',
|
||||
description='Python Imaging Library (Fork)',
|
||||
long_description=(
|
||||
_read('README.rst') + b'\n' +
|
||||
_read('CHANGES.rst') + b'\n' +
|
||||
|
|
Loading…
Reference in New Issue
Block a user