Skip to content

Commit 8916193

Browse files
targetblanktargetblank
authored
fix: DeprecationWarning: pkg_resources is deprecated as an API (#67)
* fix: DeprecationWarning: pkg_resources is deprecated as an API * style: fix all linter code style warnings * fix: use same ruff version in pre-commit hook and venv --------- Co-authored-by: Andreas Bühl <andreas.buehl@check24.de>
1 parent 7f45493 commit 8916193

36 files changed

Lines changed: 188 additions & 179 deletions

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ repos:
1414
hooks:
1515
- id: commitizen
1616
- repo: https://github.com/charliermarsh/ruff-pre-commit
17-
rev: v0.3.0
17+
rev: v0.12.1
1818
hooks:
1919
# Run the linter
20-
- id: ruff
20+
- id: ruff-check
2121
args:
2222
- --fix
2323
# Run the formatter

‎mode/__init__.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,29 @@
3535
__all__ = [
3636
"BaseSignal",
3737
"BaseSignalT",
38-
"Service",
39-
"Signal",
40-
"SignalT",
41-
"SyncSignal",
42-
"SyncSignalT",
38+
"CrashingSupervisor",
4339
"ForfeitOneForAllSupervisor",
4440
"ForfeitOneForOneSupervisor",
4541
"OneForAllSupervisor",
4642
"OneForOneSupervisor",
47-
"SupervisorStrategy",
48-
"CrashingSupervisor",
43+
"Seconds",
44+
"Service",
4945
"ServiceT",
46+
"Signal",
47+
"SignalT",
48+
"SupervisorStrategy",
5049
"SupervisorStrategyT",
51-
"Seconds",
52-
"want_seconds",
50+
"SyncSignal",
51+
"SyncSignalT",
52+
"Worker",
53+
"flight_recorder",
5354
"get_logger",
54-
"setup_logging",
5555
"label",
56+
"setup_logging",
5657
"shortlabel",
57-
"Worker",
5858
"task",
5959
"timer",
60-
"flight_recorder",
60+
"want_seconds",
6161
]
6262

6363

‎mode/locals.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -113,36 +113,36 @@ class XProxy(MutableMappingRole, AsyncContextManagerRole):
113113
from .utils.locals import LocalStack # XXX compat
114114

115115
__all__ = [
116-
"LocalStack",
117-
"Proxy",
118-
"AwaitableRole",
119-
"AwaitableProxy",
120-
"CoroutineRole",
121-
"CoroutineProxy",
122-
"AsyncIterableRole",
116+
"AsyncContextManagerProxy",
117+
"AsyncContextManagerRole",
118+
"AsyncGeneratorProxy",
119+
"AsyncGeneratorRole",
123120
"AsyncIterableProxy",
124-
"AsyncIteratorRole",
121+
"AsyncIterableRole",
125122
"AsyncIteratorProxy",
126-
"AsyncGeneratorRole",
127-
"AsyncGeneratorProxy",
128-
"SequenceRole",
129-
"SequenceProxy",
130-
"MutableSequenceRole",
131-
"MutableSequenceProxy",
132-
"SetRole",
133-
"SetProxy",
134-
"MutableSetRole",
135-
"MutableSetProxy",
136-
"ContextManagerRole",
123+
"AsyncIteratorRole",
124+
"AwaitableProxy",
125+
"AwaitableRole",
126+
"CallableProxy",
127+
"CallableRole",
137128
"ContextManagerProxy",
138-
"AsyncContextManagerRole",
139-
"AsyncContextManagerProxy",
140-
"MappingRole",
129+
"ContextManagerRole",
130+
"CoroutineProxy",
131+
"CoroutineRole",
132+
"LocalStack",
141133
"MappingProxy",
142-
"MutableMappingRole",
134+
"MappingRole",
143135
"MutableMappingProxy",
144-
"CallableRole",
145-
"CallableProxy",
136+
"MutableMappingRole",
137+
"MutableSequenceProxy",
138+
"MutableSequenceRole",
139+
"MutableSetProxy",
140+
"MutableSetRole",
141+
"Proxy",
142+
"SequenceProxy",
143+
"SequenceRole",
144+
"SetProxy",
145+
"SetRole",
146146
"maybe_evaluate",
147147
]
148148

@@ -188,11 +188,11 @@ class Proxy(Generic[T]):
188188
# Code initially stolen from werkzeug.local.Proxy.
189189
if not SLOTS_ISSUE_PRESENT and not PYPY: # pragma: no cover
190190
__slots__ = (
191-
"__local",
192191
"__args",
193-
"__kwargs",
194-
"__finalizers",
195192
"__dict__",
193+
"__finalizers",
194+
"__kwargs",
195+
"__local",
196196
)
197197

198198
def __init_subclass__(self, source: Optional[Type[T]] = None) -> None:

‎mode/loop/eventlet.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import eventlet
99
except ImportError:
1010
raise ImportError(
11-
"Eventlet loop requires the eventlet library: " "pip install eventlet"
11+
"Eventlet loop requires the eventlet library: pip install eventlet"
1212
) from None
1313
eventlet.monkey_patch()
1414

‎mode/loop/gevent.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import gevent.monkey
1212
except ImportError:
1313
raise ImportError(
14-
"Gevent loop requires the gevent library: " "pip install gevent"
14+
"Gevent loop requires the gevent library: pip install gevent"
1515
) from None
1616
gevent.monkey.patch_all()
1717

@@ -35,7 +35,7 @@
3535
except ImportError:
3636
raise
3737
raise ImportError(
38-
"Gevent loop requires the aiogevent library: " "pip install aiogevent"
38+
"Gevent loop requires the aiogevent library: pip install aiogevent"
3939
) from None
4040

4141

‎mode/services.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from .utils.trees import Node
4444
from .utils.types.trees import NodeT
4545

46-
__all__ = ["ServiceBase", "Service", "Diag", "task", "timer", "crontab"]
46+
__all__ = ["Diag", "Service", "ServiceBase", "crontab", "task", "timer"]
4747

4848
ClockArg = Callable[[], float]
4949

@@ -111,7 +111,7 @@ def __init__(
111111
def _format_log(
112112
self, severity: int, msg: str, *args: Any, **kwargs: Any
113113
) -> str:
114-
return f'[^{"-" * (self.beacon.depth - 1)}{self.shortlabel}]: {msg}'
114+
return f"[^{'-' * (self.beacon.depth - 1)}{self.shortlabel}]: {msg}"
115115

116116
async def __aenter__(self) -> ServiceT:
117117
await self.start()

‎mode/supervisors.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
__all__ = [
2121
"ForfeitOneForAllSupervisor",
2222
"ForfeitOneForOneSupervisor",
23-
"SupervisorStrategy",
24-
"OneForOneSupervisor",
2523
"OneForAllSupervisor",
24+
"OneForOneSupervisor",
25+
"SupervisorStrategy",
2626
]
2727

2828
logger = get_logger(__name__)

‎mode/threads.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
from .utils.locks import Event
3636

3737
__all__ = [
38+
"QueueServiceThread",
3839
"QueuedMethod",
39-
"WorkerThread",
4040
"ServiceThread",
41-
"QueueServiceThread",
41+
"WorkerThread",
4242
]
4343

4444

‎mode/types/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
from .supervisors import SupervisorStrategyT
44

55
__all__ = [
6+
"BaseSignalT",
67
"DiagT",
78
"ServiceT",
8-
"BaseSignalT",
99
"SignalHandlerT",
1010
"SignalT",
11-
"SyncSignalT",
1211
"SupervisorStrategyT",
12+
"SyncSignalT",
1313
]

‎mode/types/signals.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
__all__ = [
2222
"BaseSignalT",
2323
"FilterReceiverMapping",
24-
"SignalHandlerT",
2524
"SignalHandlerRefT",
25+
"SignalHandlerT",
2626
"SignalT",
2727
"SyncSignalT",
2828
"T",

0 commit comments

Comments
 (0)