data-flow-diagram 1.11.1.post1__tar.gz → 1.12.0__tar.gz

{data_flow_diagram-1.11.1.post1 → data_flow_diagram-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-flow-diagram
-Version: 1.11.1.post1
+Version: 1.12.0
 Summary: Commandline tool to generate data flow diagrams from text
 Home-page: https://github.com/pbauermeister/dfd
 Author: Pascal Bauermeister

data_flow_diagram-1.12.0/setup.py

@@ -0,0 +1,159 @@
+"""A setuptools based setup module.
+
+See:
+https://packaging.python.org/guides/distributing-packages-using-setuptools/
+"""
+
+from setuptools import setup, find_packages
+import pathlib
+
+CHANGES = """
+
+## Version 1.12.0:
+- Support style (and hence attrib) on Stores and Channels.
+
+## Version 1.11.1.post2:
+
+Bug fixes:
+- Apply attribs on frames.
+- Attribs are matched by whole names, so e.g. DATA and DATABASE will work.
+
+Improvements:
+- 'make install' to install locally.
+- CHANGES.md is read by setup.py to deduce the version.
+
+## Version 1.11.0:
+
+- Keyword "attrib" to define styles.
+
+## Version 1.10.1:
+
+- When item text is numbered, add newline after the number.
+
+## Version 1.9.1:
+
+- Add troubleshooting in README.md.
+
+## Version 1.9.0:
+
+- Allow line continuation with a trailing backslash
+
+## Version 1.8.0:
+
+- Add frames
+
+## Version 1.7.1:
+
+- Support continuous back- and relaxed- flows.
+
+## Version 1.7.0:
+
+- Add continuous flow (cflow or -->>).
+- Add control (may only connect to signals).
+
+## Version 1.6.0:
+
+- Dependencies:
+  - items with name #SNIPPET:[NAME] or FILE:[NAME] refer to another graph,
+  - referred item is rendered "ghosted",
+  - dependencies are checked (unless --no-check-dependencies is passed).
+- Add graph title (unless --no-graph-title is passed).
+- Error in snippets of MD files: display line number relative to MD file (not snippet).
+
+## Version 1.5.0:
+
+- Wrap labels by `style item-text-width N` (default N=20).
+- and `style connection-text-width N` (default N=14).
+
+## Version 1.4.1:
+
+- Processes have very light grey backgrounds.
+- Add the 'none' item type.
+- Connections with reversed direction affect the items placements.
+- A '?' postfix to a connection, removes the edge constraint.
+- Fix formatting of '\n' for Store and Channel (which are HTML nodes).
+- Colorize error messages.
+- Add drawable attributes as [ATTRS...] prefix before labels.
+
+## Version 1.3.x:
+
+- Style vertical: is supported.
+- Style context: for context (top-level) diagrams.
+- Add undirected flow (uflow aka '--').
+
+## Version 1.2.3
+
+- Snippet reference and ungenerated snippet were marked with '<'; now
+  use '#' instead.
+- Detect include (infinite) recursions and print error.
+- Can print its own version.
+
+## Version 1.1.1
+
+- Fix bug with left/bidir arrows.
+
+## Version 1.1.0
+
+- Upon error, print error stack trace.
+- Items: label can be ommitted.
+- Connections: syntactic sugars with arrows.
+
+## Version 1.0.0
+
+- Initial release.
+"""
+
+here = pathlib.Path(__file__).parent.resolve()
+long_description = (here / "README.md").read_text(encoding="utf-8")
+
+# extract version
+lines = CHANGES.splitlines()
+lines = [l[2:] for l in lines if l.startswith('##')]
+version = lines[0].strip().split(':', 1)[0].split()[-1].strip()
+
+setup(
+    name="data-flow-diagram",
+    version=version,
+    description="Commandline tool to generate data flow diagrams from text",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/pbauermeister/dfd",
+    author="Pascal Bauermeister",
+    author_email="pascal.bauermeister@gmail.com",
+    classifiers=[
+        # https://pypi.org/classifiers/ :
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Information Technology",
+        "Topic :: Software Development",
+        "Topic :: Software Development :: Documentation",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Programming Language :: Python :: 3",
+    ],
+    keywords="diagram-generator, development, tool",
+    license="GNU General Public License v3 (GPLv3)",
+    package_dir={"": "src"},
+    packages=find_packages(where="src"),
+    python_requires=">=3.10, <4",
+    install_requires=[],
+    extras_require={
+        "dev": ["check-manifest"],
+        "test": ["coverage"],
+    },
+    package_data={
+        #        "data_flow_diagram": ["tbdpackage__data.dat"],
+    },
+    #    data_files=[('data_flow_diagram', ["VERSION"])],
+    # The following would provide a command called `data-flow-diagram` which
+    # executes the function `main` from this package when invoked:
+    entry_points={
+        "console_scripts": [
+            "data-flow-diagram=data_flow_diagram:main",
+        ],
+    },
+    project_urls={
+        "Bug Reports": "https://github.com/pbauermeister/dfd/issues",
+        #        "Funding": "https://donate.pypi.org",
+        #        "Say Thanks!": "http://saythanks.io/to/example",
+        "Source": "https://github.com/pbauermeister/dfd",
+    },
+)

{data_flow_diagram-1.11.1.post1 → data_flow_diagram-1.12.0}/src/data_flow_diagram/dfd.py

@@ -99,12 +99,12 @@ class Generator:
                     f'{attrs}]'
                 )
             case model.STORE:
-                d = self._item_to_html_dict(copy)
+                d = self._attrib_to_dict(copy, attrs)
                 line = TMPL.STORE.format(**d)
             case model.NONE:
                 line = f'"{copy.name}" [shape=none label="{copy.text}" {attrs}]'
             case model.CHANNEL:
