Browse Source

Revert "scripts: Bump Python target version for ruff"

This reverts commit e8caaf4137.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
pull/91826/merge
Benjamin Cabé 6 days ago committed by Daniel DeGrasse
parent
commit
daf5584c63
  1. 2
      .ruff.toml
  2. 6
      scripts/footprint/pack_as_twister.py
  3. 4
      scripts/pylib/twister/twisterlib/environment.py

2
.ruff.toml

@ -4,7 +4,7 @@
extend = ".ruff-excludes.toml" extend = ".ruff-excludes.toml"
line-length = 100 line-length = 100
target-version = "py312" target-version = "py310"
[lint] [lint]
select = [ select = [

6
scripts/footprint/pack_as_twister.py

@ -33,7 +33,7 @@ test suite name ('dot separated' format).
from __future__ import annotations from __future__ import annotations
from datetime import datetime, UTC from datetime import datetime, timezone
import argparse import argparse
import os import os
import sys import sys
@ -163,7 +163,7 @@ def main():
skipped = 0 skipped = 0
filtered = 0 filtered = 0
run_date = datetime.now(UTC).isoformat(timespec='seconds') run_date = datetime.now(timezone.utc).isoformat(timespec='seconds')
init_logs() init_logs()
@ -251,7 +251,7 @@ def main():
res['environment'] = { res['environment'] = {
'zephyr_version': data_id['version'], 'zephyr_version': data_id['version'],
'commit_date': 'commit_date':
git_commit.committed_datetime.astimezone(UTC).isoformat(timespec='seconds'), git_commit.committed_datetime.astimezone(timezone.utc).isoformat(timespec='seconds'),
'run_date': run_date, 'run_date': run_date,
'options': { 'options': {
'testsuite_root': [ plan[r_plan]['application'] ], 'testsuite_root': [ plan[r_plan]['application'] ],

4
scripts/pylib/twister/twisterlib/environment.py

@ -16,7 +16,7 @@ import shutil
import subprocess import subprocess
import sys import sys
from collections.abc import Generator from collections.abc import Generator
from datetime import UTC, datetime from datetime import datetime, timezone
from importlib import metadata from importlib import metadata
from pathlib import Path from pathlib import Path
@ -1104,7 +1104,7 @@ class TwisterEnv:
def discover(self): def discover(self):
self.check_zephyr_version() self.check_zephyr_version()
self.get_toolchain() self.get_toolchain()
self.run_date = datetime.now(UTC).isoformat(timespec='seconds') self.run_date = datetime.now(timezone.utc).isoformat(timespec='seconds')
def check_zephyr_version(self): def check_zephyr_version(self):
try: try:

Loading…
Cancel
Save