Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-actdiag for openSUSE:Factory 
checked in at 2022-08-05 19:51:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-actdiag (Old)
 and      /work/SRC/openSUSE:Factory/.python-actdiag.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-actdiag"

Fri Aug  5 19:51:05 2022 rev:7 rq:993138 version:3.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-actdiag/python-actdiag.changes    
2020-06-10 00:44:08.338293144 +0200
+++ /work/SRC/openSUSE:Factory/.python-actdiag.new.1521/python-actdiag.changes  
2022-08-05 19:52:03.529619557 +0200
@@ -1,0 +2,16 @@
+Thu Aug  4 20:14:27 UTC 2022 - Ben Greiner <[email protected]>
+
+- Fix the requirements
+- Enable tests
+- Don't catchall files
+
+-------------------------------------------------------------------
+Thu Aug  4 08:24:17 UTC 2022 - Otto Hollmann <[email protected]>
+
+- Update to 3.0.0
+  * Drop python3.6 support
+  * Use funcparserlib-1.0.0a0 or newer to support new python versions
+  * Allow to write multiline string via triple quotes (""" ... """)
+  * Fix a bug: Fix #147: file existence disclosure using svg renderer
+
+-------------------------------------------------------------------

Old:
----
  actdiag-2.0.0.tar.gz

New:
----
  actdiag-3.0.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-actdiag.spec ++++++
--- /var/tmp/diff_new_pack.flZ5DP/_old  2022-08-05 19:52:03.949620642 +0200
+++ /var/tmp/diff_new_pack.flZ5DP/_new  2022-08-05 19:52:03.957620662 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package python-actdiag
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,30 +16,26 @@
 #
 
 
-%define skip_python2 1
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-actdiag
-Version:        2.0.0
+Version:        3.0.0
 Release:        0
 Summary:        Text to activity-diagram image generator
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            http://blockdiag.com/
 Source:         
https://files.pythonhosted.org/packages/source/a/actdiag/actdiag-%{version}.tar.gz
+BuildRequires:  %{python_module base >= 3.7}
+BuildRequires:  %{python_module blockdiag >= 3}
+BuildRequires:  %{python_module docutils}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-blockdiag >= 1.5.0
+Requires:       python-blockdiag >= 3
 Requires:       python-setuptools
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 BuildArch:      noarch
-%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 ||  0%{?rhel} >= 8
-Suggests:       python-docutils
-Suggests:       python-nose
-Suggests:       python-pep8 >= 1.3
-Suggests:       python-reportlab
-%endif
 %python_subpackages
 
 %description
@@ -47,6 +43,8 @@
 
 %prep
 %setup -q -n actdiag-%{version}
+# python-blockdiag-nose-to-pytest.patch of python-blockdiag changed the 
function name
+sed -i 's/testcase_generator/_testcase_generator/' 
src/actdiag/tests/test_generate_diagram.py
 
 %build
 %python_build
@@ -56,6 +54,9 @@
 %python_clone -a %{buildroot}%{_bindir}/actdiag
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%check
+%pytest src/actdiag/tests
+
 %post
 %python_install_alternative actdiag
 
@@ -66,6 +67,7 @@
 %license LICENSE
 %doc README.rst
 %python_alternative %{_bindir}/actdiag
