Skip to content

Commit

Permalink
pandoc 3.2.1 (#1)
Browse files Browse the repository at this point in the history
* make work with pandoc 3.2.1
  • Loading branch information
johanneswilm authored Jul 20, 2024
1 parent 7a06396 commit 31b17ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
sudo apt update
sudo apt install libjpeg-dev python3-dev python3-pip gettext zlib1g-dev git nodejs build-essential
wget https://github.com/jgm/pandoc/releases/download/3.1.13/pandoc-3.1.13-1-amd64.deb -O pandoc.deb
wget https://github.com/jgm/pandoc/releases/download/3.2.1/pandoc-3.2.1-1-amd64.deb -O pandoc.deb
sudo dpkg -i pandoc.deb
cd fiduswriter
mv ../ci/configuration.py ./
Expand All @@ -47,14 +47,15 @@ jobs:
fi
coverage run $(which fiduswriter) setup --no-static
$(which fiduswriter) lint
- name: Run pandoc server
run: pandoc server &
- name: Run test pandoc
uses: nick-invision/retry@v3
with:
timeout_minutes: 8
max_attempts: 3
retry_on: error
command: |
pandoc server &
cd fiduswriter
coverage run $(which fiduswriter) test pandoc
- name: Upload failed test screenshots
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ venv/
.envrc
.direnv/
fiduswriter/.transpile
fiduswriter/.coverage
fiduswriter/media
fiduswriter/static-libs
fiduswriter/static-transpile
fiduswriter/static-collected
fiduswriter/screenshots
fiduswriter/.coveragerc
fiduswriter/configuration.py
fiduswriter/fiduswriter.sql
Expand Down
2 changes: 1 addition & 1 deletion fiduswriter/pandoc/static/js/modules/pandoc/exporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class PandocConversionExporter extends PandocExporter {
binaryFiles => {
const files = this.textFiles.concat(binaryFiles).reduce(
(acc, file) => {
acc[file.filename] = file.contents
acc[file.filename] = btoa(file.contents)
return acc
},
{}
Expand Down
2 changes: 1 addition & 1 deletion fiduswriter/pandoc/tests/test_pandoc.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import time
import os
from tempfile import mkdtemp

from django.conf import settings

from channels.testing import ChannelsLiveServerTestCase
Expand Down Expand Up @@ -397,6 +396,7 @@ def test_export(self):
self.driver.find_element(
By.XPATH, '//*[normalize-space()="Markdown"]'
).click()

self.driver.find_element(
By.XPATH, '//*[normalize-space()="Pandoc Markdown"]'
).click()
Expand Down

0 comments on commit 31b17ae

Please sign in to comment.