python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-27 15:44:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8c4f58a4cd into 574a8e4793

Browse Source
This commit is contained in:
Hugo 2017-09-16 19:14:32 +00:00 committed by GitHub
commit 406d073624
9 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -17,7 +17,6 @@ matrix:
- python: "2.7_with_system_site_packages" # For PyQt4
- python: '3.5'
- python: '3.4'
- python: '3.3'
- env: DOCKER="alpine"
- env: DOCKER="arch" # contains PyQt5
- env: DOCKER="ubuntu-trusty-x86"

10
Tests/test_image_access.py
View File

@ -251,8 +251,8 @@ class TestCffi(AccessTest):
class TestEmbeddable(unittest.TestCase):
@unittest.skipIf(not sys.platform.startswith('win32') or
sys.version_info[:2] in ((3, 3), (3, 4)) or
on_appveyor(), # failing on appveyor when run from
sys.version_info[:2] == (3, 4) or
on_appveyor(), # failing on AppVeyor when run from
# subprocess, not from shell
"requires Python 2.7 or >=3.5 for Windows")
def test_embeddable(self):
@ -293,7 +293,7 @@ int main(int argc, char* argv[])
compiler = ccompiler.new_compiler()
compiler.add_include_dir(sysconfig.get_python_inc())
libdir = sysconfig.get_config_var('LIBDIR') or sysconfig.get_python_inc().replace('include', 'libs')
print (libdir)
compiler.add_library_dir(libdir)
@ -302,10 +302,10 @@ int main(int argc, char* argv[])
env = os.environ.copy()
env["PATH"] = sys.prefix + ';' + env["PATH"]
# do not display the Windows Error Reporting dialog
ctypes.windll.kernel32.SetErrorMode(0x0002)
process = subprocess.Popen(['embed_pil.exe'], env=env)
process.communicate()
self.assertEqual(process.returncode, 0)

3
appveyor.yml
View File

@ -19,9 +19,6 @@ environment:
- PYTHON: C:/Python34
- PYTHON: C:/Python27
- PYTHON: C:/Python34-x64
- PYTHON: C:/Python33
- PYTHON: C:/Python33-x64
install:
- curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip

10
docs/installation.rst
View File

@ -17,7 +17,9 @@ Notes
.. note:: Pillow >= 2.0.0 < 4.0.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5
.. note:: Pillow >= 4.0.0 supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6
.. note:: Pillow >= 4.0.0 < 4.3.0 supports Python versions 2.7, 3.3, 3.4, 3.5, 3.6
.. note:: Pillow >= 4.3.0 supports Python versions 2.7, 3.4, 3.5, 3.6
Basic Installation
------------------
@ -369,18 +371,18 @@ These platforms are built and tested for every change.
+----------------------------------+-------------------------------+-----------------------+
| Debian Stretch | 2.7 |x86 |
+----------------------------------+-------------------------------+-----------------------+
| Mac OS X 10.10 Yosemite* | 2.7, 3.3, 3.4, 3.5, 3.6 |x86-64 |
| Mac OS X 10.10 Yosemite* | 2.7, 3.4, 3.5, 3.6 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
| Ubuntu Linux 16.04 LTS | 2.7 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
| Ubuntu Linux 14.04 LTS | 2.7, 3.3, 3.4, 3.5, 3.6, |x86-64 |
| Ubuntu Linux 14.04 LTS | 2.7, 3.4, 3.5, 3.6, |x86-64 |
| | pypy, pypy3 | |
| | | |
| | 2.7 |x86 |
+----------------------------------+-------------------------------+-----------------------+
| Ubuntu Linux 12.04 LTS | 2.7 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
| Windows Server 2012 R2 | 2.7,3.3,3.4,pypy |x86, x86-64 |
| Windows Server 2012 R2 | 2.7, 3.4, pypy |x86, x86-64 |
+----------------------------------+-------------------------------+-----------------------+
\* Mac OS X CI is not run for every commit, but is run for every release.

