Hello community,
here is the log from the commit of package python-actdiag for
openSUSE:Leap:15.2 checked in at 2020-03-13 10:57:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-actdiag (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-actdiag.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-actdiag"
Fri Mar 13 10:57:52 2020 rev:13 rq:783423 version:2.0.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/python-actdiag/python-actdiag.changes
2020-03-09 18:02:02.560718541 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-actdiag.new.3160/python-actdiag.changes
2020-03-13 10:59:13.896514097 +0100
@@ -1,0 +2,6 @@
+Tue Feb 25 15:57:30 UTC 2020 - Thomas Bechtold <[email protected]>
+
+- update to 2.0.0:
+ * Drop python2 and python3.4 support
+
+-------------------------------------------------------------------
Old:
----
actdiag-0.5.4.tar.gz
New:
----
actdiag-2.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-actdiag.spec ++++++
--- /var/tmp/diff_new_pack.K2oyWr/_old 2020-03-13 10:59:14.252514351 +0100
+++ /var/tmp/diff_new_pack.K2oyWr/_new 2020-03-13 10:59:14.260514356 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-actdiag
#
-# Copyright (c) 2019 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,14 +16,15 @@
#
+%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-actdiag
-Version: 0.5.4
+Version: 2.0.0
Release: 0
Summary: Text to activity-diagram image generator
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://blockdiag.com/
+URL: http://blockdiag.com/
Source:
https://files.pythonhosted.org/packages/source/a/actdiag/actdiag-%{version}.tar.gz
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
++++++ actdiag-0.5.4.tar.gz -> actdiag-2.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/CHANGES.rst
new/actdiag-2.0.0/CHANGES.rst
--- old/actdiag-0.5.4/CHANGES.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/actdiag-2.0.0/CHANGES.rst 2020-01-26 06:40:59.000000000 +0100
@@ -0,0 +1,139 @@
+Changelog
+=========
+
+2.0.0 (2020-01-26)
+------------------
+* Drop python2 and python3.4 support
+
+0.5.4 (2015-01-01)
+------------------
+* Follow blockdiag-1.5.0 interface
+
+0.5.3 (2014-07-02)
+------------------
+* Change interface of docutils node (for sphinxcontrib module)
+
+0.5.2 (2014-06-24)
+------------------
+* Add options to blockdiag directive (docutils extension)
+ - :width:
+ - :height:
+ - :scale:
+ - :align:
+ - :name:
+ - :class:
+ - :figwidth:
+ - :figclass:
+
+0.5.1 (2013-10-22)
+------------------
+* Fix bugs
+
+0.5.0 (2013-10-05)
+------------------
+* Support python 3.2 and 3.3 (thanks to @masayuko)
+* Drop supports for python 2.4 and 2.5
+* Replace dependency: PIL -> Pillow
+
+0.4.3 (2013-02-10)
+------------------
+* Fix bugs
+
+0.4.2 (2013-02-10)
+------------------
+* Fix bugs
+
+0.4.1 (2012-10-28)
+------------------
+* Fix bugs
+
+0.4.0 (2012-10-22)
+------------------
+* Optimize algorithm for rendering shadow
+* Add options to docutils directive
+* Fix bugs
+
+0.3.4 (2012-09-29)
+------------------
+* Fix bugs
+
+0.3.3 (2012-04-23)
+------------------
+* Set hyperlinks to header of lanes on SVG image
+* Fill background of lane header with lane.color attribute
+
+0.3.2 (2012-03-15)
+------------------
+* Fix bugs
+
+0.3.1 (2012-02-15)
+------------------
+* Add autolane plugin
+* Update to new package structure (blockdiag >= 1.1.2)
+
+0.3.0 (2011-11-19)
+------------------
+* Add fontfamily attribute for switching fontface
+* Fix bugs
+
+0.2.4 (2011-11-10)
+------------------
+* Fix dependencies (do not depend PIL directly for pillow users)
+
+0.2.3 (2011-11-06)
+------------------
+* Add docutils exetension
+* Fix bugs
+
+0.2.2 (2011-11-01)
+------------------
+* Add class feature (experimental)
+
+0.2.1 (2011-11-01)
+------------------
+* Follow blockdiag-0.9.7 interface
+
+0.2.0 (2011-10-19)
+------------------
+* Follow blockdiag-0.9.5 interface
+
+0.1.9 (2011-10-11)
+------------------
+* Fix bugs
+
+0.1.8 (2011-09-30)
+------------------
+* Add diagram attribute: default_text_color
+
+0.1.7 (2011-07-05)
+------------------
+* Fix bugs
+
+0.1.6 (2011-07-03)
+------------------
+* Support input from stdin
+
+0.1.5 (2011-05-15)
+------------------
+* Fix bugs
+
+0.1.4 (2011-05-14)
+------------------
+* Change license to Apache License 2.0
+* Support blockdiag 0.8.1 core interface
+
+0.1.3 (2011-04-19)
+------------------
+* Fix bugs
+
+0.1.2 (2011-04-11)
+------------------
+* Fix bugs
+
+0.1.1 (2011-04-10)
+------------------
+* Fix bugs
+
+0.1.0 (2011-04-09)
+------------------
+* First release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/MANIFEST.in
new/actdiag-2.0.0/MANIFEST.in
--- old/actdiag-0.5.4/MANIFEST.in 2014-11-15 06:32:38.000000000 +0100
+++ new/actdiag-2.0.0/MANIFEST.in 2020-01-13 11:15:03.000000000 +0100
@@ -1,5 +1,4 @@
-include buildout.cfg
-include bootstrap.py
+include CHANGES.rst
include MANIFEST.in
include README.rst
include LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/PKG-INFO new/actdiag-2.0.0/PKG-INFO
--- old/actdiag-0.5.4/PKG-INFO 2015-01-01 15:53:18.000000000 +0100
+++ new/actdiag-2.0.0/PKG-INFO 2020-01-26 06:41:18.458605800 +0100
@@ -1,12 +1,14 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: actdiag
-Version: 0.5.4
+Version: 2.0.0
Summary: actdiag generates activity-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/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
@@ -78,8 +80,8 @@
Requirements
============
- * Python 2.6, 2.7, 3.2, 3.3, 3.4
- * Pillow 2.2.1 or later
+ * Python 3.5 or later
+ * blockdiag 1.5.0 or later
* funcparserlib 0.3.6 or later
* reportlab (optional)
* wand and imagemagick (optional)
@@ -90,150 +92,20 @@
=======
Apache License 2.0
-
- History
- =======
-
- 0.5.4 (2015-01-01)
- ------------------
- * Follow blockdiag-1.5.0 interface
-
- 0.5.3 (2014-07-02)
- ------------------
- * Change interface of docutils node (for sphinxcontrib module)
-
- 0.5.2 (2014-06-24)
- ------------------
- * Add options to blockdiag directive (docutils extension)
- - :width:
- - :height:
- - :scale:
- - :align:
- - :name:
- - :class:
- - :figwidth:
- - :figclass:
-
- 0.5.1 (2013-10-22)
- ------------------
- * Fix bugs
-
- 0.5.0 (2013-10-05)
- ------------------
- * Support python 3.2 and 3.3 (thanks to @masayuko)
- * Drop supports for python 2.4 and 2.5
- * Replace dependency: PIL -> Pillow
-
- 0.4.3 (2013-02-10)
- ------------------
- * Fix bugs
-
- 0.4.2 (2013-02-10)
- ------------------
- * Fix bugs
-
- 0.4.1 (2012-10-28)
- ------------------
- * Fix bugs
-
- 0.4.0 (2012-10-22)
- ------------------
- * Optimize algorithm for rendering shadow
- * Add options to docutils directive
- * Fix bugs
-
- 0.3.4 (2012-09-29)
- ------------------
- * Fix bugs
-
- 0.3.3 (2012-04-23)
- ------------------
- * Set hyperlinks to header of lanes on SVG image
- * Fill background of lane header with lane.color attribute
-
- 0.3.2 (2012-03-15)
- ------------------
- * Fix bugs
-
- 0.3.1 (2012-02-15)
- ------------------
- * Add autolane plugin
- * Update to new package structure (blockdiag >= 1.1.2)
-
- 0.3.0 (2011-11-19)
- ------------------
- * Add fontfamily attribute for switching fontface
- * Fix bugs
-
- 0.2.4 (2011-11-10)
- ------------------
- * Fix dependencies (do not depend PIL directly for pillow users)
-
- 0.2.3 (2011-11-06)
- ------------------
- * Add docutils exetension
- * Fix bugs
-
- 0.2.2 (2011-11-01)
- ------------------
- * Add class feature (experimental)
-
- 0.2.1 (2011-11-01)
- ------------------
- * Follow blockdiag-0.9.7 interface
-
- 0.2.0 (2011-10-19)
- ------------------
- * Follow blockdiag-0.9.5 interface
-
- 0.1.9 (2011-10-11)
- ------------------
- * Fix bugs
-
- 0.1.8 (2011-09-30)
- ------------------
- * Add diagram attribute: default_text_color
-
- 0.1.7 (2011-07-05)
- ------------------
- * Fix bugs
-
- 0.1.6 (2011-07-03)
- ------------------
- * Support input from stdin
-
- 0.1.5 (2011-05-15)
- ------------------
- * Fix bugs
-
- 0.1.4 (2011-05-14)
- ------------------
- * Change license to Apache License 2.0
- * Support blockdiag 0.8.1 core interface
-
- 0.1.3 (2011-04-19)
- ------------------
- * Fix bugs
-
- 0.1.2 (2011-04-11)
- ------------------
- * Fix bugs
-
- 0.1.1 (2011-04-10)
- ------------------
- * Fix bugs
-
- 0.1.0 (2011-04-09)
- ------------------
- * First release
-
-
Keywords: diagram,generator
Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
+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: Topic :: Software Development
Classifier: Topic :: Software Development :: Documentation
Classifier: Topic :: Text Processing :: Markup
+Requires-Python: >=3.5
+Description-Content-Type: text/x-rst
+Provides-Extra: rst
+Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/README.rst new/actdiag-2.0.0/README.rst
--- old/actdiag-0.5.4/README.rst 2014-12-31 16:22:39.000000000 +0100
+++ new/actdiag-2.0.0/README.rst 2020-01-13 11:15:03.000000000 +0100
@@ -69,8 +69,8 @@
Requirements
============
-* Python 2.6, 2.7, 3.2, 3.3, 3.4
-* Pillow 2.2.1 or later
+* Python 3.5 or later
+* blockdiag 1.5.0 or later
* funcparserlib 0.3.6 or later
* reportlab (optional)
* wand and imagemagick (optional)
@@ -80,141 +80,3 @@
License
=======
Apache License 2.0
-
-
-History
-=======
-
-0.5.4 (2015-01-01)
-------------------
-* Follow blockdiag-1.5.0 interface
-
-0.5.3 (2014-07-02)
-------------------
-* Change interface of docutils node (for sphinxcontrib module)
-
-0.5.2 (2014-06-24)
-------------------
-* Add options to blockdiag directive (docutils extension)
- - :width:
- - :height:
- - :scale:
- - :align:
- - :name:
- - :class:
- - :figwidth:
- - :figclass:
-
-0.5.1 (2013-10-22)
-------------------
-* Fix bugs
-
-0.5.0 (2013-10-05)
-------------------
-* Support python 3.2 and 3.3 (thanks to @masayuko)
-* Drop supports for python 2.4 and 2.5
-* Replace dependency: PIL -> Pillow
-
-0.4.3 (2013-02-10)
-------------------
-* Fix bugs
-
-0.4.2 (2013-02-10)
-------------------
-* Fix bugs
-
-0.4.1 (2012-10-28)
-------------------
-* Fix bugs
-
-0.4.0 (2012-10-22)
-------------------
-* Optimize algorithm for rendering shadow
-* Add options to docutils directive
-* Fix bugs
-
-0.3.4 (2012-09-29)
-------------------
-* Fix bugs
-
-0.3.3 (2012-04-23)
-------------------
-* Set hyperlinks to header of lanes on SVG image
-* Fill background of lane header with lane.color attribute
-
-0.3.2 (2012-03-15)
-------------------
-* Fix bugs
-
-0.3.1 (2012-02-15)
-------------------
-* Add autolane plugin
-* Update to new package structure (blockdiag >= 1.1.2)
-
-0.3.0 (2011-11-19)
-------------------
-* Add fontfamily attribute for switching fontface
-* Fix bugs
-
-0.2.4 (2011-11-10)
-------------------
-* Fix dependencies (do not depend PIL directly for pillow users)
-
-0.2.3 (2011-11-06)
-------------------
-* Add docutils exetension
-* Fix bugs
-
-0.2.2 (2011-11-01)
-------------------
-* Add class feature (experimental)
-
-0.2.1 (2011-11-01)
-------------------
-* Follow blockdiag-0.9.7 interface
-
-0.2.0 (2011-10-19)
-------------------
-* Follow blockdiag-0.9.5 interface
-
-0.1.9 (2011-10-11)
-------------------
-* Fix bugs
-
-0.1.8 (2011-09-30)
-------------------
-* Add diagram attribute: default_text_color
-
-0.1.7 (2011-07-05)
-------------------
-* Fix bugs
-
-0.1.6 (2011-07-03)
-------------------
-* Support input from stdin
-
-0.1.5 (2011-05-15)
-------------------
-* Fix bugs
-
-0.1.4 (2011-05-14)
-------------------
-* Change license to Apache License 2.0
-* Support blockdiag 0.8.1 core interface
-
-0.1.3 (2011-04-19)
-------------------
-* Fix bugs
-
-0.1.2 (2011-04-11)
-------------------
-* Fix bugs
-
-0.1.1 (2011-04-10)
-------------------
-* Fix bugs
-
-0.1.0 (2011-04-09)
-------------------
-* First release
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/bootstrap.py
new/actdiag-2.0.0/bootstrap.py
--- old/actdiag-0.5.4/bootstrap.py 2013-09-21 04:34:06.000000000 +0200
+++ new/actdiag-2.0.0/bootstrap.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,170 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os
-import shutil
-import sys
-import tempfile
-
-from optparse import OptionParser
-
-tmpeggs = tempfile.mkdtemp()
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --find-links to point to local resources, you can keep
-this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
-
-parser.add_option("-t", "--accept-buildout-test-releases",
- dest='accept_buildout_test_releases',
- action="store_true", default=False,
- help=("Normally, if you do not specify a --version, the "
- "bootstrap script and buildout gets the newest "
- "*final* versions of zc.buildout and its recipes and "
- "extensions for you. If you use this flag, "
- "bootstrap and buildout will get the newest releases "
- "even if they are alphas or betas."))
-parser.add_option("-c", "--config-file",
- help=("Specify the path to the buildout configuration "
- "file to be used."))
-parser.add_option("-f", "--find-links",
- help=("Specify a URL to search for buildout releases"))
-
-
-options, args = parser.parse_args()
-
-######################################################################
-# load/install setuptools
-
-to_reload = False
-try:
- import pkg_resources
- import setuptools
-except ImportError:
- ez = {}
-
- try:
- from urllib.request import urlopen
- except ImportError:
- from urllib2 import urlopen
-
- # XXX use a more permanent ez_setup.py URL when available.
- exec(urlopen('http://bitbucket.org/pypa/setuptools/raw/0.7.2/ez_setup.py'
- ).read(), ez)
- setup_args = dict(to_dir=tmpeggs, download_delay=0)
- ez['use_setuptools'](**setup_args)
-
- if to_reload:
- reload(pkg_resources)
- import pkg_resources
- # This does not (always?) update the default working set. We will
- # do it.
- for path in sys.path:
- if path not in pkg_resources.working_set.entries:
- pkg_resources.working_set.add_entry(path)
-
-######################################################################
-# Install buildout
-
-ws = pkg_resources.working_set
-
-cmd = [sys.executable, '-c',
- 'from setuptools.command.easy_install import main; main()',
- '-mZqNxd', tmpeggs]
-
-find_links = os.environ.get(
- 'bootstrap-testing-find-links',
- options.find_links or
- ('http://downloads.buildout.org/'
- if options.accept_buildout_test_releases else None)
- )
-if find_links:
- cmd.extend(['-f', find_links])
-
-setuptools_path = ws.find(
- pkg_resources.Requirement.parse('setuptools')).location
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
- # Figure out the most recent final version of zc.buildout.
- import setuptools.package_index
- _final_parts = '*final-', '*final'
-
- def _final_version(parsed_version):
- for part in parsed_version:
- if (part[:1] == '*') and (part not in _final_parts):
- return False
- return True
- index = setuptools.package_index.PackageIndex(
- search_path=[setuptools_path])
- if find_links:
- index.add_find_links((find_links,))
- req = pkg_resources.Requirement.parse(requirement)
- if index.obtain(req) is not None:
- best = []
- bestv = None
- for dist in index[req.project_name]:
- distv = dist.parsed_version
- if _final_version(distv):
- if bestv is None or distv > bestv:
- best = [dist]
- bestv = distv
- elif distv == bestv:
- best.append(dist)
- if best:
- best.sort()
- version = best[-1].version
-if version:
- requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
- raise Exception(
- "Failed to execute command:\n%s",
- repr(cmd)[1:-1])
-
-######################################################################
-# Import and run buildout
-
-ws.add_entry(tmpeggs)
-ws.require(requirement)
-import zc.buildout.buildout
-
-if not [a for a in args if '=' not in a]:
- args.append('bootstrap')
-
-# if -c was provided, we push it back into args for buildout' main function
-if options.config_file is not None:
- args[0:0] = ['-c', options.config_file]
-
-zc.buildout.buildout.main(args)
-shutil.rmtree(tmpeggs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/buildout.cfg
new/actdiag-2.0.0/buildout.cfg
--- old/actdiag-0.5.4/buildout.cfg 2014-07-02 08:28:45.000000000 +0200
+++ new/actdiag-2.0.0/buildout.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-[buildout]
-parts = actdiag test tox static_analysis
-
-develop = .
-
-[actdiag]
-recipe = zc.recipe.egg
-eggs =
- actdiag
- blockdiag
-interpreter = py
-
-[test]
-recipe = pbp.recipe.noserunner
-eggs =
- actdiag[rst]
- actdiag[testing]
- coverage
- unittest-xml-reporting
-
-[tox]
-recipe = zc.recipe.egg
-eggs =
- tox
- detox
-
-[static_analysis]
-recipe = zc.recipe.egg
-eggs =
- coverage
- flake8
- pylint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/setup.cfg new/actdiag-2.0.0/setup.cfg
--- old/actdiag-0.5.4/setup.cfg 2015-01-01 15:53:18.000000000 +0100
+++ new/actdiag-2.0.0/setup.cfg 2020-01-26 06:41:18.459048300 +0100
@@ -1,7 +1,6 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
[build]
build-base = _build
@@ -9,16 +8,12 @@
[sdist]
formats = gztar
-[wheel]
-universal = 1
-
-[aliases]
-release = check -r -s register sdist bdist_wheel upload
-
[check]
strict = 1
restructuredtext = 1
[flake8]
-ignore = _
+ignore = W504
+max-line-length = 120
+copyright-check = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/setup.py new/actdiag-2.0.0/setup.py
--- old/actdiag-0.5.4/setup.py 2014-12-31 16:20:50.000000000 +0100
+++ new/actdiag-2.0.0/setup.py 2020-01-26 06:39:10.000000000 +0100
@@ -6,54 +6,58 @@
import actdiag
classifiers = [
- "Development Status :: 3 - Alpha",
+ "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",
"Topic :: Software Development",
"Topic :: Software Development :: Documentation",
"Topic :: Text Processing :: Markup",
]
-test_requires = ['nose',
- 'pep8>=1.3',
- 'reportlab',
- 'docutils']
-
-# only for Python2.6
-if sys.version_info > (2, 6) and sys.version_info < (2, 7):
- test_requires.append('unittest2')
-
setup(
name='actdiag',
version=actdiag.__version__,
description='actdiag generates activity-diagram image from text',
long_description=open("README.rst").read(),
+ long_description_content_type='text/x-rst',
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/actdiag',
+ project_urls={
+ "Code": "https://github.com/blockdiag/actdiag";,
+ "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,
- install_requires=[
- 'setuptools',
- 'blockdiag>=1.5.0',
- # -*- Extra requirements: -*-
- ],
+ python_requires=">=3.5",
+ install_requires=['blockdiag >= 1.5.0'],
extras_require=dict(
- testing=test_requires,
rst=[
'docutils',
],
+ testing=[
+ 'nose',
+ 'pep8 >=1.3',
+ 'reportlab',
+ 'docutils',
+ 'flake8',
+ 'flake8-coding',
+ 'flake8-copyright',
+ ],
),
test_suite='nose.collector',
- tests_require=test_requires,
entry_points="""
[console_scripts]
actdiag = actdiag.command:main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag/__init__.py
new/actdiag-2.0.0/src/actdiag/__init__.py
--- old/actdiag-0.5.4/src/actdiag/__init__.py 2014-12-31 16:20:41.000000000
+0100
+++ new/actdiag-2.0.0/src/actdiag/__init__.py 2020-01-26 06:40:13.000000000
+0100
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-__version__ = '0.5.4'
+__version__ = '2.0.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag/drawer.py
new/actdiag-2.0.0/src/actdiag/drawer.py
--- old/actdiag-0.5.4/src/actdiag/drawer.py 2013-10-22 04:57:58.000000000
+0200
+++ new/actdiag-2.0.0/src/actdiag/drawer.py 2020-01-13 11:28:33.000000000
+0100
@@ -15,7 +15,6 @@
import blockdiag.drawer
from actdiag.metrics import DiagramMetrics
-from blockdiag.utils.compat import u, string_types
class DiagramDraw(blockdiag.drawer.DiagramDraw):
@@ -29,10 +28,10 @@
for i, lane in enumerate(self.diagram.lanes):
if lane.label:
label = lane.label
- elif isinstance(lane.id, string_types):
+ elif isinstance(lane.id, str):
label = lane.id
else:
- label = u('Lane %d') % (i + 1)
+ label = 'Lane %d' % (i + 1)
if lane.href and self.format == 'SVG':
drawer = self.drawer.anchor(lane.href)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag/parser.py
new/actdiag-2.0.0/src/actdiag/parser.py
--- old/actdiag-0.5.4/src/actdiag/parser.py 2014-04-08 09:02:53.000000000
+0200
+++ new/actdiag-2.0.0/src/actdiag/parser.py 2020-01-13 11:28:33.000000000
+0100
@@ -41,7 +41,6 @@
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 blockdiag.utils.compat import u
Diagram = namedtuple('Diagram', 'id stmts')
@@ -65,8 +64,8 @@
('Comment', (r'(//|#).*',)), # NOQA
('NL', (r'[\r\n]+',)), # NOQA
('Space', (r'[ \t\r\n]+',)), # NOQA
- ('Name', (u('[A-Za-z_0-9\u0080-\uffff]') + # NOQA
- u('[A-Za-z_\\-.0-9\u0080-\uffff]*'),)), # NOQA
+ ('Name', ('[A-Za-z_0-9\u0080-\uffff]' + # NOQA
+ '[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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/actdiag-0.5.4/src/actdiag/tests/test_generate_diagram.py
new/actdiag-2.0.0/src/actdiag/tests/test_generate_diagram.py
--- old/actdiag-0.5.4/src/actdiag/tests/test_generate_diagram.py
2013-11-06 07:22:16.000000000 +0100
+++ new/actdiag-2.0.0/src/actdiag/tests/test_generate_diagram.py
2020-01-13 11:28:33.000000000 +0100
@@ -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 actdiag.command
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag/tests/test_pep8.py
new/actdiag-2.0.0/src/actdiag/tests/test_pep8.py
--- old/actdiag-0.5.4/src/actdiag/tests/test_pep8.py 2014-04-08
09:04:47.000000000 +0200
+++ new/actdiag-2.0.0/src/actdiag/tests/test_pep8.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-import os
-import sys
-import pep8
-
-CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
-BASE_DIR = os.path.dirname(CURRENT_DIR)
-
-
-def test_pep8():
- arglist = [['statistics', True],
- ['show-source', True],
- ['repeat', True],
- ['paths', [BASE_DIR]]]
-
- pep8style = pep8.StyleGuide(arglist, parse_argv=False, config_file=True)
- options = pep8style.options
- if options.doctest:
- import doctest
- fail_d, done_d = doctest.testmod(report=False, verbose=options.verbose)
- fail_s, done_s = pep8.selftest(options)
- count_failed = fail_s + fail_d
- if not options.quiet:
- count_passed = done_d + done_s - count_failed
- print("%d passed and %d failed." % (count_passed, count_failed))
- if count_failed:
- print("Test failed.")
- else:
- print("Test passed.")
- if count_failed:
- sys.exit(1)
- if options.testsuite:
- pep8.init_tests(pep8style)
- report = pep8style.check_files()
- if options.statistics:
- report.print_statistics()
- if options.benchmark:
- report.print_benchmark()
- if options.testsuite and not options.quiet:
- report.print_results()
- if report.total_errors:
- if options.count:
- sys.stderr.write(str(report.total_errors) + '\n')
- # sys.exit(1)
-
- # reporting errors (additional summary)
- errors = report.get_count('E')
- warnings = report.get_count('W')
- message = 'pep8: %d errors / %d warnings' % (errors, warnings)
- print(message)
- assert report.total_errors == 0, message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/actdiag-0.5.4/src/actdiag/tests/test_rst_directives.py
new/actdiag-2.0.0/src/actdiag/tests/test_rst_directives.py
--- old/actdiag-0.5.4/src/actdiag/tests/test_rst_directives.py 2014-11-21
04:24:09.000000000 +0100
+++ new/actdiag-2.0.0/src/actdiag/tests/test_rst_directives.py 2020-01-13
11:31:36.000000000 +0100
@@ -1,17 +1,30 @@
# -*- coding: utf-8 -*-
-
-import sys
-if sys.version_info < (2, 7):
- import unittest2 as unittest
-else:
- import unittest
+# Copyright 2011 Takeshi KOMIYA
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
import os
-from blockdiag.tests.utils import capture_stderr, with_pil, TemporaryDirectory
+import sys
from docutils import nodes
from docutils.core import publish_doctree
from docutils.parsers.rst import directives as docutils
from 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
class TestRstDirectives(unittest.TestCase):
@@ -120,7 +133,7 @@
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.image, type(doctree[0]))
svg = open(doctree[0]['uri']).read()
- self.assertRegexpMatches(svg, '<svg height="\d+" width="\d+" ')
+ self.assertRegexpMatches(svg, r'<svg height="\d+" width="\d+" ')
def test_setup_noviewbox_is_false(self):
directives.setup(format='SVG', outputdir=self.tmpdir, noviewbox=False)
@@ -131,7 +144,7 @@
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.image, type(doctree[0]))
svg = open(doctree[0]['uri']).read()
- self.assertRegexpMatches(svg, '<svg viewBox="0 0 \d+ \d+" ')
+ self.assertRegexpMatches(svg, r'<svg viewBox="0 0 \d+ \d+" ')
def test_setup_inline_svg_is_true(self):
directives.setup(format='SVG', outputdir=self.tmpdir, inline_svg=True)
@@ -179,7 +192,7 @@
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
- '<svg height="\d+" width="100" ')
+ r'<svg height="\d+" width="100" ')
def test_setup_inline_svg_is_true_and_width_option2(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
@@ -193,7 +206,7 @@
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
- '<svg height="\d+" width="10000" ')
+ r'<svg height="\d+" width="10000" ')
def test_setup_inline_svg_is_true_and_height_option1(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
@@ -207,7 +220,7 @@
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
- '<svg height="100" width="\d+" ')
+ r'<svg height="100" width="\d+" ')
def test_setup_inline_svg_is_true_and_height_option2(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
@@ -221,7 +234,7 @@
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
- '<svg height="10000" width="\d+" ')
+ r'<svg height="10000" width="\d+" ')
def test_setup_inline_svg_is_true_and_width_and_height_option(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag.egg-info/PKG-INFO
new/actdiag-2.0.0/src/actdiag.egg-info/PKG-INFO
--- old/actdiag-0.5.4/src/actdiag.egg-info/PKG-INFO 2015-01-01
15:53:13.000000000 +0100
+++ new/actdiag-2.0.0/src/actdiag.egg-info/PKG-INFO 2020-01-26
06:41:18.000000000 +0100
@@ -1,12 +1,14 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: actdiag
-Version: 0.5.4
+Version: 2.0.0
Summary: actdiag generates activity-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/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
@@ -78,8 +80,8 @@
Requirements
============
- * Python 2.6, 2.7, 3.2, 3.3, 3.4
- * Pillow 2.2.1 or later
+ * Python 3.5 or later
+ * blockdiag 1.5.0 or later
* funcparserlib 0.3.6 or later
* reportlab (optional)
* wand and imagemagick (optional)
@@ -90,150 +92,20 @@
=======
Apache License 2.0
-
- History
- =======
-
- 0.5.4 (2015-01-01)
- ------------------
- * Follow blockdiag-1.5.0 interface
-
- 0.5.3 (2014-07-02)
- ------------------
- * Change interface of docutils node (for sphinxcontrib module)
-
- 0.5.2 (2014-06-24)
- ------------------
- * Add options to blockdiag directive (docutils extension)
- - :width:
- - :height:
- - :scale:
- - :align:
- - :name:
- - :class:
- - :figwidth:
- - :figclass:
-
- 0.5.1 (2013-10-22)
- ------------------
- * Fix bugs
-
- 0.5.0 (2013-10-05)
- ------------------
- * Support python 3.2 and 3.3 (thanks to @masayuko)
- * Drop supports for python 2.4 and 2.5
- * Replace dependency: PIL -> Pillow
-
- 0.4.3 (2013-02-10)
- ------------------
- * Fix bugs
-
- 0.4.2 (2013-02-10)
- ------------------
- * Fix bugs
-
- 0.4.1 (2012-10-28)
- ------------------
- * Fix bugs
-
- 0.4.0 (2012-10-22)
- ------------------
- * Optimize algorithm for rendering shadow
- * Add options to docutils directive
- * Fix bugs
-
- 0.3.4 (2012-09-29)
- ------------------
- * Fix bugs
-
- 0.3.3 (2012-04-23)
- ------------------
- * Set hyperlinks to header of lanes on SVG image
- * Fill background of lane header with lane.color attribute
-
- 0.3.2 (2012-03-15)
- ------------------
- * Fix bugs
-
- 0.3.1 (2012-02-15)
- ------------------
- * Add autolane plugin
- * Update to new package structure (blockdiag >= 1.1.2)
-
- 0.3.0 (2011-11-19)
- ------------------
- * Add fontfamily attribute for switching fontface
- * Fix bugs
-
- 0.2.4 (2011-11-10)
- ------------------
- * Fix dependencies (do not depend PIL directly for pillow users)
-
- 0.2.3 (2011-11-06)
- ------------------
- * Add docutils exetension
- * Fix bugs
-
- 0.2.2 (2011-11-01)
- ------------------
- * Add class feature (experimental)
-
- 0.2.1 (2011-11-01)
- ------------------
- * Follow blockdiag-0.9.7 interface
-
- 0.2.0 (2011-10-19)
- ------------------
- * Follow blockdiag-0.9.5 interface
-
- 0.1.9 (2011-10-11)
- ------------------
- * Fix bugs
-
- 0.1.8 (2011-09-30)
- ------------------
- * Add diagram attribute: default_text_color
-
- 0.1.7 (2011-07-05)
- ------------------
- * Fix bugs
-
- 0.1.6 (2011-07-03)
- ------------------
- * Support input from stdin
-
- 0.1.5 (2011-05-15)
- ------------------
- * Fix bugs
-
- 0.1.4 (2011-05-14)
- ------------------
- * Change license to Apache License 2.0
- * Support blockdiag 0.8.1 core interface
-
- 0.1.3 (2011-04-19)
- ------------------
- * Fix bugs
-
- 0.1.2 (2011-04-11)
- ------------------
- * Fix bugs
-
- 0.1.1 (2011-04-10)
- ------------------
- * Fix bugs
-
- 0.1.0 (2011-04-09)
- ------------------
- * First release
-
-
Keywords: diagram,generator
Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
+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: Topic :: Software Development
Classifier: Topic :: Software Development :: Documentation
Classifier: Topic :: Text Processing :: Markup
+Requires-Python: >=3.5
+Description-Content-Type: text/x-rst
+Provides-Extra: rst
+Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag.egg-info/SOURCES.txt
new/actdiag-2.0.0/src/actdiag.egg-info/SOURCES.txt
--- old/actdiag-0.5.4/src/actdiag.egg-info/SOURCES.txt 2015-01-01
15:53:14.000000000 +0100
+++ new/actdiag-2.0.0/src/actdiag.egg-info/SOURCES.txt 2020-01-26
06:41:18.000000000 +0100
@@ -1,9 +1,8 @@
+CHANGES.rst
LICENSE
MANIFEST.in
README.rst
actdiag.1
-bootstrap.py
-buildout.cfg
setup.cfg
setup.py
tox.ini
@@ -24,7 +23,6 @@
src/actdiag/plugins/__init__.py
src/actdiag/plugins/autolane.py
src/actdiag/tests/test_generate_diagram.py
-src/actdiag/tests/test_pep8.py
src/actdiag/tests/test_rst_directives.py
src/actdiag/tests/VLGothic/LICENSE
src/actdiag/tests/VLGothic/LICENSE.en
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag.egg-info/requires.txt
new/actdiag-2.0.0/src/actdiag.egg-info/requires.txt
--- old/actdiag-0.5.4/src/actdiag.egg-info/requires.txt 2015-01-01
15:53:13.000000000 +0100
+++ new/actdiag-2.0.0/src/actdiag.egg-info/requires.txt 2020-01-26
06:41:18.000000000 +0100
@@ -1,4 +1,3 @@
-setuptools
blockdiag>=1.5.0
[rst]
@@ -9,3 +8,6 @@
pep8>=1.3
reportlab
docutils
+flake8
+flake8-coding
+flake8-copyright
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/actdiag-0.5.4/src/actdiag_sphinxhelper.py
new/actdiag-2.0.0/src/actdiag_sphinxhelper.py
--- old/actdiag-0.5.4/src/actdiag_sphinxhelper.py 2013-10-06
03:43:32.000000000 +0200
+++ new/actdiag-2.0.0/src/actdiag_sphinxhelper.py 2020-01-13
11:28:33.000000000 +0100
@@ -16,17 +16,12 @@
import actdiag.parser
import actdiag.builder
import actdiag.drawer
-core = actdiag
-
import actdiag.utils.rst.nodes
import actdiag.utils.rst.directives
-utils = actdiag.utils
-
import blockdiag.utils.bootstrap
-utils.bootstrap = blockdiag.utils.bootstrap
-
-import blockdiag.utils.compat
-utils.compat = blockdiag.utils.compat
-
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-0.5.4/tox.ini new/actdiag-2.0.0/tox.ini
--- old/actdiag-0.5.4/tox.ini 2014-11-11 10:53:16.000000000 +0100
+++ new/actdiag-2.0.0/tox.ini 2020-01-13 11:31:14.000000000 +0100
@@ -1,12 +1,12 @@
[tox]
-envlist=py26,py27,py32,py33,py34,blockdiag_dev
+envlist=py35,py36,py37,py38,blockdiag_dev
[testenv]
-deps=
- nose
- flake8
- docutils
- reportlab
+usedevelop = True
+extras =
+ testing
+passenv=
+ ALL_TESTS
commands=
nosetests
flake8 src
@@ -22,5 +22,4 @@
[testenv:blockdiag_dev]
deps=
- {[testenv]deps}
- hg+https://bitbucket.org/blockdiag/blockdiag
+ git+https://github.com/blockdiag/blockdiag
