Skip to content

Commit be32579

Browse files
committed
Switch to libgit2 1.0
1 parent e012bb5 commit be32579

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
libgit2: ['master']
14+
libgit2: ['maint/v1.0']
1515
py:
1616
- ver: '3.6'
1717
release: '3.6.8' # last Python.org binary release

.travis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010
cd ~
1111

12-
git clone --depth=1 -b "${LIBGIT2_VERSION}" https://github.com/libgit2/libgit2.git
12+
git clone --depth=1 -b "maint/v${LIBGIT2_VERSION}" https://github.com/libgit2/libgit2.git
1313
cd libgit2/
1414

1515
mkdir build && cd build

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
global:
1414
LIBGIT2: ~/libgit2/_install/
1515
LD_LIBRARY_PATH: ${LIBGIT2}/lib:${LD_LIBRARY_PATH}
16-
LIBGIT2_VERSION: "master"
16+
LIBGIT2_VERSION: "1.0"
1717

1818

1919
jobs:

CHANGELOG.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
- Drop support for Python 3.5
55
`#991 <https://github.com/libgit2/pygit2/issues/991>`_
66

7-
- New MacOS wheels
8-
`#988 <https://github.com/libgit2/pygit2/pull/988>`_
7+
- Upgrade to libgit2 1.0
8+
`#982 <https://github.com/libgit2/pygit2/pull/982>`_
9+
10+
- New support for custom reference database backends
11+
`#982 <https://github.com/libgit2/pygit2/pull/982>`_
912

1013
- New support for path objects
1114
`#990 <https://github.com/libgit2/pygit2/pull/990>`_
@@ -14,6 +17,9 @@
1417
- New ``index`` optional parameter in ``Repository.checkout_index``
1518
`#987 <https://github.com/libgit2/pygit2/pull/987>`_
1619

20+
- New MacOS wheels
21+
`#988 <https://github.com/libgit2/pygit2/pull/988>`_
22+
1723
- Fix warning with ``pip install pygit2``
1824
`#986 <https://github.com/libgit2/pygit2/issues/986>`_
1925

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ build_script:
3232
# Clone, build and install libgit2
3333
- cmd: |
3434
set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\venv
35-
git clone --depth=1 -b master https://github.com/libgit2/libgit2.git libgit2
35+
git clone --depth=1 -b maint/v1.0 https://github.com/libgit2/libgit2.git libgit2
3636
cd libgit2
3737
cmake . -DBUILD_CLAR=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" -G "%GENERATOR%"
3838
cmake --build . --target install

docs/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ of Python and the required libgit2 version.
7171
+-----------+----------------+----------------+
7272
| pygit2 | Python | libgit2 |
7373
+-----------+----------------+----------------+
74-
| 1.2.x | 3.6 - 3.8 | 0.99.x, 1.0.x |
74+
| 1.2.x | 3.6 - 3.8 | 1.0.x |
7575
+-----------+----------------+----------------+
7676
| 1.1.x | 3.5 - 3.8 | 0.99.x, 1.0.x |
7777
+-----------+----------------+----------------+

src/types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include <Python.h>
3333
#include <git2.h>
3434

35-
#if !(LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR == 99 || LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 0)
36-
#error You need a compatible libgit2 version (0.99.x or 1.0.x)
35+
#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 0)
36+
#error You need a compatible libgit2 version (1.0.x)
3737
#endif
3838

3939
/*

0 commit comments

Comments
 (0)