Skip to content

Commit b0cd31f

Browse files
Pre-commit to Prek
Move prek repos to dev dependencies
1 parent 7e2d259 commit b0cd31f

File tree

20 files changed

+422
-451
lines changed

20 files changed

+422
-451
lines changed

.github/workflows/linting.yaml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,6 @@ jobs:
2727
with:
2828
python-version: ${{ env.PY_VERSION }}
2929
- name: Install project
30-
run: uv sync --locked --no-dev
30+
run: uv sync --locked --dev
3131
- name: Run pre-commit
32-
run: uv run --with pre-commit pre-commit run -a
33-
34-
ty:
35-
permissions:
36-
contents: read
37-
runs-on: ubuntu-latest
38-
39-
steps:
40-
- uses: actions/checkout@v6
41-
- uses: astral-sh/setup-uv@v7
42-
with:
43-
python-version: ${{ env.PY_VERSION }}
44-
- name: Install project
45-
run: uv sync --locked --no-dev
46-
- name: Run ty
47-
run: uv run --with ty ty check perdoo --ignore unresolved-import
48-
continue-on-error: true
32+
run: uv run prek run -a

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ __pycache__/
33
__pypackages__/
44
.idea/
55
.ruff_cache/
6+
.tox/
67
.venv/
78
build/
89
dist/
910
logs/
11+
site/
1012

1113
# =====Files=====
1214
*.iml
1315
*.log
16+
*.txt
1417
.coverage
1518
.envrc
1619
.pdm-python
1720
.python-version
18-
pdm.lock

.pre-commit-config.yaml

Lines changed: 0 additions & 69 deletions
This file was deleted.

docs/img/perdoo-archive.svg

Lines changed: 2 additions & 2 deletions
Loading

docs/img/perdoo-commands.svg

Lines changed: 2 additions & 2 deletions
Loading

docs/img/perdoo-process.svg

Lines changed: 2 additions & 2 deletions
Loading

docs/img/perdoo-settings.svg

Lines changed: 2 additions & 2 deletions
Loading

perdoo/comic/archives/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from perdoo.comic.errors import ComicArchiveError
88

99
try:
10-
from typing import Self # Python >= 3.11
10+
from typing import Self # Python >= 3.11 # ty:ignore[unresolved-import]
1111
except ImportError:
1212
from typing_extensions import Self # Python < 3.11
1313

perdoo/comic/archives/session.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from perdoo.utils import list_files
1313

1414
try:
15-
from typing import Self # Python >= 3.11
15+
from typing import Self # Python >= 3.11 # ty:ignore[unresolved-import]
1616
except ImportError:
1717
from typing_extensions import Self # Python < 3.11
1818

@@ -54,13 +54,14 @@ def __exit__(
5454
f"Archiving '{self._folder}' to '{self._archive.filepath}'",
5555
spinner="simpleDotsScrolling",
5656
):
57-
filepath = self._archive.archive_files(
58-
src=self._folder,
59-
output_name=self._archive.filepath.stem,
60-
files=list_files(path=self._folder),
61-
)
62-
self._archive.filepath.unlink(missing_ok=True)
63-
shutil.move(filepath, self._archive.filepath)
57+
if self._folder:
58+
filepath = self._archive.archive_files(
59+
src=self._folder,
60+
output_name=self._archive.filepath.stem,
61+
files=list_files(path=self._folder),
62+
)
63+
self._archive.filepath.unlink(missing_ok=True)
64+
shutil.move(filepath, self._archive.filepath)
6465
finally:
6566
if self._temp_dir:
6667
self._temp_dir.cleanup()
@@ -70,6 +71,7 @@ def __exit__(
7071
def list(self) -> list[str]:
7172
if self._archive.IS_EDITABLE:
7273
return self._archive.list_filenames()
74+
assert self._folder
7375
return [p.name for p in self._folder.iterdir()]
7476

7577
def contains(self, filename: str) -> bool:
@@ -78,6 +80,7 @@ def contains(self, filename: str) -> bool:
7880
def read(self, filename: str) -> bytes:
7981
if self._archive.IS_READABLE:
8082
return self._archive.read_file(filename=filename)
83+
assert self._folder
8184
return (self._folder / filename).read_bytes()
8285

8386
def write(self, filename: str, data: str | bytes) -> None:
@@ -87,6 +90,7 @@ def write(self, filename: str, data: str | bytes) -> None:
8790
if self._archive.IS_EDITABLE:
8891
self._archive.write_file(filename=filename, data=data)
8992
else:
93+
assert self._folder
9094
(self._folder / filename).write_bytes(data)
9195
self._updated = True
9296

@@ -95,6 +99,7 @@ def delete(self, filename: str) -> None:
9599
if self._archive.IS_EDITABLE:
96100
self._archive.delete_file(filename=filename)
97101
else:
102+
assert self._folder
98103
(self._folder / filename).unlink(missing_ok=True)
99104
self._updated = True
100105

@@ -103,6 +108,7 @@ def rename(self, filename: str, new_name: str, override: bool = False) -> None:
103108
if self._archive.IS_EDITABLE:
104109
self._archive.rename_file(filename=filename, new_name=new_name, override=override)
105110
else:
111+
assert self._folder
106112
src = self._folder / filename
107113
if not src.exists():
108114
raise ComicArchiveError(f"Unable to rename '{src}' as it does not exist.")

perdoo/comic/archives/sevenzip.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
PY7ZR_AVAILABLE = True
1818
except ImportError:
19-
py7zr = None
2019
PY7ZR_AVAILABLE = False
2120

2221
try:
23-
from typing import Self # Python >= 3.11
22+
from typing import Self # Python >= 3.11 # ty:ignore[unresolved-import]
2423
except ImportError:
2524
from typing_extensions import Self # Python < 3.11
2625

0 commit comments

Comments
 (0)