Hello community, here is the log from the commit of package python-pygit2 for openSUSE:Factory checked in at 2019-09-13 15:01:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pygit2 (Old) and /work/SRC/openSUSE:Factory/.python-pygit2.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pygit2" Fri Sep 13 15:01:20 2019 rev:21 rq:730403 version:0.28.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pygit2/python-pygit2.changes 2019-05-16 22:09:16.962323935 +0200 +++ /work/SRC/openSUSE:Factory/.python-pygit2.new.7948/python-pygit2.changes 2019-09-13 15:03:26.861280597 +0200 @@ -1,0 +2,9 @@ +Mon Jun 3 10:20:16 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.28.2: + * Fix crash in reflog iteration #901 + * Support symbolic references in branches.with_commit(..) #910 + * Documentation updates #909 + * Test updates #911 + +------------------------------------------------------------------- Old: ---- pygit2-0.28.1.tar.gz New: ---- pygit2-0.28.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pygit2.spec ++++++ --- /var/tmp/diff_new_pack.f2cYMC/_old 2019-09-13 15:03:28.073280339 +0200 +++ /var/tmp/diff_new_pack.f2cYMC/_new 2019-09-13 15:03:28.101280333 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pygit2 -Version: 0.28.1 +Version: 0.28.2 Release: 0 Summary: Python bindings for libgit2 License: GPL-2.0-only @@ -61,6 +61,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitearch} %check +rm -rf pygit2 %pytest_arch %files %{python_files} ++++++ pygit2-0.28.1.tar.gz -> pygit2-0.28.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/AUTHORS.rst new/pygit2-0.28.2/AUTHORS.rst --- old/pygit2-0.28.1/AUTHORS.rst 2019-04-19 10:09:33.000000000 +0200 +++ new/pygit2-0.28.2/AUTHORS.rst 2019-05-26 10:45:58.000000000 +0200 @@ -107,6 +107,7 @@ Bryan O'Sullivan CJ Harries Cam Cope + Chad Birch Chason Chaffin Chris Jerdonek Chris Rebert @@ -115,6 +116,7 @@ Cyril Jouve Daniel Bruce Daniele Esposti + David Black David Fischer David Sanders David Six diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/CHANGELOG.rst new/pygit2-0.28.2/CHANGELOG.rst --- old/pygit2-0.28.1/CHANGELOG.rst 2019-04-19 10:05:31.000000000 +0200 +++ new/pygit2-0.28.2/CHANGELOG.rst 2019-05-26 10:39:44.000000000 +0200 @@ -1,3 +1,19 @@ +0.28.2 (2019-05-26) +------------------------- + +- Fix crash in reflog iteration + `#901 <https://github.com/libgit2/pygit2/issues/901>`_ + +- Support symbolic references in ``branches.with_commit(..)`` + `#910 <https://github.com/libgit2/pygit2/issues/910>`_ + +- Documentation updates + `#909 <https://github.com/libgit2/pygit2/pull/909>`_ + +- Test updates + `#911 <https://github.com/libgit2/pygit2/pull/911>`_ + + 0.28.1 (2019-04-19) ------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/Makefile new/pygit2-0.28.2/Makefile --- old/pygit2-0.28.1/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/pygit2-0.28.2/Makefile 2019-04-19 20:09:09.000000000 +0200 @@ -0,0 +1,4 @@ +.PHONY: build + +build: + python setup.py build_ext --inplace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/PKG-INFO new/pygit2-0.28.2/PKG-INFO --- old/pygit2-0.28.1/PKG-INFO 2019-04-19 10:22:29.000000000 +0200 +++ new/pygit2-0.28.2/PKG-INFO 2019-05-26 11:42:43.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: pygit2 -Version: 0.28.1 +Version: 0.28.2 Summary: Python bindings for libgit2. Home-page: http://github.com/libgit2/pygit2 Maintainer: J. David Ibáñez diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/appveyor.yml new/pygit2-0.28.2/appveyor.yml --- old/pygit2-0.28.1/appveyor.yml 2019-02-23 22:49:59.000000000 +0100 +++ new/pygit2-0.28.2/appveyor.yml 2019-05-19 17:19:45.000000000 +0200 @@ -9,63 +9,62 @@ matrix: - GENERATOR: 'Visual Studio 10' PYTHON: 'C:\Python27\python.exe' - TOXENV: py27 - GENERATOR: 'Visual Studio 10 Win64' PYTHON: 'C:\Python27-x64\python.exe' - TOXENV: py27 - GENERATOR: 'Visual Studio 10' PYTHON: 'C:\Python34\python.exe' - TOXENV: py34 - GENERATOR: 'Visual Studio 10 Win64' PYTHON: 'C:\Python34-x64\python.exe' - TOXENV: py34 - GENERATOR: 'Visual Studio 14' PYTHON: 'C:\Python35\python.exe' - TOXENV: py35 - GENERATOR: 'Visual Studio 14 Win64' PYTHON: 'C:\Python35-x64\python.exe' - TOXENV: py35 - GENERATOR: 'Visual Studio 14' PYTHON: 'C:\Python36\python.exe' - TOXENV: py36 - GENERATOR: 'Visual Studio 14 Win64' PYTHON: 'C:\Python36-x64\python.exe' - TOXENV: py36 - GENERATOR: 'Visual Studio 14' PYTHON: 'C:\Python37\python.exe' - TOXENV: py37 - GENERATOR: 'Visual Studio 14 Win64' PYTHON: 'C:\Python37-x64\python.exe' - TOXENV: py37 + +matrix: + fast_finish: true init: -- cmd: '%PYTHON% -m pip install -U wheel tox' +- cmd: | + "%PYTHON%" -m pip install -U pip + "%PYTHON%" -m pip install -U wheel pytest build_script: +# Clone, build and install libgit2 - cmd: | - set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\build\libgit2 + set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\venv git clone --depth=1 -b maint/v0.28 https://github.com/libgit2/libgit2.git libgit2 - mkdir build - - cd build - cmake -DSTDCALL=OFF -DBUILD_CLAR=OFF -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" ../libgit2 -G "%GENERATOR%" - cmake --build . --config Release --target install + cd libgit2 + cmake . -DBUILD_CLAR=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" -G "%GENERATOR%" + cmake --build . --target install cd .. - IF "%GENERATOR%"=="Visual Studio 10 Win64" ( call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" ) - - "%PYTHON%" setup.py bdist_wheel + +# Build and install pygit2 +# Rename pygit2 folder, so when testing it picks the installed one +- cmd: | + "%PYTHON%" setup.py bdist_wheel + cd dist + "%PYTHON%" -m pip install --find-links=. pygit2 + cd .. + mv pygit2 pygit2.bak test_script: - ps: | - $env:LIBGIT2 = ($Env:APPVEYOR_BUILD_FOLDER + "\build\libgit2") - &$env:PYTHON -m tox - + &$env:PYTHON -m pytest test --junitxml=testresults.xml + if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } - + # upload results to AppVeyor $wc = New-Object 'System.Net.WebClient' - $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path ".\junit-$env:TOXENV.xml")) + $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path ".\testresults.xml")) artifacts: - path: dist\*.whl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/docs/conf.py new/pygit2-0.28.2/docs/conf.py --- old/pygit2-0.28.1/docs/conf.py 2019-04-19 10:12:04.000000000 +0200 +++ new/pygit2-0.28.2/docs/conf.py 2019-05-26 10:46:24.000000000 +0200 @@ -52,7 +52,7 @@ # The short X.Y version. version = '0.28' # The full version, including alpha/beta/rc tags. -release = '0.28.1' +release = '0.28.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/docs/development.rst new/pygit2-0.28.2/docs/development.rst --- old/pygit2-0.28.1/docs/development.rst 2018-09-30 15:43:42.000000000 +0200 +++ new/pygit2-0.28.2/docs/development.rst 2019-04-19 17:07:37.000000000 +0200 @@ -15,6 +15,7 @@ $ git clone git://github.com/libgit2/pygit2.git $ cd pygit2 + $ python setup.py build_ext --inplace $ pytest test Coding style: documentation strings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/docs/install.rst new/pygit2-0.28.2/docs/install.rst --- old/pygit2-0.28.1/docs/install.rst 2019-04-19 10:12:58.000000000 +0200 +++ new/pygit2-0.28.2/docs/install.rst 2019-05-26 10:56:29.000000000 +0200 @@ -44,11 +44,6 @@ - cffi 1.0+ - six -.. warning:: - - cffi requires pycparser, but versions 2.18 and 2.19 of pycparser do not - work, see https://github.com/libgit2/pygit2/issues/846 for details. - Libgit2 **v0.28.x** (see the version numbering section below for details). Binary wheels already include libgit2, so you only need to worry about this if you install the source package @@ -81,9 +76,9 @@ compatible releases: +-----------+--------+--------+--------+--------+--------+ -|**libgit2**| 0.28.1 | 0.27.8 | 0.26.8 | 0.25.1 | 0.24.6 | +|**libgit2**| 0.28.2 | 0.27.8 | 0.26.8 | 0.25.1 | 0.24.6 | +-----------+--------+--------+--------+--------+--------+ -|**pygit2** | 0.28.1 | 0.27.4 | 0.26.4 | 0.25.1 | 0.24.2 | +|**pygit2** | 0.28.2 | 0.27.4 | 0.26.4 | 0.25.1 | 0.24.2 | +-----------+--------+--------+--------+--------+--------+ .. warning:: @@ -104,9 +99,9 @@ .. code-block:: sh - $ wget https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz - $ tar xzf v0.28.1.tar.gz - $ cd libgit2-0.28.1/ + $ wget https://github.com/libgit2/libgit2/archive/v0.28.2.tar.gz + $ tar xzf v0.28.2.tar.gz + $ cd libgit2-0.28.2/ $ cmake . $ make $ sudo make install @@ -188,9 +183,9 @@ .. code-block:: sh - $ wget https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz - $ tar xzf v0.28.1.tar.gz - $ cd libgit2-0.28.1/ + $ wget https://github.com/libgit2/libgit2/archive/v0.28.2.tar.gz + $ tar xzf v0.28.2.tar.gz + $ cd libgit2-0.28.2/ $ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2 $ make $ make install @@ -241,17 +236,16 @@ pip install pygit2 -For development it is also possible to build `pygit2` with `libgit2` -from sources. `libgit2` location is specified by the ``LIBGIT2`` -environment variable. `libgit2` should be built in "__cdecl" mode. -The following recipe shows you how to do it from a bash shell: +For development it is also possible to build `pygit2` with `libgit2` from +sources. `libgit2` location is specified by the ``LIBGIT2`` environment +variable. The following recipe shows you how to do it from a bash shell: .. code-block:: sh $ export LIBGIT2=C:/Dev/libgit2 $ git clone --depth=1 -b maint/v0.26 https://github.com/libgit2/libgit2.git $ cd libgit2 - $ cmake . -DSTDCALL=OFF -DCMAKE_INSTALL_PREFIX=$LIBGIT2 -G "Visual Studio 9 2008" + $ cmake . -DCMAKE_INSTALL_PREFIX=$LIBGIT2 -G "Visual Studio 14 Win64" $ cmake --build . --config release --target install $ ctest -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/pygit2/_build.py new/pygit2-0.28.2/pygit2/_build.py --- old/pygit2-0.28.1/pygit2/_build.py 2019-04-19 10:11:53.000000000 +0200 +++ new/pygit2-0.28.2/pygit2/_build.py 2019-05-26 10:48:24.000000000 +0200 @@ -37,7 +37,7 @@ # # The version number of pygit2 # -__version__ = '0.28.1' +__version__ = '0.28.2' # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/pygit2/ffi.py new/pygit2-0.28.2/pygit2/ffi.py --- old/pygit2-0.28.1/pygit2/ffi.py 2019-03-03 15:59:08.000000000 +0100 +++ new/pygit2-0.28.2/pygit2/ffi.py 2019-04-19 17:14:56.000000000 +0200 @@ -29,8 +29,4 @@ from __future__ import absolute_import # Import from pygit2 -try: - from ._libgit2 import ffi, lib as C -except ImportError: - from ._run import ffi, preamble, C_KEYWORDS - C = ffi.verify(preamble, **C_KEYWORDS) +from ._libgit2 import ffi, lib as C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/pygit2/repository.py new/pygit2-0.28.2/pygit2/repository.py --- old/pygit2-0.28.1/pygit2/repository.py 2019-04-10 19:55:45.000000000 +0200 +++ new/pygit2-0.28.2/pygit2/repository.py 2019-05-25 11:58:28.000000000 +0200 @@ -46,6 +46,7 @@ from _pygit2 import GIT_CHECKOUT_SAFE, GIT_CHECKOUT_RECREATE_MISSING, GIT_DIFF_NORMAL from _pygit2 import GIT_FILEMODE_LINK from _pygit2 import GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE, GIT_BRANCH_ALL +from _pygit2 import GIT_REF_SYMBOLIC from _pygit2 import Reference, Tree, Commit, Blob from .config import Config @@ -1188,8 +1189,14 @@ self[name].delete() def _valid(self, branch): - return (self._commit is None or branch.target == self._commit or - self._repository.descendant_of(branch.target, self._commit)) + if branch.type == GIT_REF_SYMBOLIC: + branch = branch.resolve() + + return ( + self._commit is None + or branch.target == self._commit + or self._repository.descendant_of(branch.target, self._commit) + ) def with_commit(self, commit): assert self._commit is None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/setup.py new/pygit2-0.28.2/setup.py --- old/pygit2-0.28.1/setup.py 2019-04-19 10:14:44.000000000 +0200 +++ new/pygit2-0.28.2/setup.py 2019-04-19 20:18:21.000000000 +0200 @@ -131,15 +131,11 @@ if os.name == 'nt': cmdclass['build'] = BuildWithDLLs -extra_args = { - 'cffi_modules': ['pygit2/_run.py:ffi'], - 'ext_modules': [ - Extension('_pygit2', pygit2_exts, libraries=['git2'], - include_dirs=[libgit2_include], - library_dirs=[libgit2_lib]), - # FFI is added in the build step - ], -} +ext_modules = [ + Extension('_pygit2', pygit2_exts, libraries=['git2'], + include_dirs=[libgit2_include], + library_dirs=[libgit2_lib]), +] setup(name='pygit2', description='Python bindings for libgit2.', @@ -157,4 +153,6 @@ install_requires=['cffi', 'six'], zip_safe=False, cmdclass=cmdclass, - **extra_args) + cffi_modules=['pygit2/_run.py:ffi'], + ext_modules=ext_modules, +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/src/diff.c new/pygit2-0.28.2/src/diff.c --- old/pygit2-0.28.1/src/diff.c 2019-03-03 15:58:16.000000000 +0100 +++ new/pygit2-0.28.2/src/diff.c 2019-05-14 19:52:31.000000000 +0200 @@ -169,8 +169,7 @@ DiffFile_dealloc(DiffFile *self) { Py_CLEAR(self->id); - if (self->path) - free(self->path); + free(self->path); PyObject_Del(self); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/src/reference.c new/pygit2-0.28.2/src/reference.c --- old/pygit2-0.28.1/src/reference.c 2019-03-03 15:58:16.000000000 +0100 +++ new/pygit2-0.28.2/src/reference.c 2019-05-25 11:59:23.000000000 +0200 @@ -54,6 +54,7 @@ RefLogIter_iternext(RefLogIter *self) { const git_reflog_entry *entry; + const char * entry_message; RefLogEntry *py_entry; int err; @@ -63,7 +64,8 @@ py_entry->oid_old = git_oid_to_python(git_reflog_entry_id_old(entry)); py_entry->oid_new = git_oid_to_python(git_reflog_entry_id_new(entry)); - py_entry->message = strdup(git_reflog_entry_message(entry)); + entry_message = git_reflog_entry_message(entry); + py_entry->message = (entry_message != NULL) ? strdup(entry_message) : NULL; err = git_signature_dup(&py_entry->signature, git_reflog_entry_committer(entry)); if (err < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/test/test_blob.py new/pygit2-0.28.2/test/test_blob.py --- old/pygit2-0.28.1/test/test_blob.py 2019-03-30 19:59:29.000000000 +0100 +++ new/pygit2-0.28.2/test/test_blob.py 2019-05-14 19:52:31.000000000 +0200 @@ -46,7 +46,7 @@ BLOB_NEW_CONTENT = b'foo bar\n' BLOB_FILE_CONTENT = b'bye world\n' -BLOB_PATCH = """diff --git a/file b/file +BLOB_PATCH = r"""diff --git a/file b/file index a520c24..95d09f2 100644 --- a/file +++ b/file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/test/test_repository.py new/pygit2-0.28.2/test/test_repository.py --- old/pygit2-0.28.1/test/test_repository.py 2019-03-19 08:25:44.000000000 +0100 +++ new/pygit2-0.28.2/test/test_repository.py 2019-05-19 16:27:40.000000000 +0200 @@ -477,7 +477,8 @@ assert revert_diff_stats.files_changed == commit_diff_stats.files_changed def test_diff_patch(self): - new_content = 'bye world\nadiós\nau revoir monde\n' + new_content = ['bye world', 'adiós', 'au revoir monde'] + new_content = ''.join(x + os.linesep for x in new_content) # create the patch with open(os.path.join(self.repo.workdir, 'hello.txt'), 'wb') as f: @@ -751,4 +752,4 @@ assert worktree_ref.is_checked_out() == False # The branch still exists - assert branch_name in self.repo.branches \ No newline at end of file + assert branch_name in self.repo.branches diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygit2-0.28.1/travis/build-manylinux1-wheels.sh new/pygit2-0.28.2/travis/build-manylinux1-wheels.sh --- old/pygit2-0.28.1/travis/build-manylinux1-wheels.sh 2019-03-02 08:55:49.000000000 +0100 +++ new/pygit2-0.28.2/travis/build-manylinux1-wheels.sh 2019-05-25 10:06:04.000000000 +0200 @@ -115,7 +115,7 @@ >&2 echo downloading source of zlib v${ZLIB_VERSION}: >&2 echo ============================================ >&2 echo -curl http://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz | \ +curl https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz | \ tar xzvC "${BUILD_DIR}" -f - pushd "${ZLIB_DOWNLOAD_DIR}"
