From f841c62fa69861cf6beddcff0bdac151afa8e8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com> Date: Sun, 7 May 2017 09:53:10 +0200 Subject: [PATCH] Drop support for Python 3.2, cffi 1.10 doesn't work with --- .travis.yml | 1 - README.rst | 2 +- docs/index.rst | 2 +- docs/install.rst | 2 +- setup.py | 10 +--------- tox.ini | 2 +- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72f8f1b..db55e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python python: - "2.7" - - "3.2" - "3.3" - "3.4" - "3.5" diff --git a/README.rst b/README.rst index 627818a..bc66152 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ pygit2 - libgit2 bindings in Python :target: https://ci.appveyor.com/project/jdavid/pygit2/branch/master Pygit2 is a set of Python bindings to the libgit2 shared library, libgit2 -implements Git plumbing. Pygit2 works with Python 2.7, 3.2, 3.3, 3.4, 3.5, 3.6 +implements Git plumbing. Pygit2 works with Python 2.7, 3.3, 3.4, 3.5, 3.6 and PyPy 2.6 Links: diff --git a/docs/index.rst b/docs/index.rst index 8507ff6..24cdf12 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,7 +7,7 @@ Welcome to pygit2's documentation! ================================== Pygit2 is a set of Python bindings to the libgit2 shared library, libgit2 -implements the core of Git. Pygit2 works with Python 2.7, 3.2, 3.3, 3.4, 3.5, +implements the core of Git. Pygit2 works with Python 2.7, 3.3, 3.4, 3.5, 3.6 and pypy. It is likely to work with Python 2.6 and 3.1, but these versions are not diff --git a/docs/install.rst b/docs/install.rst index 861ceab..3735441 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -13,7 +13,7 @@ Installation Requirements ============ -- Python 2.7, 3.2+ or PyPy 2.6+ (including the development headers) +- Python 2.7, 3.3+ or PyPy 2.6+ (including the development headers) - Libgit2 v0.25.x - cffi 1.0+ - six diff --git a/setup.py b/setup.py index 18d3eb0..21d9276 100644 --- a/setup.py +++ b/setup.py @@ -61,14 +61,6 @@ if cffi_major_version == 0: ffi.verify(preamble, **C_KEYWORDS) del sys.path[0] -# Python 2 support -# See https://github.com/libgit2/pygit2/pull/180 for a discussion about this. -# Using six isn't an option here yet, we don't necessarily have six installed -if sys.version_info[0] == 2: - u = lambda s: unicode(s, 'utf-8') -else: - u = str - libgit2_bin, libgit2_include, libgit2_lib = get_libgit2_paths() @@ -198,7 +190,7 @@ setup(name='pygit2', url='http://github.com/libgit2/pygit2', classifiers=classifiers, license='GPLv2 with linking exception', - maintainer=u('J. David Ibáñez'), + maintainer=u'J. David Ibáñez', maintainer_email='jdavid.ibp@gmail.com', long_description=long_description, packages=['pygit2'], diff --git a/tox.ini b/tox.ini index e930fa2..d946fab 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py32,py33,py34,py35,py36,pypy,pypy3 +envlist = py27,py33,py34,py35,py36,pypy,pypy3 [testenv] commands =