Hello community, here is the log from the commit of package python-seqdiag for openSUSE:Factory checked in at 2019-04-30 13:04:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-seqdiag (Old) and /work/SRC/openSUSE:Factory/.python-seqdiag.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-seqdiag" Tue Apr 30 13:04:18 2019 rev:3 rq:697923 version:0.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-seqdiag/python-seqdiag.changes 2018-12-24 11:46:17.321191951 +0100 +++ /work/SRC/openSUSE:Factory/.python-seqdiag.new.5536/python-seqdiag.changes 2019-04-30 13:04:23.842019919 +0200 @@ -1,0 +2,6 @@ +Thu Apr 25 19:53:17 UTC 2019 - Dirk Mueller <[email protected]> + +- update to 0.9.6: + * Python 3.7 compatibility + +------------------------------------------------------------------- Old: ---- seqdiag-0.9.5.tar.gz New: ---- seqdiag-0.9.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-seqdiag.spec ++++++ --- /var/tmp/diff_new_pack.Vook7a/_old 2019-04-30 13:04:26.034016147 +0200 +++ /var/tmp/diff_new_pack.Vook7a/_new 2019-04-30 13:04:26.034016147 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-seqdiag # -# Copyright (c) 2018 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 @@ -23,7 +23,7 @@ BuildArch: noarch %endif Name: python-seqdiag -Version: 0.9.5 +Version: 0.9.6 Release: 0 Summary: Python module to generate sequence-diagram images from text License: Apache-2.0 ++++++ seqdiag-0.9.5.tar.gz -> seqdiag-0.9.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/CHANGES.rst new/seqdiag-0.9.6/CHANGES.rst --- old/seqdiag-0.9.5/CHANGES.rst 2014-12-31 16:19:37.000000000 +0100 +++ new/seqdiag-0.9.6/CHANGES.rst 2018-07-24 16:30:36.000000000 +0200 @@ -1,6 +1,12 @@ Changelog ========= +0.9.6 (2018-07-24) +------------------ +* Fix a bug + + - Fix #24 Python 3.7 compatibility + 0.9.5 (2015-01-01) ------------------ * Support blockdiag 1.5.0 core interface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/PKG-INFO new/seqdiag-0.9.6/PKG-INFO --- old/seqdiag-0.9.5/PKG-INFO 2015-01-01 15:51:58.000000000 +0100 +++ new/seqdiag-0.9.6/PKG-INFO 2018-07-24 16:31:44.000000000 +0200 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: seqdiag -Version: 0.9.5 +Version: 0.9.6 Summary: seqdiag generates sequence-diagram image from text Home-page: http://blockdiag.com/ Author: Takeshi Komiya -Author-email: i.tkomiya at gmail.com +Author-email: [email protected] License: Apache License 2.0 Download-URL: http://pypi.python.org/pypi/seqdiag Description: `seqdiag` generate sequence-diagram image file from spec-text file. @@ -97,8 +97,6 @@ ======= Apache License 2.0 - - Keywords: diagram,generator Platform: UNKNOWN Classifier: Development Status :: 3 - Alpha @@ -108,3 +106,5 @@ Classifier: Topic :: Software Development Classifier: Topic :: Software Development :: Documentation Classifier: Topic :: Text Processing :: Markup +Provides-Extra: rst +Provides-Extra: testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/README.rst new/seqdiag-0.9.6/README.rst --- old/seqdiag-0.9.5/README.rst 2014-11-05 03:04:16.000000000 +0100 +++ new/seqdiag-0.9.6/README.rst 2018-07-24 16:29:43.000000000 +0200 @@ -87,5 +87,3 @@ License ======= Apache License 2.0 - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/setup.cfg new/seqdiag-0.9.6/setup.cfg --- old/seqdiag-0.9.5/setup.cfg 2015-01-01 15:51:58.000000000 +0100 +++ new/seqdiag-0.9.6/setup.cfg 2018-07-24 16:31:44.000000000 +0200 @@ -1,7 +1,6 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 [build] build-base = _build @@ -21,4 +20,5 @@ [flake8] ignore = _ +copyright-check = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/setup.py new/seqdiag-0.9.6/setup.py --- old/seqdiag-0.9.5/setup.py 2014-12-31 16:16:51.000000000 +0100 +++ new/seqdiag-0.9.6/setup.py 2018-07-24 16:31:28.000000000 +0200 @@ -15,6 +15,7 @@ "Topic :: Text Processing :: Markup", ] +requires = ['blockdiag>=1.5.0'] test_requires = ['nose', 'pep8>=1.3', 'reportlab', @@ -24,6 +25,9 @@ if sys.version_info > (2, 6) and sys.version_info < (2, 7): test_requires.append('unittest2') +if (3, 2) < sys.version_info < (3, 3): + requires.append('webcolors < 1.5') # webcolors-1.5 does not support py32 + setup( name='seqdiag', @@ -33,7 +37,7 @@ classifiers=classifiers, keywords=['diagram', 'generator'], author='Takeshi Komiya', - author_email='i.tkomiya at gmail.com', + author_email='[email protected]', url='http://blockdiag.com/', download_url='http://pypi.python.org/pypi/seqdiag', license='Apache License 2.0', @@ -42,11 +46,7 @@ package_dir={'': 'src'}, package_data={'': ['buildout.cfg']}, include_package_data=True, - install_requires=[ - 'setuptools', - 'blockdiag>=1.5.0', - # -*- Extra requirements: -*- - ], + install_requires=requires, extras_require=dict( testing=test_requires, rst=[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/__init__.py new/seqdiag-0.9.6/src/seqdiag/__init__.py --- old/seqdiag-0.9.5/src/seqdiag/__init__.py 2014-12-31 16:17:01.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag/__init__.py 2018-07-24 16:30:47.000000000 +0200 @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '0.9.5' +__version__ = '0.9.6' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/builder.py new/seqdiag-0.9.6/src/seqdiag/builder.py --- old/seqdiag-0.9.5/src/seqdiag/builder.py 2014-06-13 12:44:05.000000000 +0200 +++ new/seqdiag-0.9.6/src/seqdiag/builder.py 2018-07-24 16:29:43.000000000 +0200 @@ -80,9 +80,7 @@ match = [e for e in self.diagram.edges if e.order == i] if match: edge = match[0] - if edge.node1 == edge.node2: - pass - elif edge.activate is False: + if edge.activate is False: pass elif edge.dir == 'forward': if edge.node2 in active_nodes: @@ -211,7 +209,7 @@ elif stmt.edge_block: self.instantiate(group, block, stmt.edge_block) - if edge.dir in ('back', 'both') and edge.node1 != edge.node2: + if edge.dir in ('back', 'both'): reverse = edge.duplicate() reverse.dir = 'back' if edge.dir == 'both': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/drawer.py new/seqdiag-0.9.6/src/seqdiag/drawer.py --- old/seqdiag-0.9.5/src/seqdiag/drawer.py 2013-09-21 04:33:58.000000000 +0200 +++ new/seqdiag-0.9.6/src/seqdiag/drawer.py 2018-07-24 16:29:43.000000000 +0200 @@ -103,7 +103,7 @@ # render head of edges head = m.head - if edge.async: + if edge.asynchronous: self.drawer.line((head[0], head[1]), fill=edge.color) self.drawer.line((head[1], head[2]), fill=edge.color) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/elements.py new/seqdiag-0.9.6/src/seqdiag/elements.py --- old/seqdiag-0.9.5/src/seqdiag/elements.py 2014-11-01 07:43:15.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag/elements.py 2018-07-24 16:29:43.000000000 +0200 @@ -84,7 +84,7 @@ class DiagramEdge(blockdiag.elements.DiagramEdge): notecolor = (255, 182, 193) # LightPink - # name -> (dir, style, async) + # name -> (dir, style, asynchronous) ARROW_DEF = { 'both': ('both', None, False), '=>': ('both', None, False), @@ -121,7 +121,7 @@ self.textheight = 0 self.order = 0 self.activate = True - self.async = False + self.asynchronous = False self.diagonal = False self.failed = False self.return_label = '' @@ -186,10 +186,13 @@ if params is None: warning("unknown edge dir: %s", value) else: - self.dir, self.style, self.async = params + self.dir, self.style, self.asynchronous = params + + if self.node1 == self.node2 and self.dir in ('forward', 'back'): + self.activate = False def to_desctable(self): - params = (self.dir, self.style, self.async) + params = (self.dir, self.style, self.asynchronous) for arrow_type, settings in self.ARROW_DEF.items(): if params == settings and not arrow_type.isalpha(): label = "%s %s %s" % (self.node1.label, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/tests/test_generate_diagram.py new/seqdiag-0.9.6/src/seqdiag/tests/test_generate_diagram.py --- old/seqdiag-0.9.5/src/seqdiag/tests/test_generate_diagram.py 2014-11-15 06:21:48.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag/tests/test_generate_diagram.py 2018-07-24 16:29:43.000000000 +0200 @@ -1,4 +1,17 @@ # -*- coding: utf-8 -*- +# Copyright 2011 Takeshi KOMIYA +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import os import seqdiag.command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/tests/test_pep8.py new/seqdiag-0.9.6/src/seqdiag/tests/test_pep8.py --- old/seqdiag-0.9.5/src/seqdiag/tests/test_pep8.py 2014-06-13 12:44:05.000000000 +0200 +++ new/seqdiag-0.9.6/src/seqdiag/tests/test_pep8.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import print_function -import os -import sys -import pep8 - -CURRENT_DIR = os.path.dirname(os.path.abspath(__file__)) -BASE_DIR = os.path.dirname(CURRENT_DIR) - - -def test_pep8(): - arglist = [['statistics', True], - ['show-source', True], - ['repeat', True], - ['paths', [BASE_DIR]]] - - pep8style = pep8.StyleGuide(arglist, parse_argv=False, config_file=True) - options = pep8style.options - if options.doctest: - import doctest - fail_d, done_d = doctest.testmod(report=False, verbose=options.verbose) - fail_s, done_s = pep8.selftest(options) - count_failed = fail_s + fail_d - if not options.quiet: - count_passed = done_d + done_s - count_failed - print("%d passed and %d failed." % (count_passed, count_failed)) - if count_failed: - print("Test failed.") - else: - print("Test passed.") - if count_failed: - sys.exit(1) - if options.testsuite: - pep8.init_tests(pep8style) - report = pep8style.check_files() - if options.statistics: - report.print_statistics() - if options.benchmark: - report.print_benchmark() - if options.testsuite and not options.quiet: - report.print_results() - if report.total_errors: - if options.count: - sys.stderr.write(str(report.total_errors) + '\n') - # sys.exit(1) - - # reporting errors (additional summary) - errors = report.get_count('E') - warnings = report.get_count('W') - message = 'pep8: %d errors / %d warnings' % (errors, warnings) - print(message) - assert report.total_errors == 0, message diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag/tests/test_rst_directives.py new/seqdiag-0.9.6/src/seqdiag/tests/test_rst_directives.py --- old/seqdiag-0.9.5/src/seqdiag/tests/test_rst_directives.py 2014-11-21 04:22:50.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag/tests/test_rst_directives.py 2018-07-24 16:29:43.000000000 +0200 @@ -1,18 +1,31 @@ # -*- coding: utf-8 -*- - -import sys -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest +# Copyright 2011 Takeshi KOMIYA +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import os -from blockdiag.tests.utils import capture_stderr, with_pil, TemporaryDirectory +import sys from docutils import nodes from docutils.core import publish_doctree from docutils.parsers.rst import directives as docutils from seqdiag.utils.rst import directives from blockdiag.utils.compat import u +from blockdiag.tests.utils import capture_stderr, with_pil, TemporaryDirectory + +if sys.version_info < (2, 7): + import unittest2 as unittest +else: + import unittest class TestRstDirectives(unittest.TestCase): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag.egg-info/PKG-INFO new/seqdiag-0.9.6/src/seqdiag.egg-info/PKG-INFO --- old/seqdiag-0.9.5/src/seqdiag.egg-info/PKG-INFO 2015-01-01 15:51:54.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag.egg-info/PKG-INFO 2018-07-24 16:31:43.000000000 +0200 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: seqdiag -Version: 0.9.5 +Version: 0.9.6 Summary: seqdiag generates sequence-diagram image from text Home-page: http://blockdiag.com/ Author: Takeshi Komiya -Author-email: i.tkomiya at gmail.com +Author-email: [email protected] License: Apache License 2.0 Download-URL: http://pypi.python.org/pypi/seqdiag Description: `seqdiag` generate sequence-diagram image file from spec-text file. @@ -97,8 +97,6 @@ ======= Apache License 2.0 - - Keywords: diagram,generator Platform: UNKNOWN Classifier: Development Status :: 3 - Alpha @@ -108,3 +106,5 @@ Classifier: Topic :: Software Development Classifier: Topic :: Software Development :: Documentation Classifier: Topic :: Text Processing :: Markup +Provides-Extra: rst +Provides-Extra: testing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag.egg-info/SOURCES.txt new/seqdiag-0.9.6/src/seqdiag.egg-info/SOURCES.txt --- old/seqdiag-0.9.5/src/seqdiag.egg-info/SOURCES.txt 2015-01-01 15:51:54.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag.egg-info/SOURCES.txt 2018-07-24 16:31:43.000000000 +0200 @@ -33,7 +33,6 @@ src/seqdiag.egg-info/requires.txt src/seqdiag.egg-info/top_level.txt src/seqdiag/tests/test_generate_diagram.py -src/seqdiag/tests/test_pep8.py src/seqdiag/tests/test_rst_directives.py src/seqdiag/tests/VLGothic/LICENSE src/seqdiag/tests/VLGothic/LICENSE.en diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag.egg-info/requires.txt new/seqdiag-0.9.6/src/seqdiag.egg-info/requires.txt --- old/seqdiag-0.9.5/src/seqdiag.egg-info/requires.txt 2015-01-01 15:51:54.000000000 +0100 +++ new/seqdiag-0.9.6/src/seqdiag.egg-info/requires.txt 2018-07-24 16:31:43.000000000 +0200 @@ -1,4 +1,3 @@ -setuptools blockdiag>=1.5.0 [rst] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/src/seqdiag_sphinxhelper.py new/seqdiag-0.9.6/src/seqdiag_sphinxhelper.py --- old/seqdiag-0.9.5/src/seqdiag_sphinxhelper.py 2013-10-06 03:43:40.000000000 +0200 +++ new/seqdiag-0.9.6/src/seqdiag_sphinxhelper.py 2018-07-24 16:29:44.000000000 +0200 @@ -13,25 +13,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -__all__ = [ - 'core', 'utils' -] - import seqdiag import seqdiag.parser import seqdiag.builder import seqdiag.drawer -core = seqdiag - import seqdiag.utils.rst.nodes import seqdiag.utils.rst.directives -utils = seqdiag.utils - import blockdiag.utils.bootstrap -utils.bootstrap = blockdiag.utils.bootstrap - +import blockdiag.utils.compat import blockdiag.utils.fontmap -utils.fontmap = blockdiag.utils.fontmap -import blockdiag.utils.compat +__all__ = [ + 'core', 'utils' +] + +core = seqdiag +utils = seqdiag.utils +utils.bootstrap = blockdiag.utils.bootstrap +utils.fontmap = blockdiag.utils.fontmap utils.compat = blockdiag.utils.compat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seqdiag-0.9.5/tox.ini new/seqdiag-0.9.6/tox.ini --- old/seqdiag-0.9.5/tox.ini 2014-11-11 10:47:08.000000000 +0100 +++ new/seqdiag-0.9.6/tox.ini 2018-07-24 16:29:44.000000000 +0200 @@ -5,8 +5,12 @@ deps= nose flake8 + flake8-coding + flake8-copyright docutils reportlab +passenv= + ALL_TESTS commands= nosetests flake8 src
