openstack/deb-python-pygit2
Code Issues Proposed changes

Update versions to libgit2 v0.25.0

Browse Source
This commit is contained in:
Carlos Martín Nieto 2016-12-23 20:24:37 +00:00
parent acdec78617
commit 074a726d7f
4 changed files with 20 additions and 20 deletions

2
.travis.sh

@ -2,7 +2,7 @@
cd ~ cd ~
git clone --depth=1 -b maint/v0.24 https://github.com/libgit2/libgit2.git git clone --depth=1 -b maint/v0.25 https://github.com/libgit2/libgit2.git
cd libgit2/ cd libgit2/
mkdir build && cd build mkdir build && cd build

2
appveyor.yml

@ -25,7 +25,7 @@ init:
build_script: build_script:
- cmd: | - cmd: |
set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\build\libgit2 set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\build\libgit2
git clone --depth=1 -b maint/v0.24 https://github.com/libgit2/libgit2.git libgit2 git clone --depth=1 -b maint/v0.25 https://github.com/libgit2/libgit2.git libgit2
mkdir build mkdir build
cd build cd build

32
docs/install.rst

@ -14,7 +14,7 @@ Requirements
============ ============
- Python 2.7, 3.2+ or PyPy 2.6+ (including the development headers) - Python 2.7, 3.2+ or PyPy 2.6+ (including the development headers)
- Libgit2 v0.23.x - Libgit2 v0.25.x
- cffi 1.0+ - cffi 1.0+
- six - six
- tox (optional) - tox (optional)
@ -43,11 +43,11 @@ while the last number |lq| *.micro* |rq| auto-increments independently.
As illustration see this table of compatible releases: As illustration see this table of compatible releases:
+-----------+-----------------------+----------------------------------------+ +-----------+--------+--------------+--------+
|**libgit2**| 0.24.0, 0.24.1 0.24.2 | 0.23.0, 0.23.1, 0.23.2, 0.23.3, 0.23.4 | |**libgit2**| 0.25.0 | 0.24.0, 0.24.1 0.24.2 |
+-----------+-----------------------+----------------------------------------+ +-----------+--------+--------------+--------+
|**pygit2** | 0.24.0, 0.24.1 0.24.2 | 0.23.0, 0.23.1, 0.23.2, 0.23.3 | |**pygit2** | 0.25.0 | 0.24.0, 0.24.1 0.24.2 |
+-----------+-----------------------+----------------------------------------+ +-----------+--------+--------------+--------+
.. warning:: .. warning::
@ -64,9 +64,9 @@ directory, do:
.. code-block:: sh .. code-block:: sh
$ wget https://github.com/libgit2/libgit2/archive/v0.24.2.tar.gz $ wget https://github.com/libgit2/libgit2/archive/v0.25.0.tar.gz
$ tar xzf v0.24.2.tar.gz $ tar xzf v0.25.0.tar.gz
$ cd libgit2-0.24.2/ $ cd libgit2-0.25.0/
$ cmake . $ cmake .
$ make $ make
$ sudo make install $ sudo make install
@ -148,9 +148,9 @@ Install libgit2 (see we define the installation prefix):
.. code-block:: sh .. code-block:: sh
$ wget https://github.com/libgit2/libgit2/archive/v0.23.4.tar.gz $ wget https://github.com/libgit2/libgit2/archive/v0.25.0.tar.gz
$ tar xzf v0.23.4.tar.gz $ tar xzf v0.25.0.tar.gz
$ cd libgit2-0.23.4/ $ cd libgit2-0.25.0/
$ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2 $ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2
$ make $ make
$ make install $ make install
@ -186,7 +186,7 @@ everytime. Verify yourself if curious:
.. code-block:: sh .. code-block:: sh
$ readelf --dynamic lib/python2.7/site-packages/pygit2-0.23.0-py2.7-linux-x86_64.egg/_pygit2.so | grep PATH $ readelf --dynamic lib/python2.7/site-packages/pygit2-0.25.0-py2.7-linux-x86_64.egg/_pygit2.so | grep PATH
0x000000000000001d (RUNPATH) Library runpath: [/tmp/venv/lib] 0x000000000000001d (RUNPATH) Library runpath: [/tmp/venv/lib]
@ -203,9 +203,9 @@ from a bash shell:
.. code-block:: sh .. code-block:: sh
$ export LIBGIT2=C:/Dev/libgit2 $ export LIBGIT2=C:/Dev/libgit2
$ wget https://github.com/libgit2/libgit2/archive/v0.23.4.tar.gz $ wget https://github.com/libgit2/libgit2/archive/v0.25.0.tar.gz
$ tar xzf v0.23.4.tar.gz $ tar xzf v0.25.0.tar.gz
$ cd libgit2-0.23.4/ $ cd libgit2-0.25.0/
$ cmake . -DSTDCALL=OFF -DCMAKE_INSTALL_PREFIX=$LIBGIT2 -G "Visual Studio 9 2008" $ cmake . -DSTDCALL=OFF -DCMAKE_INSTALL_PREFIX=$LIBGIT2 -G "Visual Studio 9 2008"
$ cmake --build . --config release --target install $ cmake --build . --config release --target install
$ ctest -v $ ctest -v

4
src/types.h

@ -32,8 +32,8 @@
#include <Python.h> #include <Python.h>
#include <git2.h> #include <git2.h>
#if !(LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR == 24) #if !(LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR == 25)
#error You need a compatible libgit2 version (v0.24.x) #error You need a compatible libgit2 version (v0.25.x)
#endif #endif
/* /*