Skip to content

Commit 614ba95

Browse files
committed
feat: experiment replacing pylint with ruff + pyright
1 parent 6ccde51 commit 614ba95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+179
-214
lines changed

.pre-commit-config.yaml

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,32 @@
11
repos:
2-
- repo: https://github.com/FHPythonUtils/Blackt
3-
rev: '2022.0.3'
2+
- repo: https://github.com/astral-sh/ruff-pre-commit
3+
rev: v0.1.13
44
hooks:
5-
- id: blackt
5+
- id: ruff
6+
args: [ --fix ]
67

7-
- repo: https://github.com/pycqa/isort
8-
rev: 5.12.0
8+
- repo: https://github.com/RobertCraigie/pyright-python
9+
rev: v1.1.347
910
hooks:
10-
- id: isort
11+
- id: pyright
1112

12-
- repo: https://github.com/pycqa/pylint
13-
rev: v3.0.0a6
13+
- repo: https://github.com/FHPythonUtils/Blackt
14+
rev: '2024'
1415
hooks:
15-
- id: pylint
16-
exclude: "tests/"
17-
args: [--disable=import-error,--jobs=0]
16+
- id: blackt
1817

1918
- repo: https://github.com/pre-commit/pre-commit-hooks
20-
rev: v4.4.0
19+
rev: v4.5.0
2120
hooks:
2221
- id: trailing-whitespace
23-
exclude: "tests/"
2422
- id: end-of-file-fixer
25-
exclude: "tests/"
2623

27-
- repo: https://github.com/asottile/pyupgrade
28-
rev: v3.7.0
29-
hooks:
30-
- id: pyupgrade
31-
args: [--py38-plus]
3224
- repo: https://github.com/boidolr/pre-commit-images
33-
rev: v1.2.1
25+
rev: v1.5.1
3426
hooks:
35-
- id: optimize-avif
36-
exclude: "tests/"
3727
- id: optimize-jpg
38-
exclude: "tests/"
3928
- id: optimize-png
40-
exclude: "tests/"
4129
- id: optimize-svg
42-
exclude: "tests/"
4330
- id: optimize-webp
44-
exclude: "tests/"
31+
32+
exclude: "tests/data|documentation/reference"
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Blend
22