11
mp_compile.py
View File

@ -54,19 +54,12 @@ def _mp_compile(self, sources, output_dir=None, macros=None,
def install():
fl_pypy3 = (hasattr(sys, 'pypy_version_info') and
(3, 0) < sys.version_info < (3, 3))
fl_win = sys.platform.startswith('win')
fl_cygwin = sys.platform.startswith('cygwin')
if fl_pypy3:
# see https://github.com/travis-ci/travis-ci/issues/3587
print("Single threaded build for pypy3")
return
if fl_win or fl_cygwin:
# windows barfs on multiprocessing installs
print("Single threaded build for windows")
# Windows barfs on multiprocessing installs
print("Single threaded build for Windows")
return
if MAX_PROCS != 1:

1
setup.py
View File

@ -765,7 +765,6 @@ try:
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",

14
winbuild/README.md
View File

@ -1,18 +1,18 @@
Quick README
------------
------------
For more extensive info, see the windows build instructions `docs/build.rst`.
For more extensive info, see the Windows build instructions `docs/build.rst`.
* See https://github.com/python-pillow/Pillow/issues/553#issuecomment-37877416 and https://github.com/matplotlib/matplotlib/issues/1717#issuecomment-13343859
* See https://github.com/python-pillow/Pillow/issues/553#issuecomment-37877416 and https://github.com/matplotlib/matplotlib/issues/1717#issuecomment-13343859
* Works best with Python 3.4, due to virtualenv and pip batteries included. Python3+ required for fetch command.
* Check config.py for virtual env paths, suffix for 64-bit releases. Defaults to `x64`, set `X64_EXT` to change.
* When running in CI with one Python per invocation, set the `PYTHON` env variable to the Python folder. (e.g. `PYTHON`=`c:\Python27\`) This overrides the matrix in config.py and will just build and test for the specific Python.
* `python get_pythons.py` downloads all the Python releases, and their signatures. (Manually) Install in `c:\PythonXX[x64]\`.
* `python build_dep.py` downloads and creates a build script for all the dependencies, in 32 and 64 bit versions, and with both compiler versions.
* `python build_dep.py` downloads and creates a build script for all the dependencies, in 32 and 64-bit versions, and with both compiler versions.
* (in powershell) `build_deps.cmd` invokes the dependency build.
* `python build.py --clean` makes Pillow for the matrix of Pythons.
* `python test.py` runs the tests on Pillow in all the virtual envs.
* Currently working with zlib, libjpeg, freetype, and libtiff on Python 2.7, 3.3, and 3.4, both 32 and 64 bit, on a local win7 pro machine and appveyor.com
* Webp is built, not detected.
* LCMS, OpenJpeg and libimagequant are not building.
* Currently working with zlib, libjpeg, freetype, and libtiff on Python 2.7 and 3.4, both 32 and 64-bit, on a local win7 pro machine and appveyor.com
* WebP is built, not detected.
* LCMS, OpenJPEG and libimagequant are not building.

5
winbuild/config.py
View File

@ -3,11 +3,8 @@ import os
SF_MIRROR = 'http://iweb.dl.sourceforge.net'
PILLOW_DEPENDS_DIR = 'C:\\pillow-depends\\'
pythons = { # '26': 7,
'27': 7,
pythons = {'27': 7,
'pypy2': 7,
# '32': 7,
'33': 7.1,
'34': 7.1}
VIRT_BASE = "c:/vp/"

2
winbuild/get_pythons.py
View File

@ -2,7 +2,7 @@ from fetch import fetch
import os
if __name__ == '__main__':
for version in ['2.7.10', '3.3.5', '3.4.3']:
for version in ['2.7.10', '3.4.3']:
for platform in ['', '.amd64']:
for extension in ['', '.asc']:
fetch('https://www.python.org/ftp/python/%s/python-%s%s.msi%s'