Skip to content

Commit

Permalink
testing: update dependencies + lint
Browse files Browse the repository at this point in the history
  • Loading branch information
johanneswilm committed Jul 23, 2024
1 parent 6841592 commit d006bc4
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 26 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4.1.2
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5.1.0
with:
python-version: "3.11"
python-version: "3.12"
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: lts/*
- name: Install Python dependencies
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
cd fiduswriter
fiduswriter lint
- name: Run tests
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 8
max_attempts: 3
Expand All @@ -64,13 +64,13 @@ jobs:
coverage run $(which fiduswriter) test book
- name: Upload failed test screenshots
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.4
with:
name: failure-artifacts
path: ${{ github.workspace }}/fiduswriter/screenshots/
- name: Coveralls
run: |
cd fiduswriter
coveralls --service=github
cd fiduswriter
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ fiduswriter/static-collected
fiduswriter/.coveragerc
fiduswriter/configuration.py
fiduswriter/fiduswriter.sql
fiduswriter/fiduswriter.sqlite3
fiduswriter/screenshots
fiduswriter.sql
29 changes: 14 additions & 15 deletions fiduswriter/book/static/css/book.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

span.label-counter::after,
a.reference-counter::after {
content: ' ' attr(data-book-counter); /* or data-chapter-counter */
content: " " attr(data-book-counter); /* or data-chapter-counter */
}

.footnote-counter::before {
content: attr(data-book-counter); /* or data-chapter-counter */
}

section[role='doc-footnote'] .footnote-counter::after {
content: '. ';
section[role="doc-footnote"] .footnote-counter::after {
content: ". ";
}

/* CSL */

.csl-bib-body {
padding-top: .5em;
padding-bottom: .5em;
padding-top: 0.5em;
padding-bottom: 0.5em;
}

.csl-left-margin {
Expand Down Expand Up @@ -46,7 +46,7 @@ section[role='doc-footnote'] .footnote-counter::after {
}

.csl-indent {
padding-left: .5in;
padding-left: 0.5in;
}

.csl-entry {
Expand All @@ -64,7 +64,7 @@ span.anchor {

figure figcaption {
margin-top: 10px;
font-size: .9em;
font-size: 0.9em;
}

figure img {
Expand Down Expand Up @@ -122,12 +122,11 @@ figure {
box-sizing: border-box;
}


figure[data-category='table'] figcaption span.text::before,
figure[data-category='photo'] figcaption span.text::before,
figure[data-category='figure'] figcaption span.text::before,
table[data-category='table'] caption span.text::before {
content: ': ';
figure[data-category="table"] figcaption span.text::before,
figure[data-category="photo"] figcaption span.text::before,
figure[data-category="figure"] figcaption span.text::before,
table[data-category="table"] caption span.text::before {
content: ": ";
}

table {
Expand Down Expand Up @@ -168,11 +167,11 @@ table {
text-decoration: underline;
}

.article table[data-layout='fixed'] {
.article table[data-layout="fixed"] {
table-layout: fixed !important;
}

.article table[data-layout='auto'] {
.article table[data-layout="auto"] {
table-layout: auto !important;
}

Expand Down
1 change: 0 additions & 1 deletion fiduswriter/book/static/css/book_dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ b.part {
background-size: contain;
}


#book-dialog .warninglist {
background-color: rgba(var(--warning-background-color));
}
Expand Down
4 changes: 2 additions & 2 deletions fiduswriter/book/tests/test_book.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
from selenium.webdriver.support.wait import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
from selenium.webdriver.common.action_chains import ActionChains
from testing.testcases import LiveTornadoTestCase
from channels.testing import ChannelsLiveServerTestCase
from testing.selenium_helper import SeleniumHelper

from django.conf import settings


class BookTest(LiveTornadoTestCase, SeleniumHelper):
class BookTest(SeleniumHelper, ChannelsLiveServerTestCase):
fixtures = [
"initial_documenttemplates.json",
"initial_styles.json",
Expand Down

0 comments on commit d006bc4

Please sign in to comment.