Hello community, here is the log from the commit of package translate-toolkit for openSUSE:Factory checked in at 2019-02-06 15:44:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/translate-toolkit (Old) and /work/SRC/openSUSE:Factory/.translate-toolkit.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "translate-toolkit" Wed Feb 6 15:44:28 2019 rev:31 rq:669083 version:2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/translate-toolkit/translate-toolkit.changes 2018-03-24 16:16:07.685879740 +0100 +++ /work/SRC/openSUSE:Factory/.translate-toolkit.new.28833/translate-toolkit.changes 2019-02-06 15:44:29.571365810 +0100 @@ -1,0 +2,32 @@ +Mon Jan 28 12:54:34 UTC 2019 - Jan Engelhardt <[email protected]> + +- Avoid mixing historic and modern option syntax for tar. +- Replace find -exec rm by just find -delete. + +------------------------------------------------------------------- +Mon Jan 28 11:30:50 UTC 2019 - Luiz Fernando Ranghetti <[email protected]> + +- Correct the Source URL + +------------------------------------------------------------------- +Thu Jan 10 13:31:24 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Make sure the documentation is generated properly +- Enable testsuite +- Add patches from debian for tests to pass: + * sphinx-intersphinx.patch + * test-pytest310.patch + * xliff-xsd-no-network.patch + +------------------------------------------------------------------- +Tue Dec 18 19:31:55 CET 2018 - [email protected] + +- Update to 2.3.1: + * But fixes. + * INI: Enabled support for Python3 provided. + * Use backports.csv module on Python 2 to align the behavior + with Python 3 and drop many hacks. + * Removed deprecated getoutput, add new depreceations. + * Code cleanup; many converterters refactored. + +------------------------------------------------------------------- Old: ---- translate-toolkit-2.3.0.tar.gz New: ---- sphinx-intersphinx.patch sphinx-themes.tar.xz test-pytest310.patch translate-toolkit-2.3.1.tar.gz xliff-xsd-no-network.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translate-toolkit.spec ++++++ --- /var/tmp/diff_new_pack.b2lYxP/_old 2019-02-06 15:44:30.319365354 +0100 +++ /var/tmp/diff_new_pack.b2lYxP/_new 2019-02-06 15:44:30.323365352 +0100 @@ -1,7 +1,7 @@ # # spec file for package translate-toolkit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,34 +12,46 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: translate-toolkit -Version: 2.3.0 +Version: 2.3.1 Release: 0 Summary: Tools and API to assist with translation and software localization -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Other -Url: http://toolkit.translatehouse.org/ +URL: http://toolkit.translatehouse.org/ Source: https://github.com/translate/translate/releases/download/%{version}/%{name}-%{version}.tar.gz +# Repacked https://github.com/translate/sphinx-themes ; no commits since 2013 +# Often not included in the release tag so just ship it +Source1: sphinx-themes.tar.xz +Patch0: sphinx-intersphinx.patch +Patch1: test-pytest310.patch +Patch2: xliff-xsd-no-network.patch BuildRequires: fdupes BuildRequires: gettext-runtime +BuildRequires: git-core BuildRequires: iso-codes -# The following are needed for man page and docs generation BuildRequires: python3-Babel BuildRequires: python3-Levenshtein +BuildRequires: python3-PyYAML BuildRequires: python3-Sphinx BuildRequires: python3-beautifulsoup4 -BuildRequires: python3-devel >= 2.7 BuildRequires: python3-iniparse +BuildRequires: python3-l20n BuildRequires: python3-lxml >= 3.5.0 BuildRequires: python3-lxml-doc +BuildRequires: python3-phply +BuildRequires: python3-pycountry BuildRequires: python3-pyenchant BuildRequires: python3-pytest BuildRequires: python3-six +BuildRequires: python3-vobject BuildRequires: python3-xml +BuildRequires: strace +BuildRequires: subversion Requires: gettext-runtime Requires: python3-lxml Requires: python3-pycountry @@ -49,14 +61,16 @@ # The following are for the full experience of translate-toolkit Recommends: gaupol Recommends: iso-codes -Recommends: python3-chardet Recommends: python3-Levenshtein +Recommends: python3-PyYAML Recommends: python3-aeidon +Recommends: python3-chardet Recommends: python3-iniparse -Recommends: python3-PyYAML -Recommends: vobject +Recommends: python3-l20n +Recommends: python3-phply +Recommends: python3-pycountry +Recommends: python3-vobject Provides: python3-translate-toolkit = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -91,7 +105,12 @@ toolkit or to use the libraries in other localization tools. %prep -%setup -n %{name}-%{version} -q +%setup -q -n %{name}-%{version} +%autopatch -p1 + +pushd docs/_themes +tar -xJf %{SOURCE1} --strip 1 +popd sed -i 296"s|'share'|'translate/share'|" setup.py # fix for bnc#750652 - remove Apache-2.0 file - difflib is the fallback solution @@ -100,26 +119,20 @@ sed -i '/diff-match-patch/d' requirements/required.txt # Remove build cache (causes problems with different Sphinx and/or architecture) -rm -rf docs/_build +#rm -rf docs/_build #Fix for shebang errors: for lib in translate/{*.py,*/*.py,*/*/*.py}; do sed -i '\|%{_bindir}/env |d' $lib done -#fix wrong perms -chmod a-x docs/_themes/sphinx-bootstrap/static/font/*.* -#fix line terminators in jquery.js -sed -i 's/\r//' docs/_themes/sphinx-bootstrap/static/jquery.js - %build python3 setup.py build pushd docs # Can't use parallel build here! -make html man -gzip -9 _build/man/*.1 +make -j1 html man #no hidden files -find _build -name '.?*' -exec rm '{}' \+ +find _build -name '.?*' -delete popd %install @@ -138,7 +151,7 @@ ;; esac done -install -m 644 docs/_build/man/*.gz %{buildroot}/%{_mandir}/man1/ +install -m 644 docs/_build/man/* %{buildroot}/%{_mandir}/man1/ # move documentation files to datadir install -d -m 755 %{buildroot}%{_defaultdocdir}/%{name} @@ -151,19 +164,22 @@ # create hardlinks for the rest %fdupes %{buildroot} +%check +export PATH=$PATH:%{buildroot}%{_bindir} +PYTHONPATH=%{buildroot}%{python3_sitelib} py.test + %files -%defattr(-,root,root) %{_defaultdocdir}/%{name}/html/ %exclude %{_defaultdocdir}/%{name}/html/api %exclude %{_defaultdocdir}/%{name}/html/_sources -%doc COPYING README.rst +%license COPYING +%doc README.rst %{_bindir}/* %{_mandir}/man1/* %{python3_sitelib}/translate %{python3_sitelib}/translate_toolkit-%{version}-*.egg-info %files devel-doc -%defattr(-,root,root) %doc %{_defaultdocdir}/%{name}/html/api %doc %{_defaultdocdir}/%{name}/html/_sources ++++++ sphinx-intersphinx.patch ++++++ Description: Stop sphinx trying to download from network at build time Sphinx tries to download catalogues for intersphinx links -- suppress that here by removing the intersphinx extension. Author: Stuart Prescott <[email protected]> --- a/docs/conf.py +++ b/docs/conf.py @@ -37,7 +37,6 @@ 'sphinx.ext.autodoc', 'sphinx.ext.coverage', 'sphinx.ext.extlinks', - 'sphinx.ext.intersphinx', 'sphinx.ext.todo', ] ++++++ test-pytest310.patch ++++++ Description: Fix tests for pytest 3.10 Author: Stuart Prescott <[email protected]> Forwarded: https://github.com/translate/translate/pull/3841 --- a/translate/misc/test_deprecation.py +++ b/translate/misc/test_deprecation.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from pytest import deprecated_call, raises +from pytest import deprecated_call, raises, mark from translate.misc.deprecation import deprecated @@ -18,5 +18,6 @@ def test_deprecated_decorator(self): deprecated_call(self.deprecated_helper) - with raises(AssertionError): - deprecated_call(self.active_helper) + @mark.filterwarnings("error") + def test_no_deprecated_decorator(self): + self.active_helper() ++++++ translate-toolkit-2.3.0.tar.gz -> translate-toolkit-2.3.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/translate-toolkit/translate-toolkit-2.3.0.tar.gz /work/SRC/openSUSE:Factory/.translate-toolkit.new.28833/translate-toolkit-2.3.1.tar.gz differ: char 5, line 1 ++++++ xliff-xsd-no-network.patch ++++++ Description: Provide local version of XSD to prevent network access The xliff xsd imports xml.xsd which will result in network access. Include a local copy of this resource instead. Author: Stuart Prescott <[email protected]> --- a/tests/xliff_conformance/xliff-core-1.1.xsd +++ b/tests/xliff_conformance/xliff-core-1.1.xsd @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <xsd:schema targetNamespace="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xlf="urn:oasis:names:tc:xliff:document:1.1" elementFormDefault="qualified" xml:lang="en"> <!-- Import for xml:lang and xml:space --> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/> <!-- Attributes Lists --> <xsd:simpleType name="XTend"> <xsd:restriction base="xsd:string"> --- /dev/null +++ b/tests/xliff_conformance/xml.xsd @@ -0,0 +1,287 @@ +<?xml version='1.0'?> +<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?> +<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns ="http://www.w3.org/1999/xhtml" + xml:lang="en"> + + <xs:annotation> + <xs:documentation> + <div> + <h1>About the XML namespace</h1> + + <div class="bodytext"> + <p> + This schema document describes the XML namespace, in a form + suitable for import by other schema documents. + </p> + <p> + See <a href="http://www.w3.org/XML/1998/namespace.html"> + http://www.w3.org/XML/1998/namespace.html</a> and + <a href="http://www.w3.org/TR/REC-xml"> + http://www.w3.org/TR/REC-xml</a> for information + about this namespace. + </p> + <p> + Note that local names in this namespace are intended to be + defined only by the World Wide Web Consortium or its subgroups. + The names currently defined in this namespace are listed below. + They should not be used with conflicting semantics by any Working + Group, specification, or document instance. + </p> + <p> + See further below in this document for more information about <a + href="#usage">how to refer to this schema document from your own + XSD schema documents</a> and about <a href="#nsversioning">the + namespace-versioning policy governing this schema document</a>. + </p> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:attribute name="lang"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>lang (as an attribute name)</h3> + <p> + denotes an attribute whose value + is a language code for the natural language of the content of + any element; its value is inherited. This name is reserved + by virtue of its definition in the XML specification.</p> + + </div> + <div> + <h4>Notes</h4> + <p> + Attempting to install the relevant ISO 2- and 3-letter + codes as the enumerated possible values is probably never + going to be a realistic possibility. + </p> + <p> + See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt"> + http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a> + and the IANA language subtag registry at + <a href="http://www.iana.org/assignments/language-subtag-registry"> + http://www.iana.org/assignments/language-subtag-registry</a> + for further information. + </p> + <p> + The union allows for the 'un-declaration' of xml:lang with + the empty string. + </p> + </div> + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:union memberTypes="xs:language"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value=""/> + </xs:restriction> + </xs:simpleType> + </xs:union> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="space"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>space (as an attribute name)</h3> + <p> + denotes an attribute whose + value is a keyword indicating what whitespace processing + discipline is intended for the content of the element; its + value is inherited. This name is reserved by virtue of its + definition in the XML specification.</p> + + </div> + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:NCName"> + <xs:enumeration value="default"/> + <xs:enumeration value="preserve"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="base" type="xs:anyURI"> <xs:annotation> + <xs:documentation> + <div> + + <h3>base (as an attribute name)</h3> + <p> + denotes an attribute whose value + provides a URI to be used as the base for interpreting any + relative URIs in the scope of the element on which it + appears; its value is inherited. This name is reserved + by virtue of its definition in the XML Base specification.</p> + + <p> + See <a + href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a> + for information about this attribute. + </p> + </div> + </xs:documentation> + </xs:annotation> + </xs:attribute> + + <xs:attribute name="id" type="xs:ID"> + <xs:annotation> + <xs:documentation> + <div> + + <h3>id (as an attribute name)</h3> + <p> + denotes an attribute whose value + should be interpreted as if declared to be of type ID. + This name is reserved by virtue of its definition in the + xml:id specification.</p> + + <p> + See <a + href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a> + for information about this attribute. + </p> + </div> + </xs:documentation> + </xs:annotation> + </xs:attribute> + + <xs:attributeGroup name="specialAttrs"> + <xs:attribute ref="xml:base"/> + <xs:attribute ref="xml:lang"/> + <xs:attribute ref="xml:space"/> + <xs:attribute ref="xml:id"/> + </xs:attributeGroup> + + <xs:annotation> + <xs:documentation> + <div> + + <h3>Father (in any context at all)</h3> + + <div class="bodytext"> + <p> + denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and + XML Coordination groups: + </p> + <blockquote> + <p> + In appreciation for his vision, leadership and + dedication the W3C XML Plenary on this 10th day of + February, 2000, reserves for Jon Bosak in perpetuity + the XML name "xml:Father". + </p> + </blockquote> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation> + <div xml:id="usage" id="usage"> + <h2><a name="usage">About this schema document</a></h2> + + <div class="bodytext"> + <p> + This schema defines attributes and an attribute group suitable + for use by schemas wishing to allow <code>xml:base</code>, + <code>xml:lang</code>, <code>xml:space</code> or + <code>xml:id</code> attributes on elements they define. + </p> + <p> + To enable this, such a schema must import this schema for + the XML namespace, e.g. as follows: + </p> + <pre> + <schema . . .> + . . . + <import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/xml.xsd"/> + </pre> + <p> + or + </p> + <pre> + <import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2009/01/xml.xsd"/> + </pre> + <p> + Subsequently, qualified reference to any of the attributes or the + group defined below will have the desired effect, e.g. + </p> + <pre> + <type . . .> + . . . + <attributeGroup ref="xml:specialAttrs"/> + </pre> + <p> + will define a type which will schema-validate an instance element + with any of those attributes. + </p> + </div> + </div> + </xs:documentation> + </xs:annotation> + + <xs:annotation> + <xs:documentation> + <div id="nsversioning" xml:id="nsversioning"> + <h2><a name="nsversioning">Versioning policy for this schema document</a></h2> + <div class="bodytext"> + <p> + In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + <a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd</a>. + </p> + <p> + At the date of issue it can also be found at + <a href="http://www.w3.org/2001/xml.xsd"> + http://www.w3.org/2001/xml.xsd</a>. + </p> + <p> + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML + Schema itself, or with the XML namespace itself. In other words, + if the XML Schema or XML namespaces change, the version of this + document at <a href="http://www.w3.org/2001/xml.xsd"> + http://www.w3.org/2001/xml.xsd + </a> + will change accordingly; the version at + <a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd + </a> + will not change. + </p> + <p> + Previous dated (and unchanging) versions of this schema + document are at: + </p> + <ul> + <li><a href="http://www.w3.org/2009/01/xml.xsd"> + http://www.w3.org/2009/01/xml.xsd</a></li> + <li><a href="http://www.w3.org/2007/08/xml.xsd"> + http://www.w3.org/2007/08/xml.xsd</a></li> + <li><a href="http://www.w3.org/2004/10/xml.xsd"> + http://www.w3.org/2004/10/xml.xsd</a></li> + <li><a href="http://www.w3.org/2001/03/xml.xsd"> + http://www.w3.org/2001/03/xml.xsd</a></li> + </ul> + </div> + </div> + </xs:documentation> + </xs:annotation> + +</xs:schema> +
