Skip to content

Commit eae026a

Browse files
authored
fix CI lint (libp2p#1021)
* remove blocklint config, ignore prometheus_client not found in deps * strip dot from tox env so all ci runs * more deps? * fix pythonpath for lint * update test_websocket.py for py310 compat * don't need testenvextras in lint
1 parent 6829ddd commit eae026a

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
if [[ "${{ matrix.toxenv }}" == 'docs' ]]; then
8282
export TOXENV=docs
8383
else
84-
export TOXENV=py${{ matrix.python }}-${{ matrix.toxenv }}
84+
export TOXENV=$(echo "py${{ matrix.python }}-${{ matrix.toxenv }}" | tr -d '.')
8585
fi
8686
# Set PATH for nim commands during tox
8787
if [[ "${{ matrix.toxenv }}" == 'interop' ]]; then

libp2p/rcmgr/prometheus_exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import threading
88

99
try:
10-
from prometheus_client import (
10+
from prometheus_client import ( # type: ignore[import]
1111
CONTENT_TYPE_LATEST,
1212
CollectorRegistry,
1313
Gauge,

tests/core/transport/test_websocket.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Import exceptiongroup for Python 3.11+
2-
import builtins
31
from collections.abc import Sequence
42
import logging
53
from typing import Any
64

75
import pytest
86

9-
if hasattr(builtins, "ExceptionGroup"):
10-
ExceptionGroup = builtins.ExceptionGroup
11-
else:
12-
# Fallback for older Python versions
13-
ExceptionGroup = Exception
7+
try:
8+
from builtins import ExceptionGroup # type: ignore[attr-defined]
9+
except ImportError:
10+
try:
11+
from exceptiongroup import ExceptionGroup # type: ignore[assignment]
12+
except ImportError: # pragma: no cover - fallback if dependency missing
13+
ExceptionGroup = Exception # type: ignore[assignment]
1414
from multiaddr import Multiaddr
1515
import trio
1616

@@ -833,9 +833,10 @@ async def test_wss_host_pair_data_exchange():
833833
.issuer_name(issuer)
834834
.public_key(private_key.public_key())
835835
.serial_number(x509.random_serial_number())
836-
.not_valid_before(datetime.datetime.now(datetime.UTC))
836+
.not_valid_before(datetime.datetime.now(datetime.timezone.utc))
837837
.not_valid_after(
838-
datetime.datetime.now(datetime.UTC) + datetime.timedelta(days=1)
838+
datetime.datetime.now(datetime.timezone.utc)
839+
+ datetime.timedelta(days=1)
839840
)
840841
.add_extension(
841842
x509.SubjectAlternativeName(

tox.ini

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ extend-ignore=E203
1313
max-line-length=88
1414
per-file-ignores=__init__.py:F401
1515

16-
[blocklint]
17-
max_issue_threshold=1
18-
1916
[testenv]
2017
usedevelop=True
2118
commands=
@@ -40,6 +37,8 @@ allowlist_externals=make,pre-commit
4037
deps=pre-commit
4138
extras=
4239
dev
40+
setenv =
41+
PYTHONPATH={envsitepackagesdir}{:}{env:PYTHONPATH:}
4342
commands=
4443
pre-commit install
4544
pre-commit run --all-files --show-diff-on-failure

0 commit comments

Comments
 (0)