python/python-blockdiag
SHA256
14
0
Fork 0
forked from pool/python-blockdiag
Code Pull Requests Activity

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

Browse Source 
- 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
This commit is contained in:
Dirk Mueller
2022-08-04 20:59:21 +00:00
committed by Git OBS Bridge
parent 484a456f37
commit faa254a7c8
5 changed files with 48 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
blockdiag-2.0.1.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16a69dd9f3b44c9e0869999ce82aa968586698febc86ece9ca0c902dba772397
size 2694776

3
blockdiag-3.0.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dee4195bb87d23654546ba2bf5091480dbf253b409891fce2cd527c91d00a3e2
size 2694464

64
python-blockdiag-nose-to-pytest.patch
View File

@@ -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 =

11
python-blockdiag.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Aug 4 19:43:01 UTC 2022 - Ben Greiner <code@bnavigator.de>
- 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
-------------------------------------------------------------------
Wed Sep 1 07:28:26 UTC 2021 - pgajdos@suse.com

26
python-blockdiag.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-blockdiag
#
# Copyright (c) 2021 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,36 +16,34 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-blockdiag
Version: 2.0.1
Version: 3.0.0
Release: 0
Summary: Program to generate block-diagram images from text
License: Apache-2.0
Group: Development/Languages/Python
URL: http://blockdiag.com/
Source: https://files.pythonhosted.org/packages/source/b/blockdiag/blockdiag-%{version}.tar.gz
# PATCH-FIX-UPSTREAM denose.patch gh#blockdiag/blockdiag#131 pgajdos@suse.com
# PATCH-FIX-UPSTREAM python-blockdiag-nose-to-pytest.patch gh#blockdiag/blockdiag#131 pgajdos@suse.com
# Remove the last silly dependency on nose
Patch0: python-blockdiag-nose-to-pytest.patch
BuildRequires: %{python_module Pillow >= 2.2.1}
BuildRequires: %{python_module funcparserlib >= 0.3.6}
BuildRequires: %{python_module reportlab}
BuildRequires: %{python_module Pillow >= 3}
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module funcparserlib >= 1.0.0~a0}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module webcolors}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Pillow >= 2.2.1
Requires: python-funcparserlib >= 0.3.6
Requires: python-Pillow >= 3
Requires: python-funcparserlib >= 1.0.0~a0
Requires: python-setuptools
Requires: python-webcolors
Requires(post): update-alternatives
Requires(preun):update-alternatives
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module reportlab}
BuildRequires: %{python_module docutils}
BuildRequires: %{python_module pep8 >= 1.3}
BuildRequires: %{python_module pip >= 1.4.1}
BuildRequires: %{python_module pytest}
# /SECTION
%if 0%{?suse_version} || 0%{?fedora_version} >= 24
@@ -89,7 +87,7 @@ popd
%license LICENSE
%doc CHANGES.rst README.rst
%python_alternative %{_bindir}/blockdiag
%{python_sitelib}/blockdiag*
%pycache_only %{python_sitelib}/__pycache__/blockdiag*
%{python_sitelib}/blockdiag
%{python_sitelib}/blockdiag-%{version}*-info
%changelog