diff --git a/.travis.yml b/.travis.yml index e5d5a6b4d..952714b5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ python: - 3.5 - 2.7 - "2.7_with_system_site_packages" # For PyQt4 - - 3.2 - 3.3 - 3.4 - nightly @@ -26,9 +25,7 @@ install: # Pyroma tests sometimes hang on PyPy; skip - if [ $TRAVIS_PYTHON_VERSION != "pypy" ]; then travis_retry pip install pyroma; fi - # Coverage 4.0 doesn't support Python 3.2 - - if [ "$TRAVIS_PYTHON_VERSION" == "3.2" ]; then travis_retry pip install coverage==3.7.1; fi - - if [ "$TRAVIS_PYTHON_VERSION" != "3.2" ]; then travis_retry pip install coverage; fi + - "travis_retry pip install coverage" # docs only on python 2.7 - if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then travis_retry pip install -r requirements.txt ; fi diff --git a/docs/installation.rst b/docs/installation.rst index 4cccf303e..2724886bb 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,7 +17,7 @@ Notes .. note:: Pillow >= 2.0.0 < 3.5.0 supports Python versions 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 -.. note:: Pillow >= 3.5.0 supports Python versions 2.7, 3.2, 3.3, 3.4, 3.5 +.. note:: Pillow >= 3.5.0 supports Python versions 2.7, 3.3, 3.4, 3.5 Basic Installation ------------------ diff --git a/setup.py b/setup.py index dbb9e046c..808ec728a 100644 --- a/setup.py +++ b/setup.py @@ -74,20 +74,7 @@ def _find_include_file(self, include): def _find_library_file(self, library): - # Fix for 3.2.x <3.2.4, 3.3.0, shared lib extension is the python shared - # lib extension, not the system shared lib extension: e.g. .cpython-33.so - # vs .so. See Python bug http://bugs.python.org/16754 - if 'cpython' in self.compiler.shared_lib_extension: - _dbg('stripping cpython from shared library extension %s', - self.compiler.shared_lib_extension) - existing = self.compiler.shared_lib_extension - self.compiler.shared_lib_extension = "." + existing.split('.')[-1] - ret = self.compiler.find_library_file(self.compiler.library_dirs, - library) - self.compiler.shared_lib_extension = existing - else: - ret = self.compiler.find_library_file(self.compiler.library_dirs, - library) + ret = self.compiler.find_library_file(self.compiler.library_dirs, library) if ret: _dbg('Found library %s at %s', (library, ret)) else: @@ -772,7 +759,6 @@ try: "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", diff --git a/tox.ini b/tox.ini index 809183b9a..4d63febd0 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py32, py33, py34, py35 +envlist = py27, py33, py34, py35 [testenv] commands = diff --git a/winbuild/build.rst b/winbuild/build.rst index e4c2293a9..86c4cf4c7 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -31,7 +31,7 @@ The build routines expect Python to be installed at C:\PythonXX for Download Python 3.4, install it, and add it to the path. This is the Python that we will use to bootstrap the build process. (The download -routines are using 3.2+ features, and installing 3.4 gives us pip and +routines are using 3 features, and installing 3.4 gives us pip and virtualenv as well, reducing the number of packages that we need to install.) diff --git a/winbuild/get_pythons.py b/winbuild/get_pythons.py index 5abd836fb..481283df3 100644 --- a/winbuild/get_pythons.py +++ b/winbuild/get_pythons.py @@ -2,7 +2,7 @@ from fetch import fetch import os if __name__ == '__main__': - for version in ['2.7.10', '3.2.5', '3.3.5', '3.4.3']: + for version in ['2.7.10', '3.3.5', '3.4.3']: for platform in ['', '.amd64']: for extension in ['', '.asc']: fetch('https://www.python.org/ftp/python/%s/python-%s%s.msi%s'