Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct argument to 'inkscape' #870

Merged
merged 5 commits into from Jun 7, 2020
Merged

Conversation

stephenfin
Copy link
Contributor

@stephenfin stephenfin commented Jun 5, 2020

Per #869, inkscape 1.0 final uses '--export-filename' - not '--export-file'. This was causing test failures on Fedora 31.

While we're here, we take the opportunity to clean up this file, replacing some hardcoded paths on Windows and running the whole thing through black. We can do a lot more of the latter as we proceed with fixing various bugs and removing all the skipped tests.

Use black [1] to clean things up a little here.

[1] https://black.readthedocs.io/en/stable/

Signed-off-by: Stephen Finucane <stephen@that.guru>
Inkscape 1.0 final has replaced the '--export-file' argument with
'--export-filename' [1]. Update our calls accordingly.

[1] https://wiki.inkscape.org/wiki/index.php/Release_notes/1.0#Command_Line

Signed-off-by: Stephen Finucane <stephen@that.guru>
Closes: rst2pdf#869
This cross-platform function has existed since Python 3.3 [1]. Since we
only care about that now, we can use this instead of hardcoding the
path.

[1] https://docs.python.org/3/library/shutil.html#shutil.which

Signed-off-by: Stephen Finucane <stephen@that.guru>
akrabat added a commit to stephenfin/rst2pdf that referenced this pull request Jun 7, 2020
@akrabat
Copy link
Member

akrabat commented Jun 7, 2020

hmm.. tried to force a re-run of Travis, but it didn't work

@akrabat akrabat merged commit 207f108 into rst2pdf:master Jun 7, 2020
@stephenfin stephenfin deleted the issues/869 branch June 7, 2020 16:04
@stephenfin stephenfin mentioned this pull request Jun 7, 2020
@akrabat akrabat added this to the 1.0 milestone Jun 20, 2020
akrabat added a commit to akrabat/rst2pdf that referenced this pull request Dec 4, 2020
Backport of PR rst2pdf#870 (68d4ed7):

> Inkscape 1.0 final has replaced the '--export-file' argument
> with '--export-filename' [1]. Update our calls accordingly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants