Skip to content

Commit ae0389a

Browse files
committed
Remove dark mode link changes and remove flask pin
Flask 3.1.1 is finally out, no need to pin version any longer.
1 parent 0e6e7fc commit ae0389a

File tree

8 files changed

+472
-457
lines changed

8 files changed

+472
-457
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ repos:
2323
hooks:
2424
- id: black
2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: v0.11.7
26+
rev: v0.11.10
2727
hooks:
28-
- id: ruff
28+
- id: ruff-check
2929
types: [file]
3030
types_or: [python, pyi, toml]
3131
args: ["--show-fixes"]
@@ -40,11 +40,11 @@ repos:
4040
additional_dependencies:
4141
- tomli
4242
- repo: https://github.com/adhtruong/mirrors-typos
43-
rev: v1.31.2
43+
rev: v1.32.0
4444
hooks:
4545
- id: typos
4646
- repo: https://github.com/woodruffw/zizmor-pre-commit
47-
rev: v1.6.0
47+
rev: v1.7.0
4848
hooks:
4949
- id: zizmor
5050
- repo: local
@@ -54,4 +54,4 @@ repos:
5454
language: system
5555
entry: python src/sanescansrv/generate_pages.py
5656
pass_filenames: false
57-
files: ^src\/sanescansrv\/(((htmlgen|generate_pages)\.py)|((static|templates)\/.+\.\w+))$
57+
files: ^src\/sanescansrv\/(((server|htmlgen|generate_pages)\.py)|((static|templates)\/.+\.\w+))$

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Kind of like CUPS but it's for scanning, not printing.
44
[![Tests](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml)
55
<!-- BADGIE TIME -->
66

7+
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/CoolCat467/Scanner-Server/main.svg)](https://results.pre-commit.ci/latest/github/CoolCat467/Scanner-Server/main)
78
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
89
[![code style: black](https://img.shields.io/badge/code_style-black-000000.svg)](https://github.com/psf/black)
9-
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
1010

1111
<!-- END BADGIE TIME -->
1212

pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ dependencies = [
4141
"Werkzeug~=3.1.3",
4242
'exceptiongroup >= 1.2.0; python_version < "3.11"',
4343
'tomli >= 2.0.1; python_version < "3.11"',
44-
# temporary until flask release that includes
45-
# https://github.com/pallets/flask/pull/5659 happens
46-
# for typing reasons
47-
"flask @ git+https://github.com/pallets/flask.git",
4844
]
4945

5046
[tool.setuptools.dynamic]

src/sanescansrv/generate_pages.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,6 @@ def generate_style_css() -> str:
186186
("input:hover", "button:hover"),
187187
background_color="#4a4a4a",
188188
),
189-
htmlgen.css(
190-
"a",
191-
color="#bb86fc",
192-
),
193-
htmlgen.css(
194-
"a:hover",
195-
color="#3700b3",
196-
),
197189
),
198190
),
199191
)

src/sanescansrv/server.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
from werkzeug.exceptions import HTTPException
6161

6262
from sanescansrv import elapsed, htmlgen, logger
63-
from sanescansrv.logger import log
6463

6564
if sys.version_info < (3, 11):
6665
import tomli as tomllib
@@ -1123,10 +1122,7 @@ def serve_scanner(
11231122
caught = False
11241123
for ex in exc.exceptions:
11251124
if isinstance(ex, KeyboardInterrupt):
1126-
log(
1127-
"Shutting down from keyboard interrupt",
1128-
log_dir=str(logs_path),
1129-
)
1125+
print("Shutting down from keyboard interrupt")
11301126
caught = True
11311127
break
11321128
if not caught:

src/sanescansrv/static/style.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,4 @@ input[type="submit"] {
8484
input:hover, button:hover {
8585
background-color: #4a4a4a;
8686
}
87-
a {
88-
color: #bb86fc;
89-
}
90-
a:hover {
91-
color: #3700b3;
92-
}
9387
}

uv.lock

Lines changed: 459 additions & 428 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zizmor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
rules:
2+
unpinned-uses:
3+
config:
4+
policies:
5+
# TODO: use the default policies
6+
"*": any

0 commit comments

Comments
 (0)