Skip to content

Commit 5c96a46

Browse files
committed
Release 0.26.3
1 parent 03deadb commit 5c96a46

File tree

6 files changed

+40
-11
lines changed

6 files changed

+40
-11
lines changed

CHANGELOG.rst

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
0.26.3 (2017-12-24)
2+
-------------------------
3+
4+
- New ``Diff.deltas``
5+
`#736 <https://github.com/libgit2/pygit2/issues/736>`_
6+
7+
- Improvements to ``Patch.create_from``
8+
`#753 <https://github.com/libgit2/pygit2/pull/753>`_
9+
`#756 <https://github.com/libgit2/pygit2/pull/756>`_
10+
`#759 <https://github.com/libgit2/pygit2/pull/759>`_
11+
12+
- Fix build and tests in Windows, broken in the previous release
13+
`#749 <https://github.com/libgit2/pygit2/pull/749>`_
14+
`#751 <https://github.com/libgit2/pygit2/pull/751>`_
15+
16+
- Review ``Patch.patch``
17+
`#757 <https://github.com/libgit2/pygit2/issues/757>`_
18+
19+
- Workaround bug `#4442 <https://github.com/libgit2/libgit2/issues/4442>`_
20+
in libgit2, and improve unit tests
21+
`#748 <https://github.com/libgit2/pygit2/issues/748>`_
22+
`#754 <https://github.com/libgit2/pygit2/issues/754>`_
23+
`#758 <https://github.com/libgit2/pygit2/pull/758>`_
24+
`#761 <https://github.com/libgit2/pygit2/pull/761>`_
25+
26+
127
0.26.2 (2017-12-01)
228
-------------------------
329

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# The short X.Y version.
5353
version = '0.26'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '0.26.2'
55+
release = '0.26.3'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

docs/diff.rst

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Examples
3838
The Diff type
3939
====================
4040

41-
.. autoattribute:: pygit2.Diff.patch
4241
.. method:: Diff.__iter__()
4342

4443
Returns an iterator over the deltas/patches in this diff.
@@ -47,8 +46,11 @@ The Diff type
4746

4847
Returns the number of deltas/patches in this diff.
4948

50-
.. automethod:: pygit2.Diff.merge
49+
.. autoattribute:: pygit2.Diff.deltas
5150
.. automethod:: pygit2.Diff.find_similar
51+
.. automethod:: pygit2.Diff.merge
52+
.. autoattribute:: pygit2.Diff.patch
53+
.. autoattribute:: pygit2.Diff.stats
5254

5355

5456
The Patch type

docs/install.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ while the last number |lq| *.micro* |rq| auto-increments independently.
4343

4444
As illustration see this table of compatible releases:
4545

46-
+-----------+------------------------+----------------+------------------------+
47-
|**libgit2**| 0.26.0 | 0.25.0, 0.25.1 | 0.24.0, 0.24.1, 0.24.2 |
48-
+-----------+------------------------+----------------+------------------------+
49-
|**pygit2** | 0.26.0, 0.26.1, 0.26.2 | 0.25.0, 0.25.1 | 0.24.0, 0.24.1, 0.24.2 |
50-
+-----------+------------------------+----------------+------------------------+
46+
+-----------+--------------------------------+----------------+------------------------+
47+
|**libgit2**| 0.26.0 | 0.25.0, 0.25.1 | 0.24.0, 0.24.1, 0.24.2 |
48+
+-----------+--------------------------------+----------------+------------------------+
49+
|**pygit2** | 0.26.0, 0.26.1, 0.26.2, 0.26.3 | 0.25.0, 0.25.1 | 0.24.0, 0.24.1, 0.24.2 |
50+
+-----------+--------------------------------+----------------+------------------------+
5151

5252
.. warning::
5353

pygit2/_build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#
3838
# The version number of pygit2
3939
#
40-
__version__ = '0.26.2'
40+
__version__ = '0.26.3'
4141

4242

4343
#

src/diff.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ PyDoc_STRVAR(DiffStats__doc__, "DiffStats object.");
751751
PyTypeObject DiffStatsType = {
752752
PyVarObject_HEAD_INIT(NULL, 0)
753753
"_pygit2.DiffStats", /* tp_name */
754-
sizeof(DiffStats), /* tp_basicsize */
754+
sizeof(DiffStats), /* tp_basicsize */
755755
0, /* tp_itemsize */
756756
(destructor)DiffStats_dealloc, /* tp_dealloc */
757757
0, /* tp_print */
@@ -776,7 +776,7 @@ PyTypeObject DiffStatsType = {
776776
0, /* tp_weaklistoffset */
777777
0, /* tp_iter */
778778
0, /* tp_iternext */
779-
DiffStats_methods, /* tp_methods */
779+
DiffStats_methods, /* tp_methods */
780780
0, /* tp_members */
781781
DiffStats_getseters, /* tp_getset */
782782
0, /* tp_base */
@@ -929,6 +929,7 @@ static PyMethodDef Diff_methods[] = {
929929
{NULL}
930930
};
931931

932+
/* TODO Implement Diff.patches, deprecate Diff_iter and Diff_getitem */
932933

933934
PyDoc_STRVAR(Diff__doc__, "Diff objects.");
934935

0 commit comments

Comments
 (0)