3-
[Layeredimage Index](../README.md#layeredimage-index) /
4-
[Layeredimage](./index.md#layeredimage) /
5-
Blend
3+
[Layeredimage Index](../README.md#layeredimage-index) / [Layeredimage](./index.md#layeredimage) / Blend
64

75
> Auto-generated documentation for [layeredimage.blend](../../../layeredimage/blend.py) module.
86
- [Blend](#blend)

documentation/reference/layeredimage/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Layeredimage
22

3-
[Layeredimage Index](../README.md#layeredimage-index) /
4-
Layeredimage
3+
[Layeredimage Index](../README.md#layeredimage-index) / Layeredimage
54

65
> Auto-generated documentation for [layeredimage](../../../layeredimage/__init__.py) module.
76

documentation/reference/layeredimage/io/common.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Common
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Common
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Common
74

85
> Auto-generated documentation for [layeredimage.io.common](../../../../layeredimage/io/common.py) module.
96

documentation/reference/layeredimage/io/gif.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Gif
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Gif
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Gif
74

85
> Auto-generated documentation for [layeredimage.io.gif](../../../../layeredimage/io/gif.py) module.
96
@@ -13,7 +10,7 @@ Gif
1310

1411
## openLayer_GIF
1512

16-
[Show source in gif.py:14](../../../../layeredimage/io/gif.py#L14)
13+
[Show source in gif.py:12](../../../../layeredimage/io/gif.py#L12)
1714

1815
Open a .gif file into a layered image.
1916

@@ -27,7 +24,7 @@ def openLayer_GIF(file: str) -> LayeredImage: ...
2724

2825
## saveLayer_GIF
2926

30-
[Show source in gif.py:32](../../../../layeredimage/io/gif.py#L32)
27+
[Show source in gif.py:30](../../../../layeredimage/io/gif.py#L30)
3128

3229
Save a layered image as .gif.
3330

documentation/reference/layeredimage/io/index.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Io
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
Io
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / Io
64

75
> Auto-generated documentation for [layeredimage.io](../../../../layeredimage/io/__init__.py) module.
86
@@ -15,7 +13,7 @@ Io
1513

1614
## exportFlatImage
1715

18-
[Show source in __init__.py:103](../../../../layeredimage/io/__init__.py#L103)
16+
[Show source in __init__.py:109](../../../../layeredimage/io/__init__.py#L109)
1917

2018
Export the layered image to a unilayer image file.
2119

@@ -49,16 +47,19 @@ Open a layer image file into a layer image object.
4947

5048
#### Arguments
5149

52-
- `file` *str* - path/ filename
50+
----
51+
- `file` *str* - path/ filename
5352

5453
#### Raises
5554

56-
- `FileExistsError` - If the layered image does not exist
57-
- `ValueError` - If the extention is not recognised
55+
------
56+
- `FileExistsError` - If the layered image does not exist
57+
- `ValueError` - If the extention is not recognised
5858

5959
#### Returns
6060

61-
- `LayeredImage` - a layered image object
61+
-------
62+
- `LayeredImage` - a layered image object
6263

6364
#### Signature
6465

@@ -70,22 +71,25 @@ def openLayerImage(file: str | Path) -> LayeredImage: ...
7071

7172
## saveLayerImage
7273

73-
[Show source in __init__.py:70](../../../../layeredimage/io/__init__.py#L70)
74+
[Show source in __init__.py:73](../../../../layeredimage/io/__init__.py#L73)
7475

7576
Save a layered image to a file.
7677

7778
#### Arguments
7879

79-
- `fileName` *str* - path/ filename
80-
- `layeredImage` *LayeredImage* - the layered image to save
80+
----
81+
- `fileName` *str* - path/ filename
82+
- `layeredImage` *LayeredImage* - the layered image to save
8183

8284
#### Raises
8385

84-
- `ValueError` - If the extention is not recognised
86+
------
87+
- `ValueError` - If the extention is not recognised
8588

8689
#### Returns
8790

88-
None
91+
-------
92+
None
8993

9094
#### Signature
9195

documentation/reference/layeredimage/io/layered.md

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
11
# Layered
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Layered
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Layered
74

85
> Auto-generated documentation for [layeredimage.io.layered](../../../../layeredimage/io/layered.py) module.
96
107
- [Layered](#layered)
8+
- [_saveLayer_LAYERED](#_savelayer_layered)
119
- [grabLayer_LAYERED](#grablayer_layered)
1210
- [openLayer_LAYERED](#openlayer_layered)
1311
- [openLayer_LAYEREDC](#openlayer_layeredc)
1412
- [saveLayer_LAYERED](#savelayer_layered)
1513
- [saveLayer_LAYEREDC](#savelayer_layeredc)
1614
- [writeImage_LAYERED](#writeimage_layered)
1715

16+
## _saveLayer_LAYERED
17+
18+
[Show source in layered.py:101](../../../../layeredimage/io/layered.py#L101)
19+
20+
Save a layered image as .layered.
21+
22+
#### Signature
23+
24+
```python
25+
def _saveLayer_LAYERED(
26+
fileName: str, layeredImage: LayeredImage, compressed: bool = False
27+
) -> None: ...
28+
```
29+
30+
31+
1832
## grabLayer_LAYERED
1933

20-
[Show source in layered.py:83](../../../../layeredimage/io/layered.py#L83)
34+
[Show source in layered.py:81](../../../../layeredimage/io/layered.py#L81)
2135

2236
Grab an image from .layered.
2337

@@ -33,7 +47,7 @@ def grabLayer_LAYERED(
3347

3448
## openLayer_LAYERED
3549

36-
[Show source in layered.py:21](../../../../layeredimage/io/layered.py#L21)
50+
[Show source in layered.py:19](../../../../layeredimage/io/layered.py#L19)
3751

3852
Open a .layered file into a layered image.
3953

@@ -47,7 +61,7 @@ def openLayer_LAYERED(file: str) -> LayeredImage: ...
4761

4862
## openLayer_LAYEREDC
4963

50-
[Show source in layered.py:133](../../../../layeredimage/io/layered.py#L133)
64+
[Show source in layered.py:131](../../../../layeredimage/io/layered.py#L131)
5165

5266
Open a .layeredc file into a layered image.
5367

@@ -61,7 +75,7 @@ def openLayer_LAYEREDC(file: str) -> LayeredImage: ...
6175

6276
## saveLayer_LAYERED
6377

64-
[Show source in layered.py:98](../../../../layeredimage/io/layered.py#L98)
78+
[Show source in layered.py:96](../../../../layeredimage/io/layered.py#L96)
6579

6680
Save a layered image as .layered.
6781

@@ -75,7 +89,7 @@ def saveLayer_LAYERED(fileName: str, layeredImage: LayeredImage) -> None: ...
7589

7690
## saveLayer_LAYEREDC
7791

78-
[Show source in layered.py:138](../../../../layeredimage/io/layered.py#L138)
92+
[Show source in layered.py:136](../../../../layeredimage/io/layered.py#L136)
7993

8094
Save a layeredc image as .layered.
8195

@@ -89,7 +103,7 @@ def saveLayer_LAYEREDC(fileName: str, layeredImage: LayeredImage) -> None: ...
89103

90104
## writeImage_LAYERED
91105

92-
[Show source in layered.py:121](../../../../layeredimage/io/layered.py#L121)
106+
[Show source in layered.py:119](../../../../layeredimage/io/layered.py#L119)
93107

94108
Write an image to the archive.
95109

documentation/reference/layeredimage/io/lsr.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Lsr
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Lsr
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Lsr
74

85
> Auto-generated documentation for [layeredimage.io.lsr](../../../../layeredimage/io/lsr.py) module.
96
@@ -13,7 +10,7 @@ Lsr
1310

1411
## openLayer_LSR
1512

16-
[Show source in lsr.py:16](../../../../layeredimage/io/lsr.py#L16)
13+
[Show source in lsr.py:13](../../../../layeredimage/io/lsr.py#L13)
1714

1815
Open a .lsr file into a layered image.
1916

@@ -27,7 +24,7 @@ def openLayer_LSR(file: str) -> LayeredImage: ...
2724

2825
## saveLayer_LSR
2926

30-
[Show source in lsr.py:37](../../../../layeredimage/io/lsr.py#L37)
27+
[Show source in lsr.py:34](../../../../layeredimage/io/lsr.py#L34)
3128

3229
Save a layered image as .lsr.
3330

documentation/reference/layeredimage/io/ora.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Ora
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Ora
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Ora
74

85
> Auto-generated documentation for [layeredimage.io.ora](../../../../layeredimage/io/ora.py) module.
96
@@ -14,7 +11,7 @@ Ora
1411

1512
## addLayer_ORA
1613

17-
[Show source in ora.py:128](../../../../layeredimage/io/ora.py#L128)
14+
[Show source in ora.py:125](../../../../layeredimage/io/ora.py#L125)
1815

1916
Update the project with a shiny new layer.
2017

@@ -28,7 +25,7 @@ def addLayer_ORA(project, layer, blendLookup): ...
2825

2926
## openLayer_ORA
3027

31-
[Show source in ora.py:14](../../../../layeredimage/io/ora.py#L14)
28+
[Show source in ora.py:11](../../../../layeredimage/io/ora.py#L11)
3229

3330
Open an .ora file into a layered image.
3431

@@ -42,7 +39,7 @@ def openLayer_ORA(file: str) -> LayeredImage: ...
4239

4340
## saveLayer_ORA
4441

45-
[Show source in ora.py:84](../../../../layeredimage/io/ora.py#L84)
42+
[Show source in ora.py:81](../../../../layeredimage/io/ora.py#L81)
4643

4744
Save a layered image as .ora.
4845

documentation/reference/layeredimage/io/pdn.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Pdn
22

3-
[Layeredimage Index](../../README.md#layeredimage-index) /
4-
[Layeredimage](../index.md#layeredimage) /
5-
[Io](./index.md#io) /
6-
Pdn
3+
[Layeredimage Index](../../README.md#layeredimage-index) / [Layeredimage](../index.md#layeredimage) / [Io](./index.md#io) / Pdn
74

85
> Auto-generated documentation for [layeredimage.io.pdn](../../../../layeredimage/io/pdn.py) module.
96
@@ -13,7 +10,7 @@ Pdn
1310

1411
## openLayer_PDN
1512

16-
[Show source in pdn.py:16](../../../../layeredimage/io/pdn.py#L16)
13+
[Show source in pdn.py:13](../../../../layeredimage/io/pdn.py#L13)
1714

1815
Open a .pdn file into a layered image.
1916

@@ -27,7 +24,7 @@ def openLayer_PDN(file: str) -> LayeredImage: ...
2724

2825
## saveLayer_PDN
2926

30-
[Show source in pdn.py:55](../../../../layeredimage/io/pdn.py#L55)
27+
[Show source in pdn.py:52](../../../../layeredimage/io/pdn.py#L52)
3128

3229
Save a layered image as .pdn.
3330

0 commit comments

Comments
 (0)