Skip to content

Commit f1a9663

Browse files
authored
Merge branch 'main' into main
2 parents 2080202 + be09b10 commit f1a9663

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

.github/workflows/github-ci.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,14 @@ name: CI
66
on:
77
push:
88
branches: [ main ]
9-
paths-ignore:
10-
- '**/*.md'
11-
- '**/*.rst'
129
pull_request:
1310
branches: [ main ]
14-
paths-ignore:
15-
- '**/*.md'
16-
- '**/*.rst'
1711
workflow_dispatch:
1812

1913
jobs:
2014
tests:
2115
name: pytest on ${{ matrix.python-version }}
22-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
2317
strategy:
2418
matrix:
2519
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
@@ -53,7 +47,7 @@ jobs:
5347

5448
codestyle:
5549
name: Check code style issues
56-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-latest
5751
steps:
5852
- name: Checkout Code
5953
uses: actions/checkout@v4

docs/user/subcommand-x2pdf.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $ ls -lh
4040
### Multiple files manually
4141

4242
```
43-
$ pdfly x2pdf image1.jpg image2.jgp -o out.pdf
43+
$ pdfly x2pdf image1.jpg image2.jpg -o out.pdf
4444
$ ls -lh
4545
-rw-rw-r-- 1 user user 47K Sep 17 21:49 image1.jpg
4646
-rw-rw-r-- 1 user user 15K Sep 17 21:49 image2.jpg

tests/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
except ImportError: # Fallback when not available (< Python 3.11):
1414
from contextlib import contextmanager
1515

16-
@contextmanager
16+
@contextmanager # type: ignore
1717
def chdir(dir_path):
1818
"""Non thread-safe context manager to change the current working directory."""
1919
cwd = Path.cwd()

0 commit comments

Comments
 (0)