Hello community, here is the log from the commit of package python-discid for openSUSE:Factory checked in at 2017-10-11 22:56:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-discid (Old) and /work/SRC/openSUSE:Factory/.python-discid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-discid" Wed Oct 11 22:56:55 2017 rev:4 rq:531773 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-discid/python-discid.changes 2016-08-03 11:42:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-discid.new/python-discid.changes 2017-10-11 22:56:57.932443493 +0200 @@ -1,0 +2,21 @@ +Thu Oct 5 14:08:27 UTC 2017 - toddrme2...@gmail.com + +- Update to version 1.1.1 + * workaround :issue:`43` for py2app problems + * :issue:`41` improve windows example +- Run tests +- Fix shebang in examples + +------------------------------------------------------------------- +Thu Oct 5 00:09:30 UTC 2017 - avvi...@yandex.by + +- Add pkgconfig(libdiscid) (build cross distribution) +- Use readlink when searching for package (build cross distribution) +- Spec file cleanup + +------------------------------------------------------------------- +Thu Aug 24 13:36:08 UTC 2017 - jmate...@suse.com + +- singlespec auto-conversion + +------------------------------------------------------------------- @@ -88,0 +110 @@ + Old: ---- discid-1.1.0.tar.gz New: ---- discid-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-discid.spec ++++++ --- /var/tmp/diff_new_pack.gAwXG1/_old 2017-10-11 22:56:58.540416830 +0200 +++ /var/tmp/diff_new_pack.gAwXG1/_new 2017-10-11 22:56:58.548416479 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-discid # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Johannes Dewender <nov...@jonnyjd.net> # # All modifications and additions to the file contributed by third parties @@ -16,25 +16,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# Test requires CD device +%bcond_with test -# -%define modname discid - -Name: python-%{modname} -Version: 1.1.0 +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +Name: python-discid +Version: 1.1.1 Release: 0 Summary: Python binding of Libdiscid License: LGPL-3.0+ Group: Development/Libraries/Python Url: https://python-discid.readthedocs.org/ -Source: https://pypi.python.org/packages/source/d/%{modname}/%{modname}-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/d/discid/discid-%{version}.tar.gz +BuildRequires: %{python_module devel >= 2.6} +BuildRequires: fdupes +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libdiscid) >= 0.2.2 +BuildRequires: python-rpm-macros # no automatic requires since libdiscid is not linked -Requires: libdiscid0 >= 0.2.2 -BuildRequires: libdiscid0 >= 0.2.2 -BuildRequires: python-devel >= 2.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %(rpm -qf $(readlink -qne %{_libdir}/libdiscid.so) --qf '%{NAME} >= %{VERSION}') BuildArch: noarch +%python_subpackages + %description Python-discid implements Python bindings for MusicBrainz Libdiscid. @@ -52,17 +56,24 @@ %prep %setup -q -n discid-%{version} +sed -i "s|^#!/usr/bin/env python$|#!%{__python3}|" examples.py %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -chmod a-x examples.py +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + +%if %{with test} +%check +%python_exec test_discid.py +%endif -%files -f INSTALLED_FILES +%files %{python_files} %defattr(-,root,root) -%dir %{python_sitelib}/* -%doc COPYING COPYING.LESSER CHANGES.rst examples.py +%doc COPYING COPYING.LESSER CHANGES.rst README.rst examples.py +%{python_sitelib}/discid/ +%{python_sitelib}/discid-%{version}-py*.egg-info %changelog ++++++ discid-1.1.0.tar.gz -> discid-1.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/CHANGES.rst new/discid-1.1.1/CHANGES.rst --- old/discid-1.1.0/CHANGES.rst 2013-10-09 22:19:51.000000000 +0200 +++ new/discid-1.1.1/CHANGES.rst 2017-01-29 12:17:13.000000000 +0100 @@ -1,6 +1,11 @@ Changelog ========= +Changes in 1.1.1 (2017-01-29): +------------------------------ + * workaround :issue:`43` for py2app problems + * :issue:`41` improve windows example + Changes in 1.1.0 (2013-10-09): ------------------------------ * feature :issue:`36` add :attr:`Disc.toc_string` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/PKG-INFO new/discid-1.1.1/PKG-INFO --- old/discid-1.1.0/PKG-INFO 2013-10-09 22:23:50.000000000 +0200 +++ new/discid-1.1.1/PKG-INFO 2017-01-29 13:05:34.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: discid -Version: 1.1.0 +Version: 1.1.1 Summary: Python binding of Libdiscid Home-page: https://python-discid.readthedocs.org/ Author: Johannes Dewender @@ -34,12 +34,12 @@ Usage ~~~~~ - :: + .. code:: python # this will load Libdiscid import discid - disc = discid.read("/dev/cdrom") + disc = discid.read() # use default device print "id: %s" % disc.id # Python 2 print("id: %s" % disc.id) # Python 3 @@ -70,5 +70,6 @@ Classifier: Programming Language :: Python :: 3.1 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 Classifier: Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping Classifier: Topic :: Software Development :: Libraries :: Python Modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/README.rst new/discid-1.1.1/README.rst --- old/discid-1.1.0/README.rst 2013-06-25 19:02:20.000000000 +0200 +++ new/discid-1.1.1/README.rst 2015-06-04 16:18:19.000000000 +0200 @@ -26,12 +26,12 @@ Usage ~~~~~ -:: +.. code:: python # this will load Libdiscid import discid - disc = discid.read("/dev/cdrom") + disc = discid.read() # use default device print "id: %s" % disc.id # Python 2 print("id: %s" % disc.id) # Python 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/discid/__init__.py new/discid-1.1.1/discid/__init__.py --- old/discid-1.1.0/discid/__init__.py 2013-10-09 22:19:29.000000000 +0200 +++ new/discid-1.1.1/discid/__init__.py 2017-01-29 12:18:54.000000000 +0100 @@ -33,7 +33,7 @@ import discid.libdiscid import discid.disc -__version__ = "1.1.0" +__version__ = "1.1.1" # these contants are defined here so sphinx can catch the "docstrings" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/discid/disc.py new/discid-1.1.1/discid/disc.py --- old/discid-1.1.0/discid/disc.py 2013-10-07 23:49:53.000000000 +0200 +++ new/discid-1.1.1/discid/disc.py 2013-12-03 13:44:06.000000000 +0100 @@ -26,7 +26,7 @@ from discid.track import Track -# our implemented of libdiscid's enum discid_feature +# our implementation of libdiscid's enum discid_feature _FEATURE_MAPPING = {"read": 1 << 0, "mcn": 1 << 1, "isrc": 1 << 2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/discid/libdiscid.py new/discid-1.1.1/discid/libdiscid.py --- old/discid-1.1.0/discid/libdiscid.py 2013-06-25 18:06:54.000000000 +0200 +++ new/discid-1.1.1/discid/libdiscid.py 2017-01-29 12:00:02.000000000 +0100 @@ -40,6 +40,12 @@ lib_file = None + # This seems to be necessary in a bundle/dmg + if sys.platform == "darwin": + lib_name = '../Frameworks/lib%s.%d.dylib' % (name, version) + if os.path.isfile(lib_name): + lib_file = lib_name + # force prefer current folder # for linux/UNIX-like and Windows if sys.platform in ["darwin", "cygwin"]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/doc/api.rst new/discid-1.1.1/doc/api.rst --- old/discid-1.1.0/doc/api.rst 2013-10-07 23:47:48.000000000 +0200 +++ new/discid-1.1.1/doc/api.rst 2013-10-10 12:13:43.000000000 +0200 @@ -34,6 +34,9 @@ .. autoattribute:: freedb_id .. autoattribute:: submission_url .. autoattribute:: toc_string + + .. versionadded:: 1.1 + .. autoattribute:: first_track_num .. autoattribute:: last_track_num .. autoattribute:: sectors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/doc/conf.py new/discid-1.1.1/doc/conf.py --- old/discid-1.1.0/doc/conf.py 2013-10-09 19:13:49.000000000 +0200 +++ new/discid-1.1.1/doc/conf.py 2015-06-12 01:08:45.000000000 +0200 @@ -21,8 +21,7 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.coverage', - 'sphinx.ext.extlinks', 'sphinx.ext.intersphinx', - 'ext.data_doc' + 'sphinx.ext.extlinks', 'sphinx.ext.intersphinx' ] source_suffix = '.rst' master_doc = 'index' @@ -56,7 +55,7 @@ 'python': ('http://python.readthedocs.org/en/latest/', None), 'python2': ('http://python.readthedocs.org/en/v2.7.2/', None), 'musicbrainzngs': - ('http://python-musicbrainz-ngs.readthedocs.org/en/latest/', None), + ('http://python-musicbrainzngs.readthedocs.org/en/latest/', None), } rst_prolog = """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/doc/ext/data_doc.py new/discid-1.1.1/doc/ext/data_doc.py --- old/discid-1.1.0/doc/ext/data_doc.py 2013-03-11 14:57:48.000000000 +0100 +++ new/discid-1.1.1/doc/ext/data_doc.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -from sphinx.ext import autodoc -from sphinx.util.inspect import safe_repr - -def setup(app): - app.add_autodocumenter(DataDocumenter) - -class DataDocumenter(autodoc.DataDocumenter): - """ - Specialized Documenter subclass for data items. - These can have a :novalue: option. - """ - option_spec = {"noindex": autodoc.bool_option, - "annotation": autodoc.bool_option} - - def add_directive_header(self, sig): - autodoc.ModuleLevelDocumenter.add_directive_header(self, sig) - if not "annotation" in self.options: - try: - objrepr = safe_repr(self.object) - except ValueError: - pass - else: - self.add_line(u' :annotation: = ' + objrepr, '<autodoc>') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/doc/index.rst new/discid-1.1.1/doc/index.rst --- old/discid-1.1.0/doc/index.rst 2013-06-27 16:12:25.000000000 +0200 +++ new/discid-1.1.1/doc/index.rst 2013-11-07 18:10:18.000000000 +0100 @@ -15,7 +15,7 @@ the code repository and the bug tracker are at GitHub_. If you are interested in a binding for the MusicBrainz Web Service, -you might be interested in `python-musicbrainz-ngs`_. +you might be interested in `python-musicbrainzngs`_. Contents -------- @@ -39,7 +39,7 @@ `Python-discid` doesn't need compilation, as it uses :mod:`ctypes`. If you want to use the disc ID created by `python-discid` to query -MusicBrainz for metatdata, then you should use `python-musicbrainz-ngs`_. +MusicBrainz for metatdata, then you should use `python-musicbrainzngs`_. See :ref:`fetching_metadata` for using `discid` and `musicbrainzngs` together. Indices and tables @@ -49,5 +49,5 @@ .. _GitHub: https://github.com/JonnyJD/python-discid .. _MusicBrainz: http://musicbrainz.org -.. _python-musicbrainz-ngs: https://readthedocs.org/docs/python-musicbrainz-ngs/ +.. _python-musicbrainzngs: https://python-musicbrainzngs.readthedocs.org/ .. _python-libdiscid: http://pythonhosted.org/python-libdiscid/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/doc/usage.rst new/discid-1.1.1/doc/usage.rst --- old/discid-1.1.0/doc/usage.rst 2013-06-25 03:33:02.000000000 +0200 +++ new/discid-1.1.1/doc/usage.rst 2013-11-07 18:09:53.000000000 +0100 @@ -68,7 +68,7 @@ Fetching Metadata ----------------- -You can use `python-musicbrainz-ngs`_ to fetch metadata for your disc. +You can use `python-musicbrainzngs`_ to fetch metadata for your disc. The relevant function is :func:`musicbrainzngs.get_releases_by_discid`:: import discid @@ -97,4 +97,4 @@ .. note:: Please submit your disc ID with :attr:`Disc.submission_url` when it isn't found at the MusicBrainz server. -.. _python-musicbrainz-ngs: https://readthedocs.org/docs/python-musicbrainz-ngs/ +.. _python-musicbrainzngs: https://python-musicbrainzngs.readthedocs.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/examples.py new/discid-1.1.1/examples.py --- old/discid-1.1.0/examples.py 2013-06-25 03:33:02.000000000 +0200 +++ new/discid-1.1.1/examples.py 2013-10-31 22:41:36.000000000 +0100 @@ -23,7 +23,9 @@ m=(seconds // 60), s=(seconds % 60), sectors=sectors) def complex_example(): - disc = discid.read("/dev/cdrom", ["mcn", "isrc"]) + device_name = discid.get_default_device() + disc = discid.read(device_name, ["mcn", "isrc"]) + print("device:\t%s" % device_name) print("id:\t%s" % disc.id) print("MCN:\t%s" % disc.mcn) print("length:\t%s" % _length_str(disc.seconds, disc.sectors)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/discid-1.1.0/setup.py new/discid-1.1.1/setup.py --- old/discid-1.1.0/setup.py 2013-10-07 23:45:57.000000000 +0200 +++ new/discid-1.1.1/setup.py 2014-10-27 14:29:23.000000000 +0100 @@ -42,11 +42,13 @@ else: sys.exit(len(result.failures) + len(result.errors)) +with open("README.rst") as readme: + long_description = readme.read() setup(name="discid", version=__version__, description="Python binding of Libdiscid", - long_description=open("README.rst").read(), + long_description=long_description, author="Johannes Dewender", author_email="bra...@jonnyjd.net", url="https://python-discid.readthedocs.org/";, @@ -64,6 +66,7 @@ "Programming Language :: Python :: 3.1", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping", "Topic :: Software Development :: Libraries :: Python Modules" ]
