Hello community,
here is the log from the commit of package python-blockdiag for
openSUSE:Factory checked in at 2019-03-01 16:48:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-blockdiag (Old)
and /work/SRC/openSUSE:Factory/.python-blockdiag.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-blockdiag"
Fri Mar 1 16:48:16 2019 rev:5 rq:680067 version:1.5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-blockdiag/python-blockdiag.changes
2018-12-13 19:46:57.156816916 +0100
+++
/work/SRC/openSUSE:Factory/.python-blockdiag.new.28833/python-blockdiag.changes
2019-03-01 16:48:19.625778621 +0100
@@ -1,0 +2,6 @@
+Thu Feb 28 09:38:53 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 1.5.4:
+ * better python 3.7 compatibility
+
+-------------------------------------------------------------------
Old:
----
blockdiag-1.5.3.tar.gz
New:
----
blockdiag-1.5.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-blockdiag.spec ++++++
--- /var/tmp/diff_new_pack.bJWEcK/_old 2019-03-01 16:48:20.417778322 +0100
+++ /var/tmp/diff_new_pack.bJWEcK/_new 2019-03-01 16:48:20.421778321 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-blockdiag
#
-# 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
@@ -20,7 +20,7 @@
# tests need network connection
%bcond_with tests
Name: python-blockdiag
-Version: 1.5.3
+Version: 1.5.4
Release: 0
Summary: Program to generate block-diagram images from text
License: Apache-2.0
++++++ blockdiag-1.5.3.tar.gz -> blockdiag-1.5.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/.hgignore
new/blockdiag-1.5.4/.hgignore
--- old/blockdiag-1.5.3/.hgignore 2013-10-17 08:38:48.000000000 +0200
+++ new/blockdiag-1.5.4/.hgignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-.pyc
-.swp
-^.installed.cfg
-^.coverage
-^.tox
-^bin/
-^build/
-^_build/
-^develop-eggs/
-^dist/
-^eggs/
-^parts/
-^src/.*.egg-info
-^src/blockdiag/tests/truetype
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/.hgtags new/blockdiag-1.5.4/.hgtags
--- old/blockdiag-1.5.3/.hgtags 2015-05-17 07:55:42.000000000 +0200
+++ new/blockdiag-1.5.4/.hgtags 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
-f13b2f2d914399eae8bf7b4b5105a69eb7e657ca 0.1
-af0e42d164178abd7f849b2d5659fe01b7eed69c 0.2
-211617855c50a76c0226ecb83d659ba77323c0d9 0.2.2
-0e0308059b7d67b2d7c2bd0a3e6989dcce6c7129 0.3
-183f989ca4bb9e6ac44dacf588312f77e4b715ea 0.3.1
-c799939494fcf8adefeb4e129c111af8253519c3 0.4
-3de87d6c2c78240db3b3f800f551169e3360c16a 0.4.1
-7070f6188d7278ef26ca4e6f2fa1a1faac8853c3 0.2.1
-6dfea7499697f839240ab49ffad1000e34bcf834 0.4.2
-7a86de04a5247bc775a956e252949c04753b1449 0.5
-c86ba6300a6f00cb490f952c321c7596ba54dfaa 0.5.1
-b73c44fbe87dd5c478dbe5c861d6833381022865 0.5.2
-200c7a578e3c98db5876b4db225ec3a69cb28b5b 0.5.3
-45835d84017e5da4d7618d2eaaab98ba9d575572 0.5.4
-92e1ffe35380687329273214b2f4676a5c960ed8 0.5.5
-d6af195862867049b81021ae359668f405fdb4f5 0.6
-52ed26c213248b738ddb1b8c7f97288f087c330a 0.6.1
-52ed26c213248b738ddb1b8c7f97288f087c330a 0.6.1
-0000000000000000000000000000000000000000 0.6.1
-0000000000000000000000000000000000000000 0.6.1
-63bc462fbc487ed1f1c55c2ab9e101bd97f87d99 0.6.1
-6061c7f1706c1164cc34da48c19e543c56be007c 0.6.2
-84e23355450870f51a35e2931ef80f31f1f130fb 0.6.3
-87382e9a446bc06adbb57c52530ebcee10749738 0.6.4
-4634b17e273837c2a2d6a8effaf7fd0343e226cf 0.6.5
-f2d6cbbd62619c556afe40fa17f7da314e3d66a0 0.6.6
-663a52ef768c7725984db74fd9064fd2bca0263c 0.6.7
-01ccc2e285e57e3df3656d21eb86ea3e2c4de6e7 0.7.0
-123ed155fd4e933dfb5182af6a4bb67b776f06e3 0.7.1
-2d6ef5898a4c8c127e3ca256263597dbef0192ec 0.7.2
-93e52fb89351e2b40b2058829a41157d72a6b4fe 0.7.3
-afa7e91236bebf58d9c2081b328a8f6a209158a5 0.7.4
-dc056c5edf2fdb73c68ce55957e36442cf259bda 0.7.5
-9c9bc6e859f7e1bf2cbdf296cb98bdd43e177339 0.7.6
-f14667d477b861e146ca82974852591f343955b4 0.7.7
-6c6edf112349b3dcd525ecf805cf2d1ddce95923 0.7.8
-56d8d6c04be5c495d52479cd7273054652ea0f41 0.8.0
-5317b0bcec53c4f83badc21675255fa4f810c51b 0.8.1
-5317b0bcec53c4f83badc21675255fa4f810c51b 0.8.1
-0000000000000000000000000000000000000000 0.8.1
-0000000000000000000000000000000000000000 0.8.1
-4e291393b9818f9b744599753213b2f214418367 0.8.1
-1394f7cb6d74256841d52b65559a9181f38dc3c0 0.8.2
-1394f7cb6d74256841d52b65559a9181f38dc3c0 0.8.2
-0000000000000000000000000000000000000000 0.8.2
-0000000000000000000000000000000000000000 0.8.2
-a39c2fe87c56ecd3330fa966c16a84a719c078af 0.8.2
-dee693b247f9796ef5a71c9879e7ece81e2ca826 0.8.3
-e26b9e4dea0da3d3decaee7524add158cd8f9a89 0.8.4
-3ee05b403cb89fccf29f8225238119322d574343 0.8.5
-66503507bf9021e9373a26963380c8daefe8b732 0.8.6
-58c589bf671872eb14cb8a97572cd54f4451363d 0.8.7
-a5ae7cf75f7932c938e66df154f766d530ec9a10 0.8.8
-aeb61e8fad968a0a252e7be969e558b8058087ac 0.8.9
-9547a2a4d61e3d136913ba2fd281f568b06c26f1 0.9.0
-b8fcad4288f703ce4fe68c0f66cde6f6cfda14ea 0.9.1
-4100c1b16943477421d72dbcc47f17636cf3cd07 0.9.2
-71e676fb5eb2287ac8d864be6e3f6a1ce404e66e 0.9.3
-f0c827676fda31eec4570b901bc9a4e8094f1f6e 0.9.5
-f0c827676fda31eec4570b901bc9a4e8094f1f6e 0.9.5
-0000000000000000000000000000000000000000 0.9.5
-0000000000000000000000000000000000000000 0.9.5
-9c07fdfc24682a8a935c139113f20c60a1ded6cd 0.9.5
-9c07fdfc24682a8a935c139113f20c60a1ded6cd 0.9.5
-0000000000000000000000000000000000000000 0.9.5
-0000000000000000000000000000000000000000 0.9.5
-989c2c9e33af4c1d7033738a0e3346e2d1fe78aa 0.9.5
-a110a4a98ad14ed551539d2ce9bf022e7a65099c 0.9.6
-00957a44f847d8582b6be748ae47e613be57c5b6 0.9.7
-91f704283be06c84cfbe614be97cd43c3f342845 1.0.1
-1d6039743bd6f7056293432556cea030fbf921fc 1.0.2
-e7a0149a88f05fc2064d37f948252397a8cd945f 1.0.0
-84d6892aa674d64808d30139617550a96c50054a 1.0.3
-e180448fb931f2cc5f0c3876b7e9fe050ffdcb74 1.1.0
-bbc158edfa84fc78e694d19a7fd570127e098a82 1.1.1
-f7fc3127b629accae4b82ec69d7b13016b7093b5 1.1.2
-28eb38df230448b99bf11909f30232f9028e44c3 1.1.3
-28eb38df230448b99bf11909f30232f9028e44c3 1.1.3
-0000000000000000000000000000000000000000 1.1.3
-0000000000000000000000000000000000000000 1.1.3
-caa5f3cae7574d94efd86da6a7cba5e614ef905e 1.1.3
-dc9debc39155dad8e6bb18ead11d9af876170bc6 1.1.4
-f2faaa5683f7cf3e3ffb8927ad2a9a11ef9b62e5 1.1.5
-b57b099723600a0eb289220ffadc6b52ab3aca55 1.1.6
-ddff661e8fd9fab186382c5629032d918bfe5b48 1.1.7
-0c6e79e5491ca681ab1eb74c8b6bf84b9f7db114 1.1.8
-2a028e8248876b143d02e4113cf0e6aa45ec49da 1.2.0
-5f30defbfa6425144d9f41be9dae4e6fdd5cb1f8 1.2.1
-a58111e3769fbefea485fe78c136b1bf083566dd 1.2.2
-a58111e3769fbefea485fe78c136b1bf083566dd 1.2.2
-0000000000000000000000000000000000000000 1.2.2
-0000000000000000000000000000000000000000 1.2.2
-1e7de1d0e4656230f0b367f4a76e80e40f20747f 1.2.2
-b7204023d673853f16687412f0758d66f669fe6e 1.2.3
-924f66da959d9e6ac1f4831cf8a9fbb18a57fb8a 1.2.4
-eea92cc34dd8702eb368fb274de87b4b9bfde8c9 1.3.0
-5181da3c729559101982dee60cf2bac4098913b7 1.3.1
-eaeb1c38be3dfc0ae6e996b38437e8bdf9799ea2 1.3.2
-372e5f369ba92ed5efa40139393dea58cdf475d9 1.3.3
-4746d577dcfbe02ba535d70912236b10723a52f8 1.4.0
-41e73287a1d6e019dd1f6940d184f05adcd07b33 1.4.1
-eda0e6b41fdf9939d0d160fbdf2dfce5e7f3135e 1.4.2
-b7481dd07fe9b8f815eb6989c53b2ab7dc490f50 1.4.3
-fdf8d4f28170b81b237afdb787b81c13a0d8827a 1.4.4
-dc4a431c445e57411e8800577afa761ee4e476f0 1.4.5
-8b62ba06c865d32b6c02e185fb4ebe6478322d41 1.4.6
-bb9af150c55e8497c75f93250774d64dc7798bd9 1.4.7
-b67e529c41e7fac9796c6635e7a5b801f98a4de7 1.5.0
-1f35ac7a1e98fcdf8c74164ce721d5ab725f003a 1.5.1
-90c65044ba04b5a305980f062c83a481bf7253cf 1.5.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/.installed.cfg
new/blockdiag-1.5.4/.installed.cfg
--- old/blockdiag-1.5.3/.installed.cfg 2015-06-07 07:55:35.000000000 +0200
+++ new/blockdiag-1.5.4/.installed.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-[buildout]
-installed_develop_eggs =
/Users/tkomiya/work/blockdiag/develop-eggs/blockdiag.egg-link
-parts = blockdiag test static_analysis
-
-[blockdiag]
-__buildout_installed__ = /Users/tkomiya/work/blockdiag/bin/blockdiag
- /Users/tkomiya/work/blockdiag/bin/py
-__buildout_signature__ = zc.recipe.egg-2.0.1-py2.7.egg
setuptools-e254772190d6726b0025d350d2b623f9 zc.buildout-2.3.1-py2.7.egg
-_b = /Users/tkomiya/work/blockdiag/bin
-_d = /Users/tkomiya/work/blockdiag/develop-eggs
-_e = /Users/tkomiya/.buildout/buildout-eggs
-bin-directory = /Users/tkomiya/work/blockdiag/bin
-develop-eggs-directory = /Users/tkomiya/work/blockdiag/develop-eggs
-eggs = blockdiag[rst]
-eggs-directory = /Users/tkomiya/.buildout/buildout-eggs
-interpreter = py
-recipe = zc.recipe.egg
-
-[test]
-__buildout_installed__ = /Users/tkomiya/work/blockdiag/bin/test
-__buildout_signature__ = pbp.recipe.noserunner-0.2.6-py2.7.egg
zc.recipe.egg-2.0.1-py2.7.egg nose-1.3.4-py2.7.egg zc.buildout-2.3.1-py2.7.egg
setuptools-e254772190d6726b0025d350d2b623f9
-_b = /Users/tkomiya/work/blockdiag/bin
-_d = /Users/tkomiya/work/blockdiag/develop-eggs
-_e = /Users/tkomiya/.buildout/buildout-eggs
-bin-directory = /Users/tkomiya/work/blockdiag/bin
-develop-eggs-directory = /Users/tkomiya/work/blockdiag/develop-eggs
-eggs = blockdiag[rst]
- blockdiag[testing]
- coverage
- unittest-xml-reporting
- nose
-eggs-directory = /Users/tkomiya/.buildout/buildout-eggs
-location = /Users/tkomiya/work/blockdiag/parts/test
-recipe = pbp.recipe.noserunner
-script = /Users/tkomiya/work/blockdiag/bin/test
-
-[static_analysis]
-__buildout_installed__ = /Users/tkomiya/work/blockdiag/bin/coverage2
- /Users/tkomiya/work/blockdiag/bin/coverage-2.7
- /Users/tkomiya/work/blockdiag/bin/coverage
- /Users/tkomiya/work/blockdiag/bin/flake8
- /Users/tkomiya/work/blockdiag/bin/pyreverse
- /Users/tkomiya/work/blockdiag/bin/pylint
- /Users/tkomiya/work/blockdiag/bin/epylint
- /Users/tkomiya/work/blockdiag/bin/pylint-gui
- /Users/tkomiya/work/blockdiag/bin/symilar
- /Users/tkomiya/work/blockdiag/bin/epylint
- /Users/tkomiya/work/blockdiag/bin/pylint
- /Users/tkomiya/work/blockdiag/bin/pylint-gui
- /Users/tkomiya/work/blockdiag/bin/pyreverse
- /Users/tkomiya/work/blockdiag/bin/symilar
-__buildout_signature__ = zc.recipe.egg-2.0.1-py2.7.egg
setuptools-e254772190d6726b0025d350d2b623f9 zc.buildout-2.3.1-py2.7.egg
-_b = /Users/tkomiya/work/blockdiag/bin
-_d = /Users/tkomiya/work/blockdiag/develop-eggs
-_e = /Users/tkomiya/.buildout/buildout-eggs
-bin-directory = /Users/tkomiya/work/blockdiag/bin
-develop-eggs-directory = /Users/tkomiya/work/blockdiag/develop-eggs
-eggs = coverage
- flake8
- pylint
-eggs-directory = /Users/tkomiya/.buildout/buildout-eggs
-recipe = zc.recipe.egg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/CHANGES.rst
new/blockdiag-1.5.4/CHANGES.rst
--- old/blockdiag-1.5.3/CHANGES.rst 2015-07-30 16:09:08.000000000 +0200
+++ new/blockdiag-1.5.4/CHANGES.rst 2018-07-22 13:54:05.000000000 +0200
@@ -1,6 +1,12 @@
Changelog
=========
+1.5.4 (2018-07-22)
+------------------
+* Fix bug
+
+ - Fix #94 Python 3.7 compatibility
+
1.5.3 (2015-07-30)
------------------
* Fix bug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/PKG-INFO new/blockdiag-1.5.4/PKG-INFO
--- old/blockdiag-1.5.3/PKG-INFO 2015-07-30 16:09:36.000000000 +0200
+++ new/blockdiag-1.5.4/PKG-INFO 2018-07-22 14:08:01.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: blockdiag
-Version: 1.5.3
+Version: 1.5.4
Summary: blockdiag generates block-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/blockdiag
Description: `blockdiag` generate block-diagram image file from spec-text file.
@@ -140,3 +140,6 @@
Classifier: Topic :: Software Development
Classifier: Topic :: Software Development :: Documentation
Classifier: Topic :: Text Processing :: Markup
+Provides-Extra: testing
+Provides-Extra: rst
+Provides-Extra: pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/a.diag new/blockdiag-1.5.4/a.diag
--- old/blockdiag-1.5.3/a.diag 2015-07-28 12:35:40.000000000 +0200
+++ new/blockdiag-1.5.4/a.diag 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-{
- A -> B;
- C [width = 200, shape = roundedbox];
- A [label = "hello\n\nwolrd hello world hello world"];
- A;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/b.diag new/blockdiag-1.5.4/b.diag
--- old/blockdiag-1.5.3/b.diag 2014-07-30 12:51:35.000000000 +0200
+++ new/blockdiag-1.5.4/b.diag 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-{
- A -> B -> C;
- D -> E;
-
- A, B [shape = circle];
- E [shape = square];
- pgqywz
-}
Binary files old/blockdiag-1.5.3/b.png and new/blockdiag-1.5.4/b.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/blockdiag.svg
new/blockdiag-1.5.4/blockdiag.svg
--- old/blockdiag-1.5.3/blockdiag.svg 2015-07-30 03:37:29.000000000 +0200
+++ new/blockdiag-1.5.4/blockdiag.svg 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
-<svg viewBox="0 0 448 280" xmlns="http://www.w3.org/2000/svg";
xmlns:inkspace="http://www.inkscape.org/namespaces/inkscape";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <defs id="defs_block">
- <filter height="1.504" id="filter_blur" inkspace:collect="always"
width="1.1575" x="-0.07875" y="-0.252">
- <feGaussianBlur id="feGaussianBlur3780" inkspace:collect="always"
stdDeviation="4.2" />
- </filter>
- </defs>
- <title>blockdiag</title>
- <desc>blockdiag { default_node_color = lightyellow; default_group_color =
red; default_linecolor = blue; default_textcolor = black;
-A[href="http://google.com";]; A[color = "lightgreen"]; A[numbered = 007];
-A -> B -> C; B -> D; group { A;C; } }
-</desc>
- <rect fill="rgb(255,0,0)" height="140" style="filter:url(#filter_blur)"
width="144" x="248" y="30" />
- <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)"
style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67"
y="46" />
- <a xlink:href="http://google.com";>
- <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)"
style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259"
y="46" />
- </a>
- <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)"
style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259"
y="126" />
- <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)"
style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259"
y="206" />
- <rect fill="rgb(255,255,224)" height="40" stroke="rgb(0,0,255)" width="128"
x="64" y="40" />
- <text fill="rgb(0,0,0)" font-family="sans-serif" font-size="11"
font-style="normal" font-weight="normal" text-anchor="middle" textLength="8"
x="128" y="66">B</text>
- <a xlink:href="http://google.com";>
- <rect fill="rgb(144,238,144)" height="40" stroke="rgb(0,0,255)"
width="128" x="256" y="40" />
- <text fill="rgb(0,0,0)" font-family="sans-serif" font-size="11"
font-style="normal" font-weight="normal" text-anchor="middle" textLength="9"
x="320" y="65">A</text>
- <ellipse cx="256" cy="40" fill="pink" rx="12" ry="12"
stroke="rgb(0,0,255)" />
- <text fill="rgb(0,0,0)" font-family="sans-serif" font-size="11"
font-style="normal" font-weight="normal" text-anchor="middle" textLength="22"
x="256" y="45">007</text>
- </a>
- <rect fill="rgb(255,255,224)" height="40" stroke="rgb(0,0,255)" width="128"
x="256" y="120" />
- <text fill="rgb(0,0,0)" font-family="sans-serif" font-size="11"
font-style="normal" font-weight="normal" text-anchor="middle" textLength="9"
x="320" y="145">C</text>
- <rect fill="rgb(255,255,224)" height="40" stroke="rgb(0,0,255)" width="128"
x="256" y="200" />
- <text fill="rgb(0,0,0)" font-family="sans-serif" font-size="11"
font-style="normal" font-weight="normal" text-anchor="middle" textLength="9"
x="320" y="226">D</text>
- <path d="M 192 60 L 224 60" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 224 60 L 224 140" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 224 140 L 248 140" fill="none" stroke="rgb(0,0,255)" />
- <polygon fill="rgb(0,0,255)" points="255,140 248,136 248,144 255,140"
stroke="rgb(0,0,255)" />
- <path d="M 192 60 L 224 60" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 224 60 L 224 220" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 224 220 L 248 220" fill="none" stroke="rgb(0,0,255)" />
- <polygon fill="rgb(0,0,255)" points="255,220 248,216 248,224 255,220"
stroke="rgb(0,0,255)" />
- <path d="M 384 60 L 400 60" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 400 60 L 400 25" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 128 25 L 400 25" fill="none" stroke="rgb(0,0,255)" />
- <path d="M 128 25 L 128 32" fill="none" stroke="rgb(0,0,255)" />
- <polygon fill="rgb(0,0,255)" points="128,39 124,32 132,32 128,39"
stroke="rgb(0,0,255)" />
-</svg>
Binary files old/blockdiag-1.5.3/bootstrap.pyc and
new/blockdiag-1.5.4/bootstrap.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/c.diag new/blockdiag-1.5.4/c.diag
--- old/blockdiag-1.5.3/c.diag 2012-02-29 02:13:44.000000000 +0100
+++ new/blockdiag-1.5.4/c.diag 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-{
- A -> B -> C -> D, E -> F, G -> C;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/e.diag new/blockdiag-1.5.4/e.diag
--- old/blockdiag-1.5.3/e.diag 2013-11-01 06:29:20.000000000 +0100
+++ new/blockdiag-1.5.4/e.diag 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-{
- plugin autoclass;
- default_shape = circle;
- A -> B;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/setup.cfg
new/blockdiag-1.5.4/setup.cfg
--- old/blockdiag-1.5.3/setup.cfg 2015-07-30 16:09:36.000000000 +0200
+++ new/blockdiag-1.5.4/setup.cfg 2018-07-22 14:08:01.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/blockdiag-1.5.3/setup.py new/blockdiag-1.5.4/setup.py
--- old/blockdiag-1.5.3/setup.py 2015-05-13 08:05:31.000000000 +0200
+++ new/blockdiag-1.5.4/setup.py 2018-07-22 14:07:36.000000000 +0200
@@ -51,7 +51,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/blockdiag',
license='Apache License 2.0',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/__init__.py
new/blockdiag-1.5.4/src/blockdiag/__init__.py
--- old/blockdiag-1.5.3/src/blockdiag/__init__.py 2015-07-30
16:09:17.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/__init__.py 2018-07-22
13:53:15.000000000 +0200
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-__version__ = '1.5.3'
+__version__ = '1.5.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/__init__.py
new/blockdiag-1.5.4/src/blockdiag/tests/__init__.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/__init__.py 2015-04-25
16:39:08.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/__init__.py 2018-07-22
13:48:38.000000000 +0200
@@ -1 +1,14 @@
# -*- 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/rst/__init__.py
new/blockdiag-1.5.4/src/blockdiag/tests/rst/__init__.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/rst/__init__.py 2015-04-25
16:39:08.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/rst/__init__.py 2018-07-22
13:48:38.000000000 +0200
@@ -1 +1,14 @@
# -*- 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/rst/test_base_directives.py
new/blockdiag-1.5.4/src/blockdiag/tests/rst/test_base_directives.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/rst/test_base_directives.py
2015-02-21 10:39:24.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/rst/test_base_directives.py
2018-07-22 13:48:38.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 io
import os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/rst/test_blockdiag_directives.py
new/blockdiag-1.5.4/src/blockdiag/tests/rst/test_blockdiag_directives.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/rst/test_blockdiag_directives.py
2015-02-21 10:38:55.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/rst/test_blockdiag_directives.py
2018-07-22 13:48:38.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 sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_boot_params.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_boot_params.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_boot_params.py 2015-02-21
10:41:40.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_boot_params.py 2018-07-22
13:48:38.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 io
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/test_builder.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder.py 2014-06-07
06:48:18.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder.py 2018-07-22
13:48:38.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.
from blockdiag.tests.utils import BuilderTestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_edge.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_edge.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_edge.py
2013-11-03 07:53:57.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_edge.py
2018-07-22 13:48:38.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.
from blockdiag.tests.utils import BuilderTestCase, capture_stderr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_errors.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_errors.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_errors.py
2013-12-10 08:15:46.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_errors.py
2018-07-22 13:48:38.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.
from blockdiag.tests.utils import BuilderTestCase
from blockdiag.parser import ParseException
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_group.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_group.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_group.py
2013-09-24 14:18:34.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_group.py
2018-07-22 13:48:38.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.
from blockdiag.tests.utils import BuilderTestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_node.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_node.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_node.py
2014-07-12 13:23:53.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_node.py
2018-07-22 13:48:38.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.
from collections import defaultdict
from blockdiag.tests.utils import BuilderTestCase
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_separate.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_separate.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_builder_separate.py
2013-09-26 09:44:34.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_builder_separate.py
2018-07-22 13:48:38.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.
from __future__ import print_function
from blockdiag.builder import SeparateDiagramBuilder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/test_command.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_command.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_command.py 2015-02-21
10:41:26.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_command.py 2018-07-22
13:48:38.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 sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_generate_diagram.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_generate_diagram.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_generate_diagram.py
2015-02-21 10:40:48.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_generate_diagram.py
2018-07-22 13:48:38.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 re
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_imagedraw_textfolder.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_imagedraw_textfolder.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_imagedraw_textfolder.py
2015-02-21 10:41:57.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_imagedraw_textfolder.py
2018-07-22 13:48:38.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 sys
from blockdiag.imagedraw.textfolder import splitlabel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_imagedraw_utils.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_imagedraw_utils.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_imagedraw_utils.py
2015-02-21 10:41:12.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_imagedraw_utils.py
2018-07-22 13:48:38.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 sys
from blockdiag.imagedraw.utils import (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/test_parser.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_parser.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_parser.py 2015-02-21
10:40:03.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_parser.py 2018-07-22
13:48:38.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.
from __future__ import print_function
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/test_utils.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_utils.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_utils.py 2015-02-21
10:40:28.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_utils.py 2018-07-22
13:48:38.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 sys
from blockdiag.utils import Size, unquote
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/blockdiag-1.5.3/src/blockdiag/tests/test_utils_fontmap.py
new/blockdiag-1.5.4/src/blockdiag/tests/test_utils_fontmap.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/test_utils_fontmap.py
2015-02-21 10:38:44.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/test_utils_fontmap.py
2018-07-22 13:48:38.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 sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/tests/utils.py
new/blockdiag-1.5.4/src/blockdiag/tests/utils.py
--- old/blockdiag-1.5.3/src/blockdiag/tests/utils.py 2015-02-21
10:39:51.000000000 +0100
+++ new/blockdiag-1.5.4/src/blockdiag/tests/utils.py 2018-07-22
13:48:38.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.
from __future__ import print_function
import os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag/utils/myitertools.py
new/blockdiag-1.5.4/src/blockdiag/utils/myitertools.py
--- old/blockdiag-1.5.3/src/blockdiag/utils/myitertools.py 2013-10-17
08:38:47.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag/utils/myitertools.py 2018-07-22
13:48:38.000000000 +0200
@@ -14,33 +14,40 @@
# limitations under the License.
from itertools import cycle
+from itertools import islice
def istep(seq, step=2):
iterable = iter(seq)
while True:
- yield [next(iterable) for _ in range(step)]
+ item = list(islice(iterable, step))
+ if len(item) < step:
+ break
+ yield item
def stepslice(iterable, steps):
- iterable = iter(iterable)
- step = cycle(steps)
+ try:
+ iterable = iter(iterable)
+ step = cycle(steps)
+
+ while True:
+ # skip (1)
+ n = next(step)
+ if n == 0:
+ pass
+ elif n == 1:
+ o = next(iterable)
+ yield o
+ yield o
+ else:
+ yield next(iterable)
+ for _ in range(n - 2):
+ next(iterable)
+ yield next(iterable)
- while True:
- # skip (1)
- n = next(step)
- if n == 0:
- pass
- elif n == 1:
- o = next(iterable)
- yield o
- yield o
- else:
- yield next(iterable)
- for _ in range(n - 2):
+ # skip (2)
+ for _ in range(next(step)):
next(iterable)
- yield next(iterable)
-
- # skip (2)
- for _ in range(next(step)):
- next(iterable)
+ except StopIteration:
+ return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag.egg-info/PKG-INFO
new/blockdiag-1.5.4/src/blockdiag.egg-info/PKG-INFO
--- old/blockdiag-1.5.3/src/blockdiag.egg-info/PKG-INFO 2015-07-30
16:09:31.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag.egg-info/PKG-INFO 2018-07-22
14:07:59.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: blockdiag
-Version: 1.5.3
+Version: 1.5.4
Summary: blockdiag generates block-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/blockdiag
Description: `blockdiag` generate block-diagram image file from spec-text file.
@@ -140,3 +140,6 @@
Classifier: Topic :: Software Development
Classifier: Topic :: Software Development :: Documentation
Classifier: Topic :: Text Processing :: Markup
+Provides-Extra: testing
+Provides-Extra: rst
+Provides-Extra: pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/src/blockdiag.egg-info/SOURCES.txt
new/blockdiag-1.5.4/src/blockdiag.egg-info/SOURCES.txt
--- old/blockdiag-1.5.3/src/blockdiag.egg-info/SOURCES.txt 2015-07-30
16:09:31.000000000 +0200
+++ new/blockdiag-1.5.4/src/blockdiag.egg-info/SOURCES.txt 2018-07-22
14:08:00.000000000 +0200
@@ -1,23 +1,12 @@
-.hgignore
-.hgtags
-.installed.cfg
CHANGES.rst
LICENSE
MANIFEST.in
README.rst
-a.diag
-b.diag
-b.png
blockdiag.1
-blockdiag.svg
bootstrap.py
-bootstrap.pyc
buildout.cfg
-c.diag
-e.diag
setup.cfg
setup.py
-test.sh
tox.ini
examples/blockdiagrc
examples/group.diag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/test.sh new/blockdiag-1.5.4/test.sh
--- old/blockdiag-1.5.3/test.sh 2015-06-07 08:19:14.000000000 +0200
+++ new/blockdiag-1.5.4/test.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-bin/blockdiag --debug -Tsvg -o blockdiag.svg $1 $2 $3 $4 $5
-#bin/blockdiag --debug -Tpng -o blockdiag.png $1 $2 $3 $4 $5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/blockdiag-1.5.3/tox.ini new/blockdiag-1.5.4/tox.ini
--- old/blockdiag-1.5.3/tox.ini 2015-05-18 06:51:54.000000000 +0200
+++ new/blockdiag-1.5.4/tox.ini 2018-07-22 13:48:38.000000000 +0200
@@ -7,6 +7,7 @@
mock
flake8
flake8-coding
+ flake8-copyright
docutils
reportlab
wand
