Accepting request 993133 from home:bnavigator:branches:devel:languages:python

- 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 #147: file existence disclosure using svg renderer
- Refresh python-blockdiag-nose-to-pytest.patch

OBS-URL: https://build.opensuse.org/request/show/993133
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-blockdiag?expand=0&rev=20

python-blockdiag-nose-to-pytest.patch

@@ -1,8 +1,8 @@
-diff --git a/setup.py b/setup.py
-index 116434d..7da66c2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -67,7 +67,7 @@ def get_version():
+Index: blockdiag-3.0.0/setup.py
+===================================================================
+--- blockdiag-3.0.0.orig/setup.py
++++ blockdiag-3.0.0/setup.py
+@@ -65,7 +65,7 @@ setup(
              'docutils'
          ],
          'testing': [
@@ -11,7 +11,7 @@ index 116434d..7da66c2 100644
              'flake8',
              'flake8-coding',
              'flake8-copyright',
-@@ -76,7 +76,6 @@ def get_version():
+@@ -74,7 +74,6 @@ setup(
              'docutils',
          ],
      },
@@ -19,43 +19,20 @@ index 116434d..7da66c2 100644
      entry_points="""
         [console_scripts]
         blockdiag = blockdiag.command:main
-diff --git a/src/blockdiag/tests/rst/test_blockdiag_directives.py b/src/blockdiag/tests/rst/test_blockdiag_directives.py
-index 0b86583..72ed086 100644
---- a/src/blockdiag/tests/rst/test_blockdiag_directives.py
-+++ b/src/blockdiag/tests/rst/test_blockdiag_directives.py
-@@ -24,6 +24,9 @@
- from blockdiag.tests.utils import TemporaryDirectory, capture_stderr, with_pil
- from blockdiag.utils.rst import directives
- 
-+TESTDIR = os.path.dirname(__file__)
-+FONTPATH = os.path.join(TESTDIR, '..', 'VLGothic', 'VL-Gothic-Regular.ttf')
-+
- 
- class TestRstDirectives(unittest.TestCase):
-     def setUp(self):
-@@ -178,7 +181,7 @@ def test_setup_inline_svg_is_true_but_format_isnt_svg(self):
-         self.assertEqual(nodes.image, type(doctree[0]))
- 
-     def test_setup_inline_svg_is_true_with_multibytes(self):
--        directives.setup(format='SVG', outputdir=self.tmpdir)
-+        directives.setup(format='SVG', outputdir=self.tmpdir, fontpath=FONTPATH)
-         text = (".. blockdiag::\n"
-                 "\n"
-                 "   あ -> い")
-diff --git a/src/blockdiag/tests/test_generate_diagram.py b/src/blockdiag/tests/test_generate_diagram.py
-index 361c86f..6b9a773 100644
---- a/src/blockdiag/tests/test_generate_diagram.py
-+++ b/src/blockdiag/tests/test_generate_diagram.py
-@@ -18,8 +18,6 @@
- import sys
+Index: blockdiag-3.0.0/src/blockdiag/tests/test_generate_diagram.py
+===================================================================
+--- blockdiag-3.0.0.orig/src/blockdiag/tests/test_generate_diagram.py
++++ blockdiag-3.0.0/src/blockdiag/tests/test_generate_diagram.py
+@@ -19,8 +19,6 @@ import sys
  import unittest
+ from xml.etree import ElementTree
  
 -from nose.tools import nottest
 -
  import blockdiag
  import blockdiag.command
  from blockdiag.tests.utils import (TemporaryDirectory, capture_stderr,
-@@ -51,7 +49,7 @@ def test_generate():
+@@ -52,7 +50,7 @@ def test_generate():
      files = get_diagram_files(basepath)
      options = []
  
@@ -64,7 +41,7 @@ index 361c86f..6b9a773 100644
          yield testcase
  
  
-@@ -62,12 +60,11 @@ def test_generate_with_separate():
+@@ -63,12 +61,11 @@ def test_generate_with_separate():
      filtered = (f for f in files if re.search('separate', f))
      options = ['--separate']
  
@@ -79,15 +56,16 @@ index 361c86f..6b9a773 100644
      fontpath = get_fontpath(basepath)
      options = options + ['-f', fontpath]
  
-diff --git a/tox.ini b/tox.ini
-index 3912471..48b0c85 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -18,5 +18,5 @@ deps =
+Index: blockdiag-3.0.0/tox.ini
+===================================================================
+--- blockdiag-3.0.0.orig/tox.ini
++++ blockdiag-3.0.0/tox.ini
+@@ -18,7 +18,7 @@ deps =
  passenv =
      ALL_TESTS
  commands =
 -    nosetests
 +    pytest
-     flake8 src
-
+ 
+ [testenv:flake8]
+ description =