diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 301ac18a..3e017743 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -29,4 +29,4 @@ jobs: name: examples-and-tutorials path: | examples/ - tutorial/ \ No newline at end of file + tutorial/ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 14183a63..84ab1452 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## [0.3.2](https://github.com/formatc1702/WireViz/tree/v0.3.2) (2021-11-27) + +### Hotfix + +- Adjust GraphViz generation code for compatibility with v0.18 of the `graphviz` Python package ([#258](https://github.com/formatc1702/WireViz/issues/258), [#262](https://github.com/formatc1702/WireViz/pull/261)) + +## [0.3.1](https://github.com/formatc1702/WireViz/tree/v0.3.1) (2021-10-25) + +### Hotfix + +- Assign generic harness title when using WireViz as a module and not specifying an output file name ([#253](https://github.com/formatc1702/WireViz/issues/253), [#254](https://github.com/formatc1702/WireViz/pull/254)) + ## [0.3](https://github.com/formatc1702/WireViz/tree/v0.3) (2021-10-11) ### New features diff --git a/setup.py b/setup.py index 4992bc56..861cee1f 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,9 @@ def read(fname): 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Utilities', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', ], diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 2f9eb641..95419a42 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -93,8 +93,8 @@ def connect(self, from_name: str, from_pin: (int, str), via_name: str, via_wire: def create_graph(self) -> Graph: dot = Graph() - dot.body.append(f'// Graph generated by {APP_NAME} {__version__}') - dot.body.append(f'// {APP_URL}') + dot.body.append(f'// Graph generated by {APP_NAME} {__version__}\n') + dot.body.append(f'// {APP_URL}\n') dot.attr('graph', rankdir='LR', ranksep='2', bgcolor=wv_colors.translate_color(self.options.bgcolor, "HEX"), diff --git a/src/wireviz/wireviz.py b/src/wireviz/wireviz.py index 95674945..a9b37498 100755 --- a/src/wireviz/wireviz.py +++ b/src/wireviz/wireviz.py @@ -40,8 +40,13 @@ def parse(yaml_input: str, file_out: (str, Path) = None, return_types: (None, st options = Options(**yaml_data.get('options', {})), tweak = Tweak(**yaml_data.get('tweak', {})), ) + + # When title is not given, either deduce it from filename, or use default text. if 'title' not in harness.metadata: - harness.metadata['title'] = Path(file_out).stem + if file_out is None: + harness.metadata['title'] = "WireViz diagram and BOM" + else: + harness.metadata['title'] = Path(file_out).stem # add items sections = ['connectors', 'cables', 'connections']