From 29a8dbc6b2d7a2ed4bdae13ff7b47754f0803d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
Date: Thu, 3 Sep 2015 09:23:28 +0200
Subject: [PATCH] Temporarily deactivate travis for PyPy and PyPy3

Until travis supports PyPy 2.6, and there is a new release of PyPy3

Update docs regarding cffi and PyPy
---
 .travis.yml      |  4 ++--
 README.rst       | 16 +++++++++++++---
 docs/install.rst |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e099ea..bc845d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
-  - "pypy"
-  - "pypy3"
+#  - "pypy"
+#  - "pypy3"
 
 env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib
 
diff --git a/README.rst b/README.rst
index 85f6875..9f3b798 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ pygit2 - libgit2 bindings in Python
 
 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 and
-pypy.
+PyPy 2.6
 
 Links:
 
@@ -25,6 +25,16 @@ How to install
 Changelog
 ==============
 
+0.23.1 (2015-XX-XX)
+-------------------------
+
+- Upgrade to cffi 1.0+
+  `#529 <https://github.com/libgit2/pygit2/pull/529>`_
+
+- Fix ``Remote.push``
+  `#557 <https://github.com/libgit2/pygit2/pull/557>`_
+
+
 0.23.0 (2015-08-14)
 -------------------------
 
@@ -326,7 +336,7 @@ Other changes:
   `#380 <https://github.com/libgit2/pygit2/issues/380>`_
   `#407 <https://github.com/libgit2/pygit2/pull/407>`_
 
-- Add support for pypy3
+- Add support for PyPy3
   `#422 <https://github.com/libgit2/pygit2/pull/422>`_
 
 - Documentation improvements
@@ -490,7 +500,7 @@ Other:
 0.20.2 (2014-02-04)
 -------------------
 
-- Support pypy
+- Support PyPy
   `#209 <https://github.com/libgit2/pygit2/issues/209>`_
   `#327 <https://github.com/libgit2/pygit2/pull/327>`_
   `#333 <https://github.com/libgit2/pygit2/pull/333>`_
diff --git a/docs/install.rst b/docs/install.rst
index 018080d..0a0a5c4 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -13,9 +13,9 @@ Installation
 Requirements
 ============
 
-- Python 2.7, 3.2+ or pypy (including the development headers)
+- Python 2.7, 3.2+ or PyPy 2.6+ (including the development headers)
 - Libgit2 v0.23.x
-- cffi 0.8.1+
+- cffi 1.0+
 - Libssh2, optional, used for SSH network operations.
 - pkg-config, optional, used for SSH network operations.