Skip to content

Commit b553028

Browse files
committed
Fixed for vpype 1.9 compatibility
- pinned vpype version to 1.9 - fixed vpype-related imports - changed types for compatibility with expressions - fixed credits in README.md
1 parent 2cd3173 commit b553028

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,9 @@ Using this profile, you can generate JSON for the rectangle:
338338
Which is valid JSON.
339339

340340

341-
# Thanks
342-
* abey76 - Helped with advice that largely pushes us towards the integration goals as well as his very solid suggestion to use .format() which greatly expands the expected formats.
343-
* theomega - Basically rewrote the thing into the dapper codebase you see today. Rather than the 4 hours I figured I'd kill on this.
344-
* ithinkido - For his many insightful comments and determination to make this project as good as it can be.
341+
# Credits
342+
343+
* [tatarize](https://github.com/tatarize) - Wrote the bulk of the plug-in.
344+
* [abey79](https://github.com/abey79) - Helped with advice that largely pushes us towards the integration goals as well as his very solid suggestion to use .format() which greatly expands the expected formats.
345+
* [theomega](https://github.com/theomega) - Basically rewrote the thing into the dapper codebase you see today. Rather than the 4 hours I figured I'd kill on this.
346+
* [ithinkido](https://github.com/ithinkido) - For his many insightful comments and determination to make this project as good as it can be.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
click
2-
vpype
2+
vpype>=1.9,<2.0
33
numpy

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
author_email="[email protected]",
1414
url="https://github.com/plottertools/vpype-gcode/",
1515
packages=["vpype_gcode"],
16-
classifiers=(
16+
classifiers=[
1717
"Programming Language :: Python :: 3.6",
1818
"Programming Language :: Python :: 3.7",
1919
"Programming Language :: Python :: 3.8",
@@ -23,11 +23,11 @@
2323
"Topic :: Multimedia :: Graphics",
2424
"License :: OSI Approved :: MIT License",
2525
"Operating System :: OS Independent",
26-
),
26+
],
2727
include_package_data=True,
2828
install_requires=[
2929
"click",
30-
"vpype",
30+
"vpype>=1.9,<2.0",
3131
"numpy",
3232
],
3333
entry_points="""

vpype_gcode/gwrite.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import click
66
import vpype as vp
7+
import vpype_cli
78

89
# Load the default config
9-
1010
vp.CONFIG_MANAGER.load_config_file(str(Path(__file__).parent / "bundled_configs.toml"))
1111

1212

@@ -34,16 +34,16 @@ def invert_axis(document: vp.Document, invert_x: bool, invert_y: bool):
3434

3535

3636
@click.command()
37-
@click.argument("output", type=click.File("w"))
37+
@click.argument("output", type=vpype_cli.FileType("w"))
3838
@click.option(
3939
"-p",
4040
"--profile",
4141
nargs=1,
4242
default=None,
43-
type=str,
43+
type=vpype_cli.TextType(),
4444
help="gcode writer profile from the vpype configuration file subsection 'gwrite'",
4545
)
46-
@vp.global_processor
46+
@vpype_cli.global_processor
4747
def gwrite(document: vp.Document, output: typing.TextIO, profile: str):
4848
"""
4949
Write gcode or other ascii files for the vpype pipeline.

0 commit comments

Comments
 (0)