-%{python_sitelib}/*
+%{python_sitelib}/actdiag
+%{python_sitelib}/actdiag-%{version}*-info
 
 %changelog

++++++ actdiag-2.0.0.tar.gz -> actdiag-3.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/CHANGES.rst 
new/actdiag-3.0.0/CHANGES.rst
--- old/actdiag-2.0.0/CHANGES.rst       2020-01-26 06:40:59.000000000 +0100
+++ new/actdiag-3.0.0/CHANGES.rst       2021-12-06 17:57:47.000000000 +0100
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+3.0.0 (2021-12-06)
+------------------
+* Drop python3.6 support
+* Use funcparserlib-1.0.0a0 or newer to support new python versions
+* Allow to write multiline string via triple quotes (""" ... """)
+
 2.0.0 (2020-01-26)
 ------------------
 * Drop python2 and python3.4 support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/PKG-INFO new/actdiag-3.0.0/PKG-INFO
--- old/actdiag-2.0.0/PKG-INFO  2020-01-26 06:41:18.458605800 +0100
+++ new/actdiag-3.0.0/PKG-INFO  2021-12-06 17:57:54.484753000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: actdiag
-Version: 2.0.0
+Version: 3.0.0
 Summary: actdiag generates activity-diagram image from text
 Home-page: http://blockdiag.com/
 Author: Takeshi Komiya
@@ -9,103 +9,105 @@
 Download-URL: http://pypi.python.org/pypi/actdiag
 Project-URL: Code, https://github.com/blockdiag/actdiag
 Project-URL: Issue tracker, https://github.com/blockdiag/actdiag/issues
-Description: `actdiag` generate activity-diagram image file from spec-text 
file.
-        
-        .. image:: https://drone.io/bitbucket.org/blockdiag/actdiag/status.png
-           :target: https://drone.io/bitbucket.org/blockdiag/actdiag
-           :alt: drone.io CI build status
-        
-        .. image:: https://pypip.in/v/actdiag/badge.png
-           :target: https://pypi.python.org/pypi/actdiag/
-           :alt: Latest PyPI version
-        
-        .. image:: https://pypip.in/d/actdiag/badge.png
-           :target: https://pypi.python.org/pypi/actdiag/
-           :alt: Number of PyPI downloads
-        
-        
-        Features
-        ========
-        
-        * Generate activity-diagram from dot like text (basic feature).
-        * Multilingualization for node-label (utf-8 only).
-        
-        You can get some examples and generated images on 
-        `blockdiag.com <http://blockdiag.com/actdiag/build/html/index.html>`_ .
-        
-        Setup
-        =====
-        
-        Use easy_install or pip::
-        
-           $ sudo easy_install actdiag
-        
-           Or
-        
-           $ sudo pip actdiag
-        
-        
-        spec-text setting sample
-        ========================
-        
-        Few examples are available.
-        You can get more examples at
-        `blockdiag.com`_ .
-        
-        simple.diag
-        ------------
-        
-        simple.diag is simply define nodes and transitions by dot-like text 
format::
-        
-            diagram {
-              A -> B -> C;
-              lane you {
-                A; B;
-              }
-              lane me {
-                C;
-              }
-            }
-        
-        
-        Usage
-        =====
-        
-        Execute actdiag command::
-        
-           $ actdiag simple.diag
-           $ ls simple.png
-           simple.png
-        
-        
-        Requirements
-        ============
-        * Python 3.5 or later
-        * blockdiag 1.5.0 or later
-        * funcparserlib 0.3.6 or later
-        * reportlab (optional)
-        * wand and imagemagick (optional)
-        * setuptools
-        
-        
-        License
-        =======
-        Apache License 2.0
-        
 Keywords: diagram,generator
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-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: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup
-Requires-Python: >=3.5
+Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 Provides-Extra: rst
 Provides-Extra: testing
+License-File: LICENSE
+
+`actdiag` generate activity-diagram image file from spec-text file.
+
+.. image:: https://drone.io/bitbucket.org/blockdiag/actdiag/status.png
+   :target: https://drone.io/bitbucket.org/blockdiag/actdiag
+   :alt: drone.io CI build status
+
+.. image:: https://pypip.in/v/actdiag/badge.png
+   :target: https://pypi.python.org/pypi/actdiag/
+   :alt: Latest PyPI version
+
+.. image:: https://pypip.in/d/actdiag/badge.png
+   :target: https://pypi.python.org/pypi/actdiag/
+   :alt: Number of PyPI downloads
+
+
+Features
+========
+
+* Generate activity-diagram from dot like text (basic feature).
+* Multilingualization for node-label (utf-8 only).
+
+You can get some examples and generated images on 
+`blockdiag.com <http://blockdiag.com/actdiag/build/html/index.html>`_ .
+
+Setup
+=====
+
+Use easy_install or pip::
+
+   $ sudo easy_install actdiag
+
+   Or
+
+   $ sudo pip actdiag
+
+
+spec-text setting sample
+========================
+
+Few examples are available.
+You can get more examples at
+`blockdiag.com`_ .
+
+simple.diag
+------------
+
+simple.diag is simply define nodes and transitions by dot-like text format::
+
+    diagram {
+      A -> B -> C;
+      lane you {
+        A; B;
+      }
+      lane me {
+        C;
+      }
+    }
+
+
+Usage
+=====
+
+Execute actdiag command::
+
+   $ actdiag simple.diag
+   $ ls simple.png
+   simple.png
+
+
+Requirements
+============
+* Python 3.7 or later
+* blockdiag 1.5.0 or later
+* funcparserlib 0.3.6 or later
+* reportlab (optional)
+* wand and imagemagick (optional)
+* setuptools
+
+
+License
+=======
+Apache License 2.0
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/README.rst new/actdiag-3.0.0/README.rst
--- old/actdiag-2.0.0/README.rst        2020-01-13 11:15:03.000000000 +0100
+++ new/actdiag-3.0.0/README.rst        2021-12-06 17:57:47.000000000 +0100
@@ -69,7 +69,7 @@
 
 Requirements
 ============
-* Python 3.5 or later
+* Python 3.7 or later
 * blockdiag 1.5.0 or later
 * funcparserlib 0.3.6 or later
 * reportlab (optional)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/setup.cfg new/actdiag-3.0.0/setup.cfg
--- old/actdiag-2.0.0/setup.cfg 2020-01-26 06:41:18.459048300 +0100
+++ new/actdiag-3.0.0/setup.cfg 2021-12-06 17:57:54.484753000 +0100
@@ -17,3 +17,5 @@
 max-line-length = 120
 copyright-check = True
 
+[isort]
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/setup.py new/actdiag-3.0.0/setup.py
--- old/actdiag-2.0.0/setup.py  2020-01-26 06:39:10.000000000 +0100
+++ new/actdiag-3.0.0/setup.py  2021-12-06 17:57:47.000000000 +0100
@@ -1,27 +1,37 @@
 # -*- coding: utf-8 -*-
-import sys
-from setuptools import setup, find_packages
+import os
 
-sys.path.insert(0, 'src')
-import actdiag
+from setuptools import find_packages, setup
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: System Administrators",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Topic :: Software Development",
     "Topic :: Software Development :: Documentation",
     "Topic :: Text Processing :: Markup",
 ]
 
+
+def get_version():
+    """Get version number of the package from version.py without importing 
core module."""
+    package_dir = os.path.abspath(os.path.dirname(__file__))
+    version_file = os.path.join(package_dir, 'src/actdiag/__init__.py')
+
+    namespace = {}
+    with open(version_file, 'r') as f:
+        exec(f.read(), namespace)
+
+    return namespace['__version__']
+
+
 setup(
     name='actdiag',
-    version=actdiag.__version__,
+    version=get_version(),
     description='actdiag generates activity-diagram image from text',
     long_description=open("README.rst").read(),
     long_description_content_type='text/x-rst',
@@ -36,13 +46,12 @@
         "Issue tracker": "https://github.com/blockdiag/actdiag/issues";,
     },
     license='Apache License 2.0',
-    py_modules=['actdiag_sphinxhelper'],
     packages=find_packages('src'),
     package_dir={'': 'src'},
     package_data={'': ['buildout.cfg']},
     include_package_data=True,
-    python_requires=">=3.5",
-    install_requires=['blockdiag >= 1.5.0'],
+    python_requires=">=3.7",
+    install_requires=['blockdiag >= 3.0.0'],
     extras_require=dict(
         rst=[
             'docutils',
@@ -55,6 +64,7 @@
             'flake8',
             'flake8-coding',
             'flake8-copyright',
+            'flake8-isort',
         ],
     ),
     test_suite='nose.collector',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/__init__.py 
new/actdiag-3.0.0/src/actdiag/__init__.py
--- old/actdiag-2.0.0/src/actdiag/__init__.py   2020-01-26 06:40:13.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/__init__.py   2021-12-06 17:57:47.000000000 
+0100
@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = '2.0.0'
+__version__ = '3.0.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/builder.py 
new/actdiag-3.0.0/src/actdiag/builder.py
--- old/actdiag-2.0.0/src/actdiag/builder.py    2020-01-13 11:28:33.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/builder.py    2021-12-06 17:57:47.000000000 
+0100
@@ -14,11 +14,13 @@
 #  limitations under the License.
 
 from __future__ import print_function
-from actdiag import parser
-from actdiag.elements import (Diagram, DiagramNode, DiagramEdge, NodeGroup)
-from blockdiag.utils import unquote, XY
+
+from blockdiag.utils import XY, unquote
 from blockdiag.utils.compat import cmp_to_key
 
+from actdiag import parser
+from actdiag.elements import Diagram, DiagramEdge, DiagramNode, NodeGroup
+
 
 class DiagramTreeBuilder(object):
     def build(self, tree):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/command.py 
new/actdiag-3.0.0/src/actdiag/command.py
--- old/actdiag-2.0.0/src/actdiag/command.py    2020-01-13 11:28:33.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/command.py    2021-12-06 17:57:47.000000000 
+0100
@@ -14,11 +14,13 @@
 #  limitations under the License.
 
 import sys
+
+from blockdiag.utils.bootstrap import Application
+
 import actdiag
 import actdiag.builder
 import actdiag.drawer
 import actdiag.parser
-from blockdiag.utils.bootstrap import Application
 
 
 class ActdiagApp(Application):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/drawer.py 
new/actdiag-3.0.0/src/actdiag/drawer.py
--- old/actdiag-2.0.0/src/actdiag/drawer.py     2020-01-13 11:28:33.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/drawer.py     2021-12-06 17:57:47.000000000 
+0100
@@ -14,6 +14,7 @@
 #  limitations under the License.
 
 import blockdiag.drawer
+
 from actdiag.metrics import DiagramMetrics
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/metrics.py 
new/actdiag-3.0.0/src/actdiag/metrics.py
--- old/actdiag-2.0.0/src/actdiag/metrics.py    2020-01-13 11:28:33.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/metrics.py    2021-12-06 17:57:47.000000000 
+0100
@@ -14,9 +14,12 @@
 #  limitations under the License.
 
 from __future__ import division
+
 from collections import namedtuple
+
 import blockdiag.metrics
-from blockdiag.utils import Box, XY
+from blockdiag.utils import XY, Box
+
 from actdiag import elements
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/parser.py 
new/actdiag-3.0.0/src/actdiag/parser.py
--- old/actdiag-2.0.0/src/actdiag/parser.py     2020-01-13 11:28:33.000000000 
+0100
+++ new/actdiag-3.0.0/src/actdiag/parser.py     2021-12-06 17:57:47.000000000 
+0100
@@ -36,12 +36,12 @@
 '''
 
 import io
-from re import MULTILINE, DOTALL
 from collections import namedtuple
-from funcparserlib.lexer import make_tokenizer, Token, LexerError
-from funcparserlib.parser import (some, a, maybe, many, finished, skip)
-from blockdiag.parser import create_mapper, oneplus_to_list
+from re import DOTALL, MULTILINE
 
+from blockdiag.parser import create_mapper, oneplus_to_list
+from funcparserlib.lexer import LexerError, Token, make_tokenizer
+from funcparserlib.parser import a, finished, many, maybe, skip, some
 
 Diagram = namedtuple('Diagram', 'id stmts')
 Lane = namedtuple('Lane', 'id stmts')
@@ -68,7 +68,7 @@
                      '[A-Za-z_\\-.0-9\u0080-\uffff]*',)),               # NOQA
         ('Op',      (r'[{};,=\[\]]|(<->)|(<-)|(--)|(->)',)),            # NOQA
         ('Number',  (r'-?(\.[0-9]+)|([0-9]+(\.[0-9]*)?)',)),            # NOQA
-        ('String',  (r'(?P<quote>"|\').*?(?<!\\)(?P=quote)', DOTALL)),  # NOQA
+        ('String',  (r'(?P<quote>(""")|(\'\'\')|"|\').*?(?<!\\)(?P=quote)', 
DOTALL)),  # NOQA
     ]
     useless = ['Comment', 'NL', 'Space']
     t = make_tokenizer(specs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/plugins/autolane.py 
new/actdiag-3.0.0/src/actdiag/plugins/autolane.py
--- old/actdiag-2.0.0/src/actdiag/plugins/autolane.py   2020-01-13 
11:28:33.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag/plugins/autolane.py   2021-12-06 
17:57:47.000000000 +0100
@@ -14,6 +14,7 @@
 #  limitations under the License.
 
 import re
+
 from blockdiag import plugins
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/actdiag-2.0.0/src/actdiag/tests/test_generate_diagram.py 
new/actdiag-3.0.0/src/actdiag/tests/test_generate_diagram.py
--- old/actdiag-2.0.0/src/actdiag/tests/test_generate_diagram.py        
2020-01-13 11:28:33.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag/tests/test_generate_diagram.py        
2021-12-06 17:57:47.000000000 +0100
@@ -14,10 +14,11 @@
 #  limitations under the License.
 
 import os
+
+from blockdiag.tests.test_generate_diagram import (get_diagram_files,
+                                                   testcase_generator)
+
 import actdiag.command
-from blockdiag.tests.test_generate_diagram import (
-    get_diagram_files, testcase_generator
-)
 
 
 def test_generate():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/actdiag-2.0.0/src/actdiag/tests/test_rst_directives.py 
new/actdiag-3.0.0/src/actdiag/tests/test_rst_directives.py
--- old/actdiag-2.0.0/src/actdiag/tests/test_rst_directives.py  2020-01-13 
11:31:36.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag/tests/test_rst_directives.py  2021-12-06 
17:57:47.000000000 +0100
@@ -15,16 +15,14 @@
 
 import os
 import sys
+import unittest
+
+from blockdiag.tests.utils import TemporaryDirectory, capture_stderr, with_pil
 from docutils import nodes
 from docutils.core import publish_doctree
 from docutils.parsers.rst import directives as docutils
-from actdiag.utils.rst import directives
-from blockdiag.tests.utils import capture_stderr, with_pil, TemporaryDirectory
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest
-else:
-    import unittest
+from actdiag.utils.rst import directives
 
 
 class TestRstDirectives(unittest.TestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/utils/rst/directives.py 
new/actdiag-3.0.0/src/actdiag/utils/rst/directives.py
--- old/actdiag-2.0.0/src/actdiag/utils/rst/directives.py       2020-01-13 
11:28:33.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag/utils/rst/directives.py       2021-12-06 
17:57:47.000000000 +0100
@@ -13,10 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from docutils.parsers import rst
-from actdiag.utils.rst.nodes import actdiag as actdiag_node
 from blockdiag.utils.rst import directives
+from docutils.parsers import rst
 
+from actdiag.utils.rst.nodes import actdiag as actdiag_node
 
 directive_options_default = dict(format='PNG',
                                  antialias=False,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag/utils/rst/nodes.py 
new/actdiag-3.0.0/src/actdiag/utils/rst/nodes.py
--- old/actdiag-2.0.0/src/actdiag/utils/rst/nodes.py    2020-01-13 
11:28:33.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag/utils/rst/nodes.py    2021-12-06 
17:57:47.000000000 +0100
@@ -13,10 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import actdiag.parser
+from blockdiag.utils.rst import nodes
+
 import actdiag.builder
 import actdiag.drawer
-from blockdiag.utils.rst import nodes
+import actdiag.parser
 
 
 class actdiag(nodes.blockdiag):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag.egg-info/PKG-INFO 
new/actdiag-3.0.0/src/actdiag.egg-info/PKG-INFO
--- old/actdiag-2.0.0/src/actdiag.egg-info/PKG-INFO     2020-01-26 
06:41:18.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag.egg-info/PKG-INFO     2021-12-06 
17:57:54.000000000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: actdiag
-Version: 2.0.0
+Version: 3.0.0
 Summary: actdiag generates activity-diagram image from text
 Home-page: http://blockdiag.com/
 Author: Takeshi Komiya
@@ -9,103 +9,105 @@
 Download-URL: http://pypi.python.org/pypi/actdiag
 Project-URL: Code, https://github.com/blockdiag/actdiag
 Project-URL: Issue tracker, https://github.com/blockdiag/actdiag/issues
-Description: `actdiag` generate activity-diagram image file from spec-text 
file.
-        
-        .. image:: https://drone.io/bitbucket.org/blockdiag/actdiag/status.png
-           :target: https://drone.io/bitbucket.org/blockdiag/actdiag
-           :alt: drone.io CI build status
-        
-        .. image:: https://pypip.in/v/actdiag/badge.png
-           :target: https://pypi.python.org/pypi/actdiag/
-           :alt: Latest PyPI version
-        
-        .. image:: https://pypip.in/d/actdiag/badge.png
-           :target: https://pypi.python.org/pypi/actdiag/
-           :alt: Number of PyPI downloads
-        
-        
-        Features
-        ========
-        
-        * Generate activity-diagram from dot like text (basic feature).
-        * Multilingualization for node-label (utf-8 only).
-        
-        You can get some examples and generated images on 
-        `blockdiag.com <http://blockdiag.com/actdiag/build/html/index.html>`_ .
-        
-        Setup
-        =====
-        
-        Use easy_install or pip::
-        
-           $ sudo easy_install actdiag
-        
-           Or
-        
-           $ sudo pip actdiag
-        
-        
-        spec-text setting sample
-        ========================
-        
-        Few examples are available.
-        You can get more examples at
-        `blockdiag.com`_ .
-        
-        simple.diag
-        ------------
-        
-        simple.diag is simply define nodes and transitions by dot-like text 
format::
-        
-            diagram {
-              A -> B -> C;
-              lane you {
-                A; B;
-              }
-              lane me {
-                C;
-              }
-            }
-        
-        
-        Usage
-        =====
-        
-        Execute actdiag command::
-        
-           $ actdiag simple.diag
-           $ ls simple.png
-           simple.png
-        
-        
-        Requirements
-        ============
-        * Python 3.5 or later
-        * blockdiag 1.5.0 or later
-        * funcparserlib 0.3.6 or later
-        * reportlab (optional)
-        * wand and imagemagick (optional)
-        * setuptools
-        
-        
-        License
-        =======
-        Apache License 2.0
-        
 Keywords: diagram,generator
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-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: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup
-Requires-Python: >=3.5
+Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 Provides-Extra: rst
 Provides-Extra: testing
+License-File: LICENSE
+
+`actdiag` generate activity-diagram image file from spec-text file.
+
+.. image:: https://drone.io/bitbucket.org/blockdiag/actdiag/status.png
+   :target: https://drone.io/bitbucket.org/blockdiag/actdiag
+   :alt: drone.io CI build status
+
+.. image:: https://pypip.in/v/actdiag/badge.png
+   :target: https://pypi.python.org/pypi/actdiag/
+   :alt: Latest PyPI version
+
+.. image:: https://pypip.in/d/actdiag/badge.png
+   :target: https://pypi.python.org/pypi/actdiag/
+   :alt: Number of PyPI downloads
+
+
+Features
+========
+
+* Generate activity-diagram from dot like text (basic feature).
+* Multilingualization for node-label (utf-8 only).
+
+You can get some examples and generated images on 
+`blockdiag.com <http://blockdiag.com/actdiag/build/html/index.html>`_ .
+
+Setup
+=====
+
+Use easy_install or pip::
+
+   $ sudo easy_install actdiag
+
+   Or
+
+   $ sudo pip actdiag
+
+
+spec-text setting sample
+========================
+
+Few examples are available.
+You can get more examples at
+`blockdiag.com`_ .
+
+simple.diag
+------------
+
+simple.diag is simply define nodes and transitions by dot-like text format::
+
+    diagram {
+      A -> B -> C;
+      lane you {
+        A; B;
+      }
+      lane me {
+        C;
+      }
+    }
+
+
+Usage
+=====
+
+Execute actdiag command::
+
+   $ actdiag simple.diag
+   $ ls simple.png
+   simple.png
+
+
+Requirements
+============
+* Python 3.7 or later
+* blockdiag 1.5.0 or later
+* funcparserlib 0.3.6 or later
+* reportlab (optional)
+* wand and imagemagick (optional)
+* setuptools
+
+
+License
+=======
+Apache License 2.0
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag.egg-info/SOURCES.txt 
new/actdiag-3.0.0/src/actdiag.egg-info/SOURCES.txt
--- old/actdiag-2.0.0/src/actdiag.egg-info/SOURCES.txt  2020-01-26 
06:41:18.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag.egg-info/SOURCES.txt  2021-12-06 
17:57:54.000000000 +0100
@@ -6,7 +6,6 @@
 setup.cfg
 setup.py
 tox.ini
-src/actdiag_sphinxhelper.py
 src/actdiag/__init__.py
 src/actdiag/builder.py
 src/actdiag/command.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag.egg-info/requires.txt 
new/actdiag-3.0.0/src/actdiag.egg-info/requires.txt
--- old/actdiag-2.0.0/src/actdiag.egg-info/requires.txt 2020-01-26 
06:41:18.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag.egg-info/requires.txt 2021-12-06 
17:57:54.000000000 +0100
@@ -1,4 +1,4 @@
-blockdiag>=1.5.0
+blockdiag>=3.0.0
 
 [rst]
 docutils
@@ -11,3 +11,4 @@
 flake8
 flake8-coding
 flake8-copyright
+flake8-isort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag.egg-info/top_level.txt 
new/actdiag-3.0.0/src/actdiag.egg-info/top_level.txt
--- old/actdiag-2.0.0/src/actdiag.egg-info/top_level.txt        2020-01-26 
06:41:18.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag.egg-info/top_level.txt        2021-12-06 
17:57:54.000000000 +0100
@@ -1,2 +1 @@
 actdiag
-actdiag_sphinxhelper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/src/actdiag_sphinxhelper.py 
new/actdiag-3.0.0/src/actdiag_sphinxhelper.py
--- old/actdiag-2.0.0/src/actdiag_sphinxhelper.py       2020-01-13 
11:28:33.000000000 +0100
+++ new/actdiag-3.0.0/src/actdiag_sphinxhelper.py       1970-01-01 
01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-# -*- 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 actdiag.parser
-import actdiag.builder
-import actdiag.drawer
-import actdiag.utils.rst.nodes
-import actdiag.utils.rst.directives
-import blockdiag.utils.bootstrap
-import blockdiag.utils.fontmap
-
-core = actdiag
-utils = actdiag.utils
-utils.bootstrap = blockdiag.utils.bootstrap
-utils.fontmap = blockdiag.utils.fontmap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/actdiag-2.0.0/tox.ini new/actdiag-3.0.0/tox.ini
--- old/actdiag-2.0.0/tox.ini   2020-01-13 11:31:14.000000000 +0100
+++ new/actdiag-3.0.0/tox.ini   2021-12-06 17:57:47.000000000 +0100
@@ -1,5 +1,5 @@
 [tox]
-envlist=py35,py36,py37,py38,blockdiag_dev
+envlist=py37,py38,py39,flake8,blockdiag_dev
 
 [testenv]
 usedevelop = True
@@ -9,16 +9,14 @@
     ALL_TESTS
 commands=
     nosetests
-    flake8 src
-
 
-[testenv:py26]
-deps=
-    nose
-    flake8
-    docutils
-    reportlab
-    unittest2
+[testenv:flake8]
+description =
+    Run style checks.
+extras =
+    testing
+commands =
+    flake8 src
 
 [testenv:blockdiag_dev]
 deps=

Reply via email to