Hello community,
here is the log from the commit of package python-sphinxcontrib-blockdiag for
openSUSE:Factory checked in at 2020-02-25 16:04:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-blockdiag (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-blockdiag.new.26092
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-blockdiag"
Tue Feb 25 16:04:35 2020 rev:4 rq:778792 version:2.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-blockdiag/python-sphinxcontrib-blockdiag.changes
2018-12-18 14:57:51.998299018 +0100
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-blockdiag.new.26092/python-sphinxcontrib-blockdiag.changes
2020-02-25 16:05:19.280412204 +0100
@@ -1,0 +2,6 @@
+Mon Feb 24 15:09:15 UTC 2020 - Ondřej Súkup <[email protected]>
+
+- update to 2.0.0
+- drop py2 support
+
+-------------------------------------------------------------------
Old:
----
sphinxcontrib-blockdiag-1.5.5.tar.gz
New:
----
sphinxcontrib-blockdiag-2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-blockdiag.spec ++++++
--- /var/tmp/diff_new_pack.bv4p7W/_old 2020-02-25 16:05:20.820412095 +0100
+++ /var/tmp/diff_new_pack.bv4p7W/_new 2020-02-25 16:05:20.820412095 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-sphinxcontrib-blockdiag
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,23 @@
#
+%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
# Test files missing
%bcond_with test
Name: python-sphinxcontrib-blockdiag
-Version: 1.5.5
+Version: 2.0.0
Release: 0
Summary: Sphinx "blockdiag" extension
License: BSD-2-Clause
-Group: Development/Languages/Python
URL: https://github.com/blockdiag/sphinxcontrib-blockdiag
Source:
https://files.pythonhosted.org/packages/source/s/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-%{version}.tar.gz
-BuildRequires: %{python_module Sphinx >= 0.6}
+BuildRequires: %{python_module Sphinx >= 2.0}
BuildRequires: %{python_module blockdiag >= 1.5.0}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-Sphinx >= 0.6
+Requires: python-Sphinx >= 2.0
Requires: python-blockdiag >= 1.5.0
BuildArch: noarch
%if %{with test}
@@ -57,7 +57,7 @@
%if %{with test}
%check
-%python_exec setup.py test
+%pytest
%endif
%files %{python_files}
++++++ sphinxcontrib-blockdiag-1.5.5.tar.gz ->
sphinxcontrib-blockdiag-2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/PKG-INFO
new/sphinxcontrib-blockdiag-2.0.0/PKG-INFO
--- old/sphinxcontrib-blockdiag-1.5.5/PKG-INFO 2015-12-01 15:31:40.000000000
+0100
+++ new/sphinxcontrib-blockdiag-2.0.0/PKG-INFO 2019-12-08 11:22:34.280455000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinxcontrib-blockdiag
-Version: 1.5.5
+Version: 2.0.0
Summary: Sphinx "blockdiag" extension
Home-page: https://github.com/blockdiag/sphinxcontrib-blockdiag
Author: Takeshi KOMIYA
@@ -10,14 +10,14 @@
sphinxcontrib-blockdiag
=======================
- .. image::
https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag.svg?branch=master
- :target: https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag
+ .. image::
https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag.svg?branch=master
+ :target: https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag
- .. image::
https://coveralls.io/repos/tk0miya/sphinxcontrib-blockdiag/badge.png?branch=master
- :target:
https://coveralls.io/r/tk0miya/sphinxcontrib-blockdiag?branch=master
+ .. image::
https://coveralls.io/repos/blockdiag/sphinxcontrib-blockdiag/badge.png?branch=master
+ :target:
https://coveralls.io/r/blockdiag/sphinxcontrib-blockdiag?branch=master
- .. image::
https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag/badges/gpa.svg
- :target:
https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag
+ .. image::
https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag/badges/gpa.svg
+ :target:
https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag
A sphinx extension for embedding block diagram using blockdiag_.
@@ -47,12 +47,12 @@
Classifier: License :: OSI Approved :: BSD License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Topic :: Documentation
Classifier: Topic :: Documentation :: Sphinx
Classifier: Topic :: Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/README.rst
new/sphinxcontrib-blockdiag-2.0.0/README.rst
--- old/sphinxcontrib-blockdiag-1.5.5/README.rst 2015-11-30
16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/README.rst 2019-12-08
09:20:58.000000000 +0100
@@ -2,14 +2,14 @@
sphinxcontrib-blockdiag
=======================
-.. image::
https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag.svg?branch=master
- :target: https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag
+.. image::
https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag.svg?branch=master
+ :target: https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag
-.. image::
https://coveralls.io/repos/tk0miya/sphinxcontrib-blockdiag/badge.png?branch=master
- :target:
https://coveralls.io/r/tk0miya/sphinxcontrib-blockdiag?branch=master
+.. image::
https://coveralls.io/repos/blockdiag/sphinxcontrib-blockdiag/badge.png?branch=master
+ :target:
https://coveralls.io/r/blockdiag/sphinxcontrib-blockdiag?branch=master
-.. image::
https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag/badges/gpa.svg
- :target: https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag
+.. image::
https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag/badges/gpa.svg
+ :target: https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag
A sphinx extension for embedding block diagram using blockdiag_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/setup.cfg
new/sphinxcontrib-blockdiag-2.0.0/setup.cfg
--- old/sphinxcontrib-blockdiag-1.5.5/setup.cfg 2015-12-01 15:31:40.000000000
+0100
+++ new/sphinxcontrib-blockdiag-2.0.0/setup.cfg 2019-12-08 11:22:34.285288600
+0100
@@ -1,7 +1,6 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
[build]
build-base = _build
@@ -21,6 +20,6 @@
[flake8]
max-line-length = 120
-ignore = _
+ignore = W504
exclude = tests/docs/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/setup.py
new/sphinxcontrib-blockdiag-2.0.0/setup.py
--- old/sphinxcontrib-blockdiag-1.5.5/setup.py 2015-12-01 15:31:20.000000000
+0100
+++ new/sphinxcontrib-blockdiag-2.0.0/setup.py 2019-12-08 11:21:18.000000000
+0100
@@ -2,12 +2,11 @@
from setuptools import setup, find_packages
-
-requires = ['blockdiag>=1.5.0', 'Sphinx>=0.6']
+requires = ['blockdiag>=1.5.0', 'Sphinx>=2.0']
setup(
name='sphinxcontrib-blockdiag',
- version='1.5.5',
+ version='2.0.0',
url='https://github.com/blockdiag/sphinxcontrib-blockdiag',
license='BSD',
author='Takeshi KOMIYA',
@@ -24,12 +23,12 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2.6',
- 'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.2',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Topic :: Documentation',
'Topic :: Documentation :: Sphinx',
'Topic :: Utilities',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib/blockdiag.py
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib/blockdiag.py
--- old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib/blockdiag.py
2015-11-30 16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib/blockdiag.py
2019-12-08 10:40:53.000000000 +0100
@@ -10,8 +10,6 @@
:license: BSDL.
"""
-from __future__ import absolute_import
-
import os
import re
import posixpath
@@ -20,18 +18,20 @@
from collections import namedtuple
from docutils import nodes
from sphinx import addnodes
+from sphinx.util import logging
from sphinx.util.osutil import ensuredir
import blockdiag.utils.rst.nodes
import blockdiag.utils.rst.directives
from blockdiag.utils.bootstrap import detectfont, Application
-from blockdiag.utils.compat import u, string_types
from blockdiag.utils.fontmap import FontMap
from blockdiag.utils.rst.directives import with_blockdiag
# fontconfig; it will be initialized on `builder-inited` event.
fontmap = None
+logger = logging.getLogger(__name__)
+
class blockdiag_node(blockdiag.utils.rst.nodes.blockdiag):
def to_drawer(self, image_format, builder, **kwargs):
@@ -56,11 +56,7 @@
fontmap=builder.config.blockdiag_fontmap,
format=image_format,
transparency=builder.config.blockdiag_transparency)
- if hasattr(builder, 'imgpath'): # Sphinx (<= 1.2.x) or HTML writer
- outputdir = builder.imgpath
- else:
- outputdir = ''
- return posixpath.join(outputdir, self.get_path(**options))
+ return posixpath.join(builder.imgpath, self.get_path(**options))
def get_abspath(self, image_format, builder):
options = dict(antialias=builder.config.blockdiag_antialias,
@@ -69,13 +65,7 @@
format=image_format,
transparency=builder.config.blockdiag_transparency)
- if hasattr(builder, 'imagedir'): # Sphinx (>= 1.3.x)
- outputdir = os.path.join(builder.outdir, builder.imagedir)
- elif hasattr(builder, 'imgpath'): # Sphinx (<= 1.2.x) and HTML writer
- outputdir = os.path.join(builder.outdir, '_images')
- else:
- outputdir = builder.outdir
- path = os.path.join(outputdir, self.get_path(**options))
+ path = os.path.join(builder.outdir, builder.imagedir,
self.get_path(**options))
ensuredir(os.path.dirname(path))
return path
@@ -92,7 +82,7 @@
if href is None:
return None
- pattern = re.compile(u("^:ref:`(.+?)`"), re.UNICODE)
+ pattern = re.compile("^:ref:`(.+?)`", re.UNICODE)
matched = pattern.search(href)
if matched is None:
return href
@@ -110,7 +100,7 @@
else:
return xref['refuri']
else:
- builder.warn('undefined label: %s' % refid)
+ logger.warning('undefined label: %s', refid)
return None
@@ -172,6 +162,7 @@
# link to original image
relpath = node.get_relpath('PNG', self.builder)
+ relpath = relpath.replace(os.path.sep, '/')
if 'width' in node['options'] or 'height' in node['options'] or 'scale' in
node['options']:
self.body.append('<a class="reference internal image-reference"
href="%s">' % relpath)
self.context.append('</a>')
@@ -212,13 +203,13 @@
msg = ("blockdiag error: UnicodeEncodeError caught "
"(check your font settings)")
- self.builder.warn(msg)
+ logger.warning(msg)
raise nodes.SkipNode
except Exception as exc:
if self.builder.config.blockdiag_debug:
traceback.print_exc()
- self.builder.warn('dot code %r: %s' % (node['code'], str(exc)))
+ logger.warning('dot code %r: %s', node['code'], exc)
raise nodes.SkipNode
@@ -253,7 +244,7 @@
def on_builder_inited(self):
# show deprecated message
if self.builder.config.blockdiag_tex_image_format:
- self.builder.warn('blockdiag_tex_image_format is deprecated. Use
blockdiag_latex_image_format.')
+ logger.warning('blockdiag_tex_image_format is deprecated. Use
blockdiag_latex_image_format.')
# initialize fontmap
global fontmap
@@ -261,19 +252,19 @@
try:
fontmappath = self.builder.config.blockdiag_fontmap
fontmap = FontMap(fontmappath)
- except:
+ except Exception:
fontmap = FontMap(None)
try:
fontpath = self.builder.config.blockdiag_fontpath
- if isinstance(fontpath, string_types):
+ if isinstance(fontpath, str):
fontpath = [fontpath]
if fontpath:
config = namedtuple('Config', 'font')(fontpath)
fontpath = detectfont(config)
fontmap.set_default_font(fontpath)
- except:
+ except Exception:
pass
@@ -287,7 +278,7 @@
if self.builder.config.blockdiag_debug:
traceback.print_exc()
- self.builder.warn('blockdiag error: %s' % exc)
+ logger.warning('blockdiag error: %s', exc)
for node in doctree.traverse(blockdiag_node):
node.parent.remove(node)
@@ -308,7 +299,7 @@
if self.builder.config.blockdiag_debug:
traceback.print_exc()
- self.builder.warn('dot code %r: %s' % (node['code'], str(exc)))
+ logger.warning('dot code %r: %s', node['code'], exc)
node.parent.remove(node)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/PKG-INFO
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/PKG-INFO
--- old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/PKG-INFO
2015-12-01 15:31:29.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/PKG-INFO
2019-12-08 11:22:33.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: sphinxcontrib-blockdiag
-Version: 1.5.5
+Version: 2.0.0
Summary: Sphinx "blockdiag" extension
Home-page: https://github.com/blockdiag/sphinxcontrib-blockdiag
Author: Takeshi KOMIYA
@@ -10,14 +10,14 @@
sphinxcontrib-blockdiag
=======================
- .. image::
https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag.svg?branch=master
- :target: https://travis-ci.org/tk0miya/sphinxcontrib-blockdiag
+ .. image::
https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag.svg?branch=master
+ :target: https://travis-ci.org/blockdiag/sphinxcontrib-blockdiag
- .. image::
https://coveralls.io/repos/tk0miya/sphinxcontrib-blockdiag/badge.png?branch=master
- :target:
https://coveralls.io/r/tk0miya/sphinxcontrib-blockdiag?branch=master
+ .. image::
https://coveralls.io/repos/blockdiag/sphinxcontrib-blockdiag/badge.png?branch=master
+ :target:
https://coveralls.io/r/blockdiag/sphinxcontrib-blockdiag?branch=master
- .. image::
https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag/badges/gpa.svg
- :target:
https://codeclimate.com/github/tk0miya/sphinxcontrib-blockdiag
+ .. image::
https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag/badges/gpa.svg
+ :target:
https://codeclimate.com/github/blockdiag/sphinxcontrib-blockdiag
A sphinx extension for embedding block diagram using blockdiag_.
@@ -47,12 +47,12 @@
Classifier: License :: OSI Approved :: BSD License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Topic :: Documentation
Classifier: Topic :: Documentation :: Sphinx
Classifier: Topic :: Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/SOURCES.txt
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/SOURCES.txt
---
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/SOURCES.txt
2015-12-01 15:31:29.000000000 +0100
+++
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/SOURCES.txt
2019-12-08 11:22:33.000000000 +0100
@@ -12,9 +12,4 @@
sphinxcontrib_blockdiag.egg-info/namespace_packages.txt
sphinxcontrib_blockdiag.egg-info/not-zip-safe
sphinxcontrib_blockdiag.egg-info/requires.txt
-sphinxcontrib_blockdiag.egg-info/top_level.txt
-tests/__init__.py
-tests/test_basic.py
-tests/test_errors.py
-tests/test_html.py
-tests/test_latex.py
\ No newline at end of file
+sphinxcontrib_blockdiag.egg-info/top_level.txt
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/requires.txt
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/requires.txt
---
old/sphinxcontrib-blockdiag-1.5.5/sphinxcontrib_blockdiag.egg-info/requires.txt
2015-12-01 15:31:29.000000000 +0100
+++
new/sphinxcontrib-blockdiag-2.0.0/sphinxcontrib_blockdiag.egg-info/requires.txt
2019-12-08 11:22:33.000000000 +0100
@@ -1,2 +1,2 @@
blockdiag>=1.5.0
-Sphinx>=0.6
+Sphinx>=2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/tests/test_basic.py
new/sphinxcontrib-blockdiag-2.0.0/tests/test_basic.py
--- old/sphinxcontrib-blockdiag-1.5.5/tests/test_basic.py 2015-11-30
16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/tests/test_basic.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from sphinx_testing import with_app
-
-
-@with_app(buildername='html', srcdir='tests/docs/basic/')
-def test_build_html(app, status, warning):
- app.builder.build_all()
-
-
-@with_app(buildername='singlehtml', srcdir='tests/docs/basic/')
-def test_build_singlehtml(app, status, warning):
- app.builder.build_all()
-
-
-@with_app(buildername='latex', srcdir='tests/docs/basic/')
-def test_build_latex(app, status, warning):
- app.builder.build_all()
-
-
-@with_app(buildername='epub', srcdir='tests/docs/basic/')
-def test_build_epub(app, status, warning):
- app.builder.build_all()
-
-
-@with_app(buildername='json', srcdir='tests/docs/basic/')
-def test_build_json(app, status, warning):
- app.builder.build_all()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/tests/test_errors.py
new/sphinxcontrib-blockdiag-2.0.0/tests/test_errors.py
--- old/sphinxcontrib-blockdiag-1.5.5/tests/test_errors.py 2015-11-30
16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/tests/test_errors.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from mock import patch
-from sphinx_testing import with_app
-from blockdiag.utils.compat import u
-
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
-
-
-class TestSphinxcontribBlockdiagErrors(unittest.TestCase):
- @with_app(srcdir='tests/docs/basic', write_docstring=True)
- def test_parse_error(self, app, status, warning):
- """
- .. blockdiag::
-
- { A -> B;
- """
- app.builder.build_all()
- self.assertIn('got unexpected token:', warning.getvalue())
-
- @with_app(srcdir='tests/docs/basic',
confoverrides=dict(blockdiag_html_image_format='JPG'))
- def test_unknown_format_error(self, app, status, warning):
- app.builder.build_all()
- self.assertIn('unknown format: JPG', warning.getvalue())
-
- @with_app(srcdir='tests/docs/basic',
confoverrides=dict(blockdiag_html_image_format='PDF'))
- def test_reportlab_not_found_error(self, app, status, warning):
- try:
- # unload reportlab and make loading it impossible
- sys.modules.pop('reportlab', None)
- path = sys.path
- sys.path = []
-
- app.builder.build_all()
-
- self.assertIn('Could not output PDF format. Install reportlab.',
- warning.getvalue())
- finally:
- sys.path = path
-
- @with_app(srcdir='tests/docs/basic')
- @patch("blockdiag.utils.rst.nodes.blockdiag.processor.drawer.DiagramDraw")
- def test_rendering_error(self, app, status, warning, DiagramDraw):
- DiagramDraw.side_effect = RuntimeError("UNKNOWN ERROR!")
- app.builder.build_all()
- self.assertIn('UNKNOWN ERROR!', warning.getvalue())
-
- @with_app(srcdir='tests/docs/basic')
- @patch("sphinxcontrib.blockdiag.blockdiag.drawer.DiagramDraw.draw")
- def test_font_settings_error(self, app, status, warning, draw):
- draw.side_effect = UnicodeEncodeError("", u(""), 0, 0, "")
- app.builder.build_all()
- self.assertIn('UnicodeEncodeError caught (check your font settings)',
- warning.getvalue())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/tests/test_html.py
new/sphinxcontrib-blockdiag-2.0.0/tests/test_html.py
--- old/sphinxcontrib-blockdiag-1.5.5/tests/test_html.py 2015-11-30
16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/tests/test_html.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,400 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from sphinx_testing import with_app
-
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
-
-
-with_png_app = with_app(srcdir='tests/docs/basic',
- buildername='html',
- write_docstring=True)
-with_svg_app = with_app(srcdir='tests/docs/basic',
- buildername='html',
- write_docstring=True,
- confoverrides={
- 'blockdiag_html_image_format': 'SVG'
- })
-
-
-class TestSphinxcontribBlockdiagHTML(unittest.TestCase):
- @with_png_app
- def test_build_png_image(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><img .*? src="_images/.*?.png"
.*?/></div>')
-
- @with_app(srcdir='tests/docs/subdir', buildername='html',
write_docstring=True)
- def test_build_png_image_in_subdir(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'subdir' /
'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><img .*?
src="\.\./_images/.*?.png" .*?/></div>')
-
- @with_png_app
- def test_width_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :width: 224
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="60.0" src="\\1"
width="224.0" /></a></div>'))
-
- @with_png_app
- def test_height_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :height: 240
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="240.0" src="\\1"
width="896.0" /></a></div>'))
-
- @with_png_app
- def test_width_option_and_height_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :width: 100
- :height: 200
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text()
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="200.0" src="\\1"
width="100.0" /></a></div>'))
-
- @with_png_app
- def test_scale_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :scale: 25%
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="30.0" src="\\1"
width="112.0" /></a></div>'))
-
- @with_png_app
- def test_width_option_and_scale_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :width: 28
- :scale: 25%
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="1.875" src="\\1"
width="7.0" /></a></div>'))
-
- @with_png_app
- def test_align_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :align: center
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div align="center"
class="align-center"><img .*? /></div>')
-
- @with_png_app
- def test_align_option_and_width_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :align: center
- :width: 224
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div align="center"
class="align-center">'
- '<a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="60.0" src="\\1"
width="224.0" /></a></div>'))
-
- @with_png_app
- def test_name_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :name: target
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><img .*? id="target" src=".*?"
.*? /></div>')
-
- @with_png_app
- def test_name_option_and_width_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :name: target
- :width: 224
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<img height="60.0" id="target"
src="\\1" width="224.0" /></a></div>'))
-
- @with_png_app
- def test_href_and_scale_option_on_png(self, app, status, warning):
- """
- .. blockdiag::
- :scale: 50%
-
- A -> B;
- A [href = 'http://blockdiag.com/'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><a class="reference internal
image-reference" href="(.*?.png)">'
- '<map name="(map_\d+)">'
- '<area shape="rect"
coords="32.0,20.0,96.0,40.0" '
- 'href="http://blockdiag.com/";></map>'
- '<img .*? src="\\1" usemap="#\\2"
.*?/></a></div>'))
-
- @with_png_app
- def test_reftarget_in_href_on_png1(self, app, status, warning):
- """
- .. _target:
-
- heading2
- ---------
-
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`target`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><map name="(map_\d+)">'
- '<area shape="rect"
coords="64.0,40.0,192.0,80.0" href="#target"></map>'
- '<img .*? src=".*?.png"
usemap="#\\1" .*?/></div>'))
-
- @with_png_app
- def test_reftarget_in_href_on_png2(self, app, status, warning):
- """
- .. _hello world:
-
- heading2
- ---------
-
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`hello world`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><map name="(map_\d+)">'
- '<area shape="rect"
coords="64.0,40.0,192.0,80.0" href="#hello-world">'
- '</map><img .*? src=".*?.png"
usemap="#\\1" .*?/></div>'))
-
- @with_png_app
- def test_missing_reftarget_in_href_on_png(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`unknown_target`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, ('<div><img .*? src=".*?.png"
.*?/></div>'))
- self.assertIn('undefined label: unknown_target', warning.getvalue())
-
- @with_app(srcdir='tests/docs/basic', copy_srcdir_to_tmpdir=True,
- write_docstring=True,
confoverrides={'blockdiag_html_image_format': 'SVG'})
- def test_build_svg_image(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg .*?>')
-
- @with_svg_app
- def test_width_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :width: 224
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg height="60.0" viewBox="0 0
448 120" width="224.0" .*?>')
-
- @with_svg_app
- def test_height_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :height: 240
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg height="240.0" viewBox="0
0 448 120" width="896.0" .*?>')
-
- @with_svg_app
- def test_width_option_and_height_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :width: 100
- :height: 200
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg height="200.0" viewBox="0
0 448 120" width="100.0" .*?>')
-
- @with_svg_app
- def test_scale_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :scale: 25%
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg height="30.0" viewBox="0 0
448 120" width="112.0" .*?>')
-
- @with_svg_app
- def test_width_option_and_scale_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :width: 28
- :scale: 25%
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><svg height="1.875" viewBox="0
0 448 120" width="7.0" .*?>')
-
- @with_svg_app
- def test_align_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :align: center
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div align="center"
class="align-center"><svg .*?>')
-
- @with_svg_app
- def test_name_option_on_svg(self, app, status, warning):
- """
- .. blockdiag::
- :name: target
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<div><span id="target"></span><svg
.*?>')
-
- @with_svg_app
- def test_reftarget_in_href_on_svg1(self, app, status, warning):
- """
- .. _target:
-
- heading2
- ---------
-
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`target`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<a xlink:href="#target">\\n\\s*<rect
.*?>\\n\\s*</a>')
-
- @with_svg_app
- def test_reftarget_in_href_on_svg2(self, app, status, warning):
- """
- .. _hello world:
-
- heading2
- ---------
-
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`hello world`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<a
xlink:href="#hello-world">\\n\\s*<rect .*?>\\n\\s*</a>')
-
- @with_svg_app
- def test_missing_reftarget_in_href_on_svg(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`unknown_target`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- if sys.version_info < (3, 0):
- self.assertNotRegexpMatches(source, '<a
xlink:href="#hello-world">\\n\\s*<rect .*?>\\n\\s*</a>')
- else:
- self.assertNotRegex(source, '<a
xlink:href="#hello-world">\\n\\s*<rect .*?>\\n\\s*</a>')
- self.assertIn('undefined label: unknown_target', warning.getvalue())
-
- @with_svg_app
- def test_autoclass_should_not_effect_to_other_diagram(self, app, status,
warning):
- """
- This testcase checks that autoclass plugin is unloaded correctly (and
it does not effect to other diagram).
-
- .. blockdiag::
-
- plugin autoclass;
- class foo [color = red];
- A_foo;
-
- .. blockdiag::
-
- class foo [color = red];
- A_foo;
- """
- app.builder.build_all()
- source = (app.outdir / 'index.html').read_text(encoding='utf-8')
- self.assertRegexpMatches(source, '<text[^>]+>A_foo</text>') # 2nd
diagram has a node labeled 'A_foo'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sphinxcontrib-blockdiag-1.5.5/tests/test_latex.py
new/sphinxcontrib-blockdiag-2.0.0/tests/test_latex.py
--- old/sphinxcontrib-blockdiag-1.5.5/tests/test_latex.py 2015-11-30
16:17:50.000000000 +0100
+++ new/sphinxcontrib-blockdiag-2.0.0/tests/test_latex.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,192 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import re
-from sphinx_testing import with_app
-from blockdiag.utils.compat import u
-
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
-
-blockdiag_fontpath = '/usr/share/fonts/truetype/ipafont/ipagp.ttf'
-with_png_app = with_app(srcdir='tests/docs/basic',
- buildername='latex',
- write_docstring=True,
- confoverrides={
- 'latex_documents': [('index', 'test.tex', u(''),
u('test'), 'manual')],
- })
-with_pdf_app = with_app(srcdir='tests/docs/basic',
- buildername='latex',
- write_docstring=True,
- confoverrides={
- 'latex_documents': [('index', 'test.tex', u(''),
u('test'), 'manual')],
- 'blockdiag_latex_image_format': 'PDF',
- 'blockdiag_fontpath': blockdiag_fontpath,
- })
-with_oldpdf_app = with_app(srcdir='tests/docs/basic',
- buildername='latex',
- write_docstring=True,
- confoverrides={
- 'latex_documents': [('index', 'test.tex',
u(''), u('test'), 'manual')],
- 'blockdiag_tex_image_format': 'PDF',
- 'blockdiag_fontpath': blockdiag_fontpath,
- })
-
-
-class TestSphinxcontribBlockdiagLatex(unittest.TestCase):
- @with_png_app
- def test_build_png_image(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.png}')
-
- @unittest.skipUnless(os.path.exists(blockdiag_fontpath), "TrueType font
not found")
- @unittest.skipIf(sys.version_info[:2] == (3, 2), "reportlab does not
support python 3.2")
- @with_pdf_app
- def test_build_pdf_image1(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.pdf}')
-
- @unittest.skipUnless(os.path.exists(blockdiag_fontpath), "TrueType font
not found")
- @unittest.skipIf(sys.version_info[:2] == (3, 2), "reportlab does not
support python 3.2")
- @with_oldpdf_app
- def test_build_pdf_image2(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.pdf}')
-
- @with_png_app
- def test_width_option(self, app, status, warning):
- """
- .. blockdiag::
- :width: 3cm
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics\\[width=3cm\\]{blockdiag-.*?.png}')
-
- @with_png_app
- def test_height_option(self, app, status, warning):
- """
- .. blockdiag::
- :height: 4cm
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics\\[height=4cm\\]{blockdiag-.*?.png}')
-
- @with_png_app
- def test_scale_option(self, app, status, warning):
- """
- .. blockdiag::
- :scale: 50%
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\scalebox{0.500000}{\\\\includegraphics{blockdiag-.*?.png}}')
-
- @with_png_app
- def test_align_option_left(self, app, status, warning):
- """
- .. blockdiag::
- :align: left
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'{\\\\includegraphics{blockdiag-.*?.png}\\\\hfill}')
-
- @with_png_app
- def test_align_option_center(self, app, status, warning):
- """
- .. blockdiag::
- :align: center
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'{\\\\hfill\\\\includegraphics{blockdiag-.*?.png}\\\\hfill}')
-
- @with_png_app
- def test_align_option_right(self, app, status, warning):
- """
- .. blockdiag::
- :align: right
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'{\\\\hfill\\\\includegraphics{blockdiag-.*?.png}}')
-
- @with_png_app
- def test_caption_option(self, app, status, warning):
- """
- .. blockdiag::
- :caption: hello world
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.png}')
-
- figure = re.compile('\\\\begin{figure}\\[htbp\\]\r?\n\\\\centering.*?'
- '\\\\caption{hello world}\\\\end{figure}',
re.DOTALL)
- self.assertRegexpMatches(source, figure)
-
- @with_png_app
- def test_caption_option_and_align_option(self, app, status, warning):
- """
- .. blockdiag::
- :align: left
- :caption: hello world
-
- A -> B;
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.png}')
-
- figure =
re.compile('\\\\begin{figure}\\[htbp\\]\\\\begin{flushleft}.*?'
- '\\\\caption{hello
world}\\\\end{flushleft}\\\\end{figure}', re.DOTALL)
- self.assertRegexpMatches(source, figure)
-
- @with_png_app
- def test_href(self, app, status, warning):
- """
- .. blockdiag::
-
- A -> B;
- A [href = ':ref:`target`'];
- """
- app.builder.build_all()
- source = (app.outdir / 'test.tex').read_text(encoding='utf-8')
- self.assertRegexpMatches(source,
'\\\\includegraphics{blockdiag-.*?.png}')