-                d = self._item_to_html_dict(copy)
+                d = self._attrib_to_dict(copy, attrs)
                 if self.graph_options.is_vertical:
                     line = TMPL.CHANNEL_HORIZONTAL.format(**d)
                 else:
@@ -116,6 +116,15 @@ class Generator:
                 )
         self.append(line, item)
 
+    def _attrib_to_dict(self, item: model.Item, attrs: str) -> dict[str, str]:
+        d = self._item_to_html_dict(item)
+        d.update({'fontcolor': 'black', 'color': 'black'})
+        attrs_d = {
+            k: v for k, v in [each.split('=', 1) for each in attrs.split()]
+        }
+        d.update(attrs_d)
+        return d
+
     def _item_to_html_dict(self, item: model.Item) -> dict[str, Any]:
         d = item.__dict__
         d['text'] = d['text'].replace('\\n', '<br/>')

{data_flow_diagram-1.11.1.post1 → data_flow_diagram-1.12.0}/src/data_flow_diagram/dfd_dot_templates.py

@@ -1,9 +1,9 @@
 STORE = """
 "{name}" [shape=none label=<
   <TABLE BORDER="0">
-    <TR><TD BGCOLOR="black" WIDTH="6"></TD></TR>
-    <TR><TD>{text}</TD></TR>
-    <TR><TD BGCOLOR="black" WIDTH="6"></TD></TR>
+    <TR><TD BGCOLOR="{color}" WIDTH="6"></TD></TR>
+    <TR><TD><FONT COLOR="{fontcolor}">{text}</FONT></TD></TR>
+    <TR><TD BGCOLOR="{color}" WIDTH="6"></TD></TR>
   </TABLE>>]
 """.strip()
 
@@ -13,11 +13,11 @@ CHANNEL = """
   <TABLE BORDER="0">
     <TR>
       <TD WIDTH="48"></TD>
-      <TD BGCOLOR="black" WIDTH="0" PORT="x"><BR/><BR/></TD>
+      <TD BGCOLOR="{color}" WIDTH="0" PORT="x"><BR/><BR/></TD>
       <TD WIDTH="48"></TD>
     </TR>
     <TR>
-      <TD COLSPAN="3">{text}</TD>
+      <TD COLSPAN="3"><FONT COLOR="{fontcolor}">{text}</FONT></TD>
     </TR>
   </TABLE>>]
 """.strip()
@@ -26,8 +26,8 @@ CHANNEL = """
 CHANNEL_HORIZONTAL = """
 "{name}" [shape=none label=<
   <TABLE BORDER="0">
-    <TR><TD BGCOLOR="black" PORT="x"></TD></TR>
-    <TR><TD>{text}</TD></TR>
+    <TR><TD BGCOLOR="{color}" PORT="x"></TD></TR>
+    <TR><TD><FONT COLOR="{fontcolor}">{text}</FONT></TD></TR>
   </TABLE>>]
 """.strip()
 

{data_flow_diagram-1.11.1.post1 → data_flow_diagram-1.12.0}/src/data_flow_diagram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: data-flow-diagram
-Version: 1.11.1.post1
+Version: 1.12.0
 Summary: Commandline tool to generate data flow diagrams from text
 Home-page: https://github.com/pbauermeister/dfd
 Author: Pascal Bauermeister

data_flow_diagram-1.11.1.post1/setup.py

@@ -1,64 +0,0 @@
-"""A setuptools based setup module.
-
-See:
-https://packaging.python.org/guides/distributing-packages-using-setuptools/
-"""
-
-from setuptools import setup, find_packages
-import pathlib
-
-here = pathlib.Path(__file__).parent.resolve()
-long_description = (here / "README.md").read_text(encoding="utf-8")
-
-# extract version
-with open(here / "CHANGES.md") as f:
-    lines = f.read().splitlines()
-    lines = [l[2:] for l in lines if l.startswith('##')]
-    version = lines[0].strip().split(':', 1)[0].split()[-1].strip()
-
-setup(
-    name="data-flow-diagram",
-    version=version,
-    description="Commandline tool to generate data flow diagrams from text",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/pbauermeister/dfd",
-    author="Pascal Bauermeister",
-    author_email="pascal.bauermeister@gmail.com",
-    classifiers=[
-        # https://pypi.org/classifiers/ :
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Information Technology",
-        "Topic :: Software Development",
-        "Topic :: Software Development :: Documentation",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Programming Language :: Python :: 3",
-    ],
-    keywords="diagram-generator, development, tool",
-    license="GNU General Public License v3 (GPLv3)",
-    package_dir={"": "src"},
-    packages=find_packages(where="src"),
-    python_requires=">=3.10, <4",
-    install_requires=[],
-    extras_require={
-        "dev": ["check-manifest"],
-        "test": ["coverage"],
-    },
-    package_data={
-        #        "data_flow_diagram": ["tbdpackage__data.dat"],
-    },
-    #    data_files=[('data_flow_diagram', ["VERSION"])],
-    # The following would provide a command called `data-flow-diagram` which
-    # executes the function `main` from this package when invoked:
-    entry_points={
-        "console_scripts": [
-            "data-flow-diagram=data_flow_diagram:main",
-        ],
-    },
-    project_urls={
-        "Bug Reports": "https://github.com/pbauermeister/dfd/issues",
-        #        "Funding": "https://donate.pypi.org",
-        #        "Say Thanks!": "http://saythanks.io/to/example",
-        "Source": "https://github.com/pbauermeister/dfd",
-    },
-)