Skip to content

Commit 8ba8590

Browse files
committed
Merge refactored code into dev branch
Based on work from #251, reworked, squashed (to reduce number of commits), attempted to add most changes that were implemented since (where applicable).
2 parents 7cf9244 + 9ece47e commit 8ba8590

File tree

159 files changed

+25020
-19716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+25020
-19716
lines changed

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ docs/* linguist-documentation
22
examples/* linguist-documentation
33
tutorial/* linguist-documentation
44

5-
**/*.bom.tsv linguist-generated
6-
**/*.bom.csv linguist-generated
5+
**/*.tsv linguist-generated
6+
**/*.csv linguist-generated
77
**/*.gv linguist-generated
88
**/*.html linguist-generated
99
**/*.png linguist-generated

.gitignore

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
# OS-specific files
12
.DS_Store
3+
desktop.ini
4+
Thumbs.db
5+
6+
# Development aids
27
.idea/
3-
.eggs
4-
__pycache__
5-
.*.swp
6-
*.egg-info
7-
*.pyc
8-
build
9-
data
10-
dist
8+
.vscode/
9+
temp/
1110
venv/
1211
.venv/
13-
desktop.ini
14-
thumbs.db
15-
temp/
12+
13+
# Build/compile/release artifacts
14+
build/
15+
dist/
16+
*.egg-info
17+
*.pyc
18+
19+
# Other temporary files
20+
__pycache__
21+
.*.swp

cleanup.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/zsh
2+
3+
autoflake -i --remove-all-unused-imports src/wireviz/*.py
4+
isort src/wireviz/*py
5+
black src/wireviz/*.py

devtools.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# The following tools have proven useful during development
2+
# Feel free to install while inside the WireViz virtualenv, using:
3+
# pip install -r devtools.txt
4+
5+
# Code formatting
6+
black # black src/wireviz/*.py
7+
isort # isort src/wireviz/*py
8+
9+
# Development aids
10+
pudb # import pudb; pudb.set_trace()
11+
autoflake # autoflake -i --remove-all-unused-imports src/wireviz/*.py
12+
pyan # pyan3 src/wireviz/*.py -uncge --html > temp/pyan.html

docs/CHANGELOG.md

Lines changed: 74 additions & 47 deletions
Large diffs are not rendered by default.

docs/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contribution Guidelines
22

3-
When contributing to this repository, please [submit a new issue](https://github.com/formatc1702/WireViz/issues) first to discuss the proposed change, before submitting a pull request.
3+
When contributing to this repository, please [submit a new issue](https://github.com/wireviz/WireViz/issues) first to discuss the proposed change, before submitting a pull request.
44

55
## Submitting a new Issue
66

@@ -27,7 +27,7 @@ When contributing to this repository, please [submit a new issue](https://github
2727
1. Push the changes to your fork.
2828
1. Please format your code using [`isort`](https://pycqa.github.io/isort/) and [`black`](https://black.readthedocs.io) before submitting.
2929
1. Submit a new pull request, using `dev` as the base branch.
30-
- If your code changes or extends the WireViz YAML syntax, be sure to update the [syntax description document](https://github.com/formatc1702/WireViz/blob/dev/docs/syntax.md) in your PR.
30+
- If your code changes or extends the WireViz YAML syntax, be sure to update the [syntax description document](https://github.com/wireviz/WireViz/blob/dev/docs/syntax.md) in your PR.
3131
1. Please include in the PR description (and optionally also in the commit message body) a reference (# followed by issue number) to the issue where the suggested changes are discussed.
3232

3333
### Hints

docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ Output file:
7474
7575
![Sample output diagram](../examples/demo01.png)
7676
77-
[Bill of Materials](../examples/demo01.bom.tsv) (auto-generated)
77+
[Bill of Materials](../examples/demo01.tsv) (auto-generated)
7878
7979
### Demo 02
8080
8181
![](../examples/demo02.png)
8282
83-
[Source](../examples/demo02.yml) - [Bill of Materials](../examples/demo02.bom.tsv)
83+
[Source](../examples/demo02.yml) - [Bill of Materials](../examples/demo02.tsv)
8484
8585
### Syntax, tutorial and example gallery
8686
@@ -133,7 +133,7 @@ Depending on the options specified, this will output some or all of the followin
133133
mywire.gv GraphViz output
134134
mywire.svg Wiring diagram as vector image
135135
mywire.png Wiring diagram as raster image
136-
mywire.bom.tsv BOM (bill of materials) as tab-separated text file
136+
mywire.tsv BOM (bill of materials) as tab-separated text file
137137
mywire.html HTML page with wiring diagram and BOM embedded
138138
```
139139

docs/buildscript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!--
44
The following text is taken from #118
5-
https://github.com/formatc1702/WireViz/pull/118
5+
https://github.com/wireviz/WireViz/pull/118
66
77
TODO: write a better explaination -->
88

@@ -26,7 +26,7 @@ Possible group names:
2626
- `tutorial` to process`tutorial/{readme.md,tutorial*.*}`
2727
- `demos` to process`examples/demo*.*`
2828

29-
Affected filetypes: `.gv`, `.bom.tsv`, `.png`, `.svg`, `.html`
29+
Affected filetypes: `.gv`, `.tsv`, `.png`, `.svg`, `.html`
3030

3131

3232
## Usage hints

docs/syntax.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ If any component is defined in the `connectors` or `cables` sections but not ref
355355
# If no value is specified for 'title', then the
356356
# output filename without extension is used.
357357
```
358+
See [HTML Output Templates](../src/wireviz/templates/) for how metadata entries can be inserted into the HTML output.
358359

359360
## Options
360361

@@ -499,7 +500,7 @@ The following colors are understood:
499500
- `GD` ![##ffcf80](https://via.placeholder.com/15/ffcf80/000000?text=+) (gold)
500501

501502
<!-- color list generated with a helper script: -->
502-
<!-- https://gist.github.com/formatc1702/3c93fb4c5e392364899283f78672b952 -->
503+
<!-- https://gist.github.com/17o2/3c93fb4c5e392364899283f78672b952 -->
503504

504505
It is also possible to specify colors as hexadecimal RGB values, e.g. `#112233` or `#FFFF00:#009900`.
505506
Remember quoting strings containing a `#` in the YAML file.

examples/demo01.bom.tsv

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)