Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-patiencediff for openSUSE:Factory checked in at 2022-03-26 22:31:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-patiencediff (Old) and /work/SRC/openSUSE:Factory/.python-patiencediff.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-patiencediff" Sat Mar 26 22:31:33 2022 rev:2 rq:965036 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-patiencediff/python-patiencediff.changes 2020-06-11 10:17:16.141578921 +0200 +++ /work/SRC/openSUSE:Factory/.python-patiencediff.new.1900/python-patiencediff.changes 2022-03-26 22:31:56.326025336 +0100 @@ -1,0 +2,6 @@ +Sat Mar 26 14:25:57 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 0.2.2: + * fix license declaration + +------------------------------------------------------------------- Old: ---- patiencediff-0.2.0.tar.gz New: ---- patiencediff-0.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-patiencediff.spec ++++++ --- /var/tmp/diff_new_pack.ul7kxK/_old 2022-03-26 22:31:56.902026124 +0100 +++ /var/tmp/diff_new_pack.ul7kxK/_new 2022-03-26 22:31:56.906026129 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-patiencediff # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-patiencediff -Version: 0.2.0 +Version: 0.2.2 Release: 0 Summary: Python implementation of the patiencediff algorithm License: GPL-2.0-or-later @@ -26,8 +26,8 @@ URL: https://www.breezy-vcs.org/ Source: https://files.pythonhosted.org/packages/source/p/patiencediff/patiencediff-%{version}.tar.gz BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros %python_subpackages ++++++ patiencediff-0.2.0.tar.gz -> patiencediff-0.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/.github/workflows/pythonpublish.yml new/patiencediff-0.2.2/.github/workflows/pythonpublish.yml --- old/patiencediff-0.2.0/.github/workflows/pythonpublish.yml 2020-06-01 23:19:36.000000000 +0200 +++ new/patiencediff-0.2.2/.github/workflows/pythonpublish.yml 2021-03-26 01:19:51.000000000 +0100 @@ -38,9 +38,14 @@ - name: Build run: | python setup.py sdist bdist_wheel - mkdir wheelhouse - mv dist/*.whl wheelhouse if: "matrix.os != 'ubuntu-latest'" + - uses: docker/setup-qemu-action@v1 + name: Set up QEMU + if: "matrix.os == 'ubuntu-latest'" + - name: Build and publish (Linux aarch64) + uses: RalfG/python-wheels-manylinux-build@v0.3.3-manylinux2014_aarch64 + with: + python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' - name: Build and publish (Linux) uses: RalfG/python-wheels-manylinux-build@v0.2.2 if: "matrix.os == 'ubuntu-latest'" @@ -49,12 +54,14 @@ TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - twine upload wheelhouse/*manylinux* + # Only include *manylinux* wheels; the other wheels files are built but + # rejected by pip. + twine upload dist/*manylinux*.whl if: "matrix.os == 'ubuntu-latest'" - name: Publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - twine upload wheelhouse/* + twine upload dist/*.whl if: "matrix.os != 'ubuntu-latest'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/.gitignore new/patiencediff-0.2.2/.gitignore --- old/patiencediff-0.2.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/patiencediff-0.2.2/.gitignore 2021-03-26 01:19:51.000000000 +0100 @@ -0,0 +1,7 @@ +dist +build +__pycache__ +*~ +*.so +*.pyc +patiencediff.egg-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/.travis.yml new/patiencediff-0.2.2/.travis.yml --- old/patiencediff-0.2.0/.travis.yml 2020-05-23 04:47:36.000000000 +0200 +++ new/patiencediff-0.2.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -language: python -sudo: false -cache: pip -python: -- 2.7 -- 3.4 -- 3.5 -- 3.5-dev -- 3.6 -- 3.6-dev -# Builds on pypy with C extension fail for some reason: -# - pypy -- pypy3.5 -env: -- PYTHONHASHSEED=random - PURE=false -matrix: - include: - - python: 3.6 - env: PURE=true - - python: 2.7 - env: PURE=true - - python: pypy3.5 - env: PURE=true - - python: pypy - env: PURE=true -install: -- travis_retry pip install -U pip setuptools -script: -- if [ $PURE = false ]; then python setup.py build_ext -i; fi -- python -m unittest patiencediff.test_patiencediff -- if [ $PURE = true ]; then SETUP_ARGS=--pure; fi -- python setup.py $SETUP_ARGS bdist_wheel -deploy: - provider: pypi - user: breezy-bot - password: - secure: Oe3m50K6LIgjBSTS/tJMW5D7BCMVjbkVS4z78igaldM+Tcy/F5ZxjwOJ/xvLXovf+B2BAP7O+tRqlJ6lax2gE/AWVy47aW/JMZYTgdihUDNGyZ1PqzYVaBAsTlJ1UYDSxpm7PkWqTA1MC0IXuTpV6O3x2XbuSvNlBGoNovFCY1T+blGl9xayo+mlt7kZ5NwJZsP7T2b3mkhtUHIoh13fAZFygit+DooFydnl1RWf33XksW7mdn3hJkvMKqXgYNIGrZTTNzFrBIBCCO30WRrFuk/8qddE5WYfQ7KfLIVEYionUSIZKIvF3B1W9lXz5HW5K7ifjpku6GD4g7lOUtAwU/jaKq+/kPC/4gMuuzr9kRYTaAZtdrvCrWuS3DLvsNDdfpNFcvD4OHVmKgCCZIvIMwDYk6Swa2Nrbnb/btKUpa029Nn+k4E483p7zEZTQBZxQkkUj83Sanp469IbRCzsIy6cUu1Q/R/uNKfDiWR3TtQeQHAIju1PCvR9rmB2vhFJMytzVT5koHQnchhx7R+LYaPbweAVwdUK5BPxdOiheSiBKiNXj4otlZnT7hBPBrqIDqUZKIPDwU0XQjPjHXaYwWbitVJXLopONHZGqSa6QYlAxXw/EDfaOR2eqN3g/DZ3UYF54GuPVJIyjJIt6v6Mwkm6j+jVfCVTNUnzEmfWvCg= - skip_cleanup: true - skip_existing: true - file_glob: true - file: - - dist/patiencediff*.whl - - dist/patiencediff*.tar.gz - on: - tags: true - repo: breezy-team/patiencediff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/PKG-INFO new/patiencediff-0.2.2/PKG-INFO --- old/patiencediff-0.2.0/PKG-INFO 2020-06-01 23:21:10.344981700 +0200 +++ new/patiencediff-0.2.2/PKG-INFO 2021-03-26 01:19:55.503055000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: patiencediff -Version: 0.2.0 +Version: 0.2.2 Summary: Python implementation of the patiencediff algorithm. Home-page: https://www.breezy-vcs.org/ Maintainer: Breezy Developers @@ -9,7 +9,7 @@ Description: This package contains the implementation of the ``patiencediff`` algorithm, as `first described <https://bramcohen.livejournal.com/73318.html>`_ by Bram Cohen. - Like Python's ``difflib``, this module provides both a convience ``unified_diff`` + Like Python's ``difflib``, this module provides both a convenience ``unified_diff`` function for the generation of unified diffs of text files as well as a SequenceMatcher that can be used on arbitrary lists. @@ -51,7 +51,7 @@ Platform: UNKNOWN Classifier: Development Status :: 4 - Beta -Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) +Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/README.rst new/patiencediff-0.2.2/README.rst --- old/patiencediff-0.2.0/README.rst 2020-05-23 04:47:36.000000000 +0200 +++ new/patiencediff-0.2.2/README.rst 2021-03-26 01:19:51.000000000 +0100 @@ -1,7 +1,7 @@ This package contains the implementation of the ``patiencediff`` algorithm, as `first described <https://bramcohen.livejournal.com/73318.html>`_ by Bram Cohen. -Like Python's ``difflib``, this module provides both a convience ``unified_diff`` +Like Python's ``difflib``, this module provides both a convenience ``unified_diff`` function for the generation of unified diffs of text files as well as a SequenceMatcher that can be used on arbitrary lists. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/appveyor.yml new/patiencediff-0.2.2/appveyor.yml --- old/patiencediff-0.2.0/appveyor.yml 2020-05-23 04:47:36.000000000 +0200 +++ new/patiencediff-0.2.2/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -environment: - - TWINE_USERNAME: "breezy-bot" - TWINE_PASSWORD: - # See https://www.appveyor.com/docs/build-configuration/#secure-variables - secure: Y7sAxfNInbecxBmDW4DIMw== - - matrix: - - - PYTHON: "C:\\Python27" - PYTHON_VERSION: "2.7.x" - PYTHON_ARCH: "32" - - - PYTHON: "C:\\Python27-x64" - PYTHON_VERSION: "2.7.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python35" - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "32" - - - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "64" - - - PYTHON: "C:\\Python36" - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "32" - - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6.x" - PYTHON_ARCH: "64" - -install: - # If there is a newer build queued for the same PR, cancel this one. - # The AppVeyor 'rollout builds' option is supposed to serve the same - # purpose but it is problematic because it tends to cancel builds pushed - # directly to master instead of just PR builds (or the converse). - # credits: JuliaLang developers. - - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } - - ECHO "Filesystem root:" - - ps: "ls \"C:/\"" - - - ECHO "Installed SDKs:" - - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" - - # Install Python (from the official .msi of http://python.org) and pip when - # not already installed. - - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 } - - # Prepend newly installed Python to the PATH of this build (this cannot be - # done from inside the powershell script as it would require to restart - # the parent CMD process). - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - # Check that we have the expected version and architecture for Python - - "build.cmd %PYTHON%\\python.exe --version" - - "build.cmd %PYTHON%\\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\"" - - # Install setuptools/wheel so that we can e.g. use bdist_wheel - - "pip install setuptools wheel" - - - "build.cmd %PYTHON%\\python.exe setup.py develop" - -build_script: - # Build the compiled extension - - "build.cmd %PYTHON%\\python.exe setup.py build" - -test_script: - - "build.cmd %PYTHON%\\python.exe setup.py test" - - "build.cmd %PYTHON%\\pythonw.exe setup.py test" - -after_test: - - "build.cmd %PYTHON%\\python.exe setup.py bdist_wheel" - # http://stackoverflow.com/questions/43255455/unicode-character-causing-error-with-bdist-wininst-on-python-3-but-not-python-2 - # - "python setup.py bdist_wininst" - - "build.cmd %PYTHON%\\python.exe setup.py bdist_msi" - - ps: "ls dist" - -deploy_script: - - if "%APPVEYOR_REPO_TAG%"=="true" pip install twine - - if "%APPVEYOR_REPO_TAG%"=="true" twine upload dist\patiencediff-*.whl - -artifacts: - - path: dist\* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/patiencediff/__init__.py new/patiencediff-0.2.2/patiencediff/__init__.py --- old/patiencediff-0.2.0/patiencediff/__init__.py 2020-06-01 23:20:48.000000000 +0200 +++ new/patiencediff-0.2.2/patiencediff/__init__.py 2021-03-26 01:19:53.000000000 +0100 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (C) 2005, 2006, 2007 Canonical Ltd # # This program is free software; you can redistribute it and/or modify @@ -25,7 +24,7 @@ __all__ = ['PatienceSequenceMatcher', 'unified_diff', 'unified_diff_files'] -__version__ = (0, 2, 0) +__version__ = (0, 2, 2) # This is a version of unified_diff which only adds a factory parameter @@ -141,33 +140,3 @@ recurse_matches_py as recurse_matches, PatienceSequenceMatcher_py as PatienceSequenceMatcher ) - - -def main(args): - import optparse - p = optparse.OptionParser(usage='%prog [options] file_a file_b' - '\nFiles can be "-" to read from stdin') - p.add_option('--patience', dest='matcher', action='store_const', - const='patience', default='patience', - help='Use the patience difference algorithm') - p.add_option('--difflib', dest='matcher', action='store_const', - const='difflib', - default='patience', help='Use python\'s difflib algorithm') - - algorithms = { - 'patience': PatienceSequenceMatcher, - 'difflib': difflib.SequenceMatcher} - - (opts, args) = p.parse_args(args) - matcher = algorithms[opts.matcher] - - if len(args) != 2: - print('You must supply 2 filenames to diff') - return -1 - - for line in unified_diff_files(args[0], args[1], sequencematcher=matcher): - sys.stdout.write(line) - - -if __name__ == '__main__': - sys.exit(main(sys.argv[1:])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/patiencediff/__main__.py new/patiencediff-0.2.2/patiencediff/__main__.py --- old/patiencediff-0.2.0/patiencediff/__main__.py 1970-01-01 01:00:00.000000000 +0100 +++ new/patiencediff-0.2.2/patiencediff/__main__.py 2021-03-26 01:19:51.000000000 +0100 @@ -0,0 +1,51 @@ +# Copyright (C) 2005, 2006, 2007 Canonical Ltd +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from __future__ import absolute_import + +import sys +import difflib + +from . import PatienceSequenceMatcher, unified_diff_files + + +def main(args): + import optparse + p = optparse.OptionParser(usage='%prog [options] file_a file_b' + '\nFiles can be "-" to read from stdin') + p.add_option('--patience', dest='matcher', action='store_const', + const='patience', default='patience', + help='Use the patience difference algorithm') + p.add_option('--difflib', dest='matcher', action='store_const', + const='difflib', + default='patience', help='Use python\'s difflib algorithm') + + algorithms = { + 'patience': PatienceSequenceMatcher, + 'difflib': difflib.SequenceMatcher} + + (opts, args) = p.parse_args(args) + matcher = algorithms[opts.matcher] + + if len(args) != 2: + print('You must supply 2 filenames to diff') + return -1 + + for line in unified_diff_files(args[0], args[1], sequencematcher=matcher): + sys.stdout.write(line) + + +sys.exit(main(sys.argv[1:])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/patiencediff/_patiencediff_py.py new/patiencediff-0.2.2/patiencediff/_patiencediff_py.py --- old/patiencediff-0.2.0/patiencediff/_patiencediff_py.py 2020-05-23 05:01:44.000000000 +0200 +++ new/patiencediff-0.2.2/patiencediff/_patiencediff_py.py 2021-03-26 01:19:51.000000000 +0100 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (C) 2005 Bram Cohen, Copyright (C) 2005, 2006 Canonical Ltd # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/patiencediff.egg-info/PKG-INFO new/patiencediff-0.2.2/patiencediff.egg-info/PKG-INFO --- old/patiencediff-0.2.0/patiencediff.egg-info/PKG-INFO 2020-06-01 23:21:10.000000000 +0200 +++ new/patiencediff-0.2.2/patiencediff.egg-info/PKG-INFO 2021-03-26 01:19:55.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: patiencediff -Version: 0.2.0 +Version: 0.2.2 Summary: Python implementation of the patiencediff algorithm. Home-page: https://www.breezy-vcs.org/ Maintainer: Breezy Developers @@ -9,7 +9,7 @@ Description: This package contains the implementation of the ``patiencediff`` algorithm, as `first described <https://bramcohen.livejournal.com/73318.html>`_ by Bram Cohen. - Like Python's ``difflib``, this module provides both a convience ``unified_diff`` + Like Python's ``difflib``, this module provides both a convenience ``unified_diff`` function for the generation of unified diffs of text files as well as a SequenceMatcher that can be used on arbitrary lists. @@ -51,7 +51,7 @@ Platform: UNKNOWN Classifier: Development Status :: 4 - Beta -Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) +Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/patiencediff.egg-info/SOURCES.txt new/patiencediff-0.2.2/patiencediff.egg-info/SOURCES.txt --- old/patiencediff-0.2.0/patiencediff.egg-info/SOURCES.txt 2020-06-01 23:21:10.000000000 +0200 +++ new/patiencediff-0.2.2/patiencediff.egg-info/SOURCES.txt 2021-03-26 01:19:55.000000000 +0100 @@ -1,15 +1,16 @@ .bzrignore -.travis.yml +.gitignore AUTHORS COPYING MANIFEST.in README.rst -appveyor.yml build.cmd +releaser.conf setup.py .github/workflows/pythonpackage.yml .github/workflows/pythonpublish.yml patiencediff/__init__.py +patiencediff/__main__.py patiencediff/_patiencediff_c.c patiencediff/_patiencediff_py.py patiencediff/test_patiencediff.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/releaser.conf new/patiencediff-0.2.2/releaser.conf --- old/patiencediff-0.2.0/releaser.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/patiencediff-0.2.2/releaser.conf 2021-03-26 01:19:51.000000000 +0100 @@ -0,0 +1,14 @@ +name: "patiencediff" +timeout_days: 5 +tag_name: "v$VERSION" +verify_command: "python3 setup.py test" +update_version { + path: "setup.py" + match: "^ version=\"(.*)\"," + new_line: " version=\"$VERSION\"," +} +update_version { + path: "patiencediff/__init__.py" + match: "^__version__ = \((.*)\)$" + new_line: "__version__ = $TUPLED_VERSION" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patiencediff-0.2.0/setup.py new/patiencediff-0.2.2/setup.py --- old/patiencediff-0.2.0/setup.py 2020-06-01 23:20:38.000000000 +0200 +++ new/patiencediff-0.2.2/setup.py 2021-03-26 01:19:53.000000000 +0100 @@ -32,7 +32,7 @@ setup(name="patiencediff", description="Python implementation of the patiencediff algorithm.", long_description=long_description, - version="0.2.0", + version="0.2.2", maintainer="Breezy Developers", maintainer_email="t...@breezy-vcs.org", license="GNU GPLv2 or later", @@ -42,7 +42,8 @@ distclass=Distribution, classifiers=[ 'Development Status :: 4 - Beta', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', # noqa + 'License :: OSI Approved :: ' + 'GNU General Public License v2 or later (GPLv2+)', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6',