Skip to content

Commit

Permalink
Upgrade python syntax (#19)
Browse files Browse the repository at this point in the history 
* Upgrade python syntax

* Update to use new syntax
  • Loading branch information
@timmo001
timmo001 committed Nov 18, 2023
1 parent 46714db commit 085f4d6
Show file tree
Hide file tree
Showing 22 changed files with 228 additions and 234 deletions.
32 changes: 30 additions & 2 deletions scripts/generate_models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"install",
"--upgrade",
"datamodel-code-generator",
"pyupgrade",
"isort",
"black",
]
print(" ".join(command))
Expand Down Expand Up @@ -63,15 +65,41 @@

print(" ".join(command))

with subprocess.Popen(command) as process:
process.wait()

command = [
"pyupgrade",
path_to,
]

print(" ".join(command))

with subprocess.Popen(command) as process:
process.wait()

command = [
"isort",
"--rm",
"from typing import Dict",
"--rm",
"from typing import List",
"--rm",
"from typing import Optional",
"--rm",
"from typing import Union",
path_to,
]

print(" ".join(command))

with subprocess.Popen(command) as process:
process.wait()

command = [
sys.executable,
"-m",
"black",
"-t",
"py39",
path_to,
]

Expand Down
6 changes: 2 additions & 4 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
"""Setup"""
import io

from setuptools import find_packages, setup

# Get setup packages from requirements.txt
with io.open("requirements_setup.txt", encoding="utf-8") as f:
with open("requirements_setup.txt", encoding="utf-8") as f:
requirements_setup = f.read().splitlines()

# Get packages from requirements.txt
with io.open("requirements.txt", encoding="utf-8") as f:
with open("requirements.txt", encoding="utf-8") as f:
requirements = f.read().splitlines()

setup(
Expand Down
6 changes: 3 additions & 3 deletions systembridgemodels/action.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from __future__ import annotations

from typing import Any, Optional
from typing import Any

from pydantic import BaseModel

Expand All @@ -14,5 +14,5 @@ class Action(BaseModel):
"""

command: str
data: Optional[dict[str, Any]] = None
label: Optional[str] = None
data: dict[str, Any] | None = None
label: str | None = None
14 changes: 6 additions & 8 deletions systembridgemodels/battery.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field


Expand All @@ -13,8 +11,8 @@ class LastUpdated(BaseModel):
Last updated
"""

is_charging: Optional[float] = None
percentage: Optional[float] = None
is_charging: float | None = None
percentage: float | None = None


class Battery(BaseModel):
Expand All @@ -25,7 +23,7 @@ class Battery(BaseModel):
class Config:
extra = Extra.allow

id: Optional[str] = Field(None, description="Event ID")
is_charging: Optional[bool] = None
percentage: Optional[float] = None
last_updated: Optional[LastUpdated] = Field(None, description="Last updated")
id: str | None = Field(None, description="Event ID")
is_charging: bool | None = None
percentage: float | None = None
last_updated: LastUpdated | None = Field(None, description="Last updated")
98 changes: 48 additions & 50 deletions systembridgemodels/cpu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field


Expand All @@ -13,29 +11,29 @@ class LastUpdated(BaseModel):
Last updated
"""

count: Optional[float] = None
frequency_current: Optional[float] = None
frequency_min: Optional[float] = None
frequency_max: Optional[float] = None
load_average: Optional[float] = None
power_package: Optional[float] = None
stats_ctx_switches: Optional[float] = None
stats_interrupts: Optional[float] = None
stats_soft_interrupts: Optional[float] = None
stats_syscalls: Optional[float] = None
temperature: Optional[float] = None
times_user: Optional[float] = None
times_system: Optional[float] = None
times_idle: Optional[float] = None
times_interrupt: Optional[float] = None
times_dpc: Optional[float] = None
times_percent_user: Optional[float] = None
times_percent_system: Optional[float] = None
times_percent_idle: Optional[float] = None
times_percent_interrupt: Optional[float] = None
times_percent_dpc: Optional[float] = None
usage: Optional[float] = None
voltage: Optional[float] = None
count: float | None = None
frequency_current: float | None = None
frequency_min: float | None = None
frequency_max: float | None = None
load_average: float | None = None
power_package: float | None = None
stats_ctx_switches: float | None = None
stats_interrupts: float | None = None
stats_soft_interrupts: float | None = None
stats_syscalls: float | None = None
temperature: float | None = None
times_user: float | None = None
times_system: float | None = None
times_idle: float | None = None
times_interrupt: float | None = None
times_dpc: float | None = None
times_percent_user: float | None = None
times_percent_system: float | None = None
times_percent_idle: float | None = None
times_percent_interrupt: float | None = None
times_percent_dpc: float | None = None
usage: float | None = None
voltage: float | None = None


class Cpu(BaseModel):
Expand All @@ -46,28 +44,28 @@ class Cpu(BaseModel):
class Config:
extra = Extra.allow

id: Optional[str] = Field(None, description="Event ID")
count: Optional[int] = None
frequency_current: Optional[float] = None
frequency_min: Optional[float] = None
frequency_max: Optional[float] = None
load_average: Optional[float] = None
power_package: Optional[float] = None
stats_ctx_switches: Optional[int] = None
stats_interrupts: Optional[int] = None
stats_soft_interrupts: Optional[int] = None
stats_syscalls: Optional[int] = None
temperature: Optional[float] = None
times_user: Optional[float] = None
times_system: Optional[float] = None
times_idle: Optional[float] = None
times_interrupt: Optional[float] = None
times_dpc: Optional[float] = None
times_percent_user: Optional[float] = None
times_percent_system: Optional[float] = None
times_percent_idle: Optional[float] = None
times_percent_interrupt: Optional[float] = None
times_percent_dpc: Optional[float] = None
usage: Optional[float] = None
voltage: Optional[float] = None
last_updated: Optional[LastUpdated] = Field(None, description="Last updated")
id: str | None = Field(None, description="Event ID")
count: int | None = None
frequency_current: float | None = None
frequency_min: float | None = None
frequency_max: float | None = None
load_average: float | None = None
power_package: float | None = None
stats_ctx_switches: int | None = None
stats_interrupts: int | None = None
stats_soft_interrupts: int | None = None
stats_syscalls: int | None = None
temperature: float | None = None
times_user: float | None = None
times_system: float | None = None
times_idle: float | None = None
times_interrupt: float | None = None
times_dpc: float | None = None
times_percent_user: float | None = None
times_percent_system: float | None = None
times_percent_idle: float | None = None
times_percent_interrupt: float | None = None
times_percent_dpc: float | None = None
usage: float | None = None
voltage: float | None = None
last_updated: LastUpdated | None = Field(None, description="Last updated")
4 changes: 1 addition & 3 deletions systembridgemodels/data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field

from .battery import Battery
Expand Down Expand Up @@ -35,4 +33,4 @@ class DataDict(BaseModel):
class Config:
extra = Extra.allow

last_updated: dict[str, Optional[float]] = Field(..., description="Last updated")
last_updated: dict[str, float | None] = Field(..., description="Last updated")
30 changes: 14 additions & 16 deletions systembridgemodels/disk.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field


Expand All @@ -14,12 +12,12 @@ class LastUpdated(BaseModel):
"""

devices: float
io_counters_read_count: Optional[float] = None
io_counters_write_count: Optional[float] = None
io_counters_read_bytes: Optional[float] = None
io_counters_write_bytes: Optional[float] = None
io_counters_read_time: Optional[float] = None
io_counters_write_time: Optional[float] = None
io_counters_read_count: float | None = None
io_counters_write_count: float | None = None
io_counters_read_bytes: float | None = None
io_counters_write_bytes: float | None = None
io_counters_read_time: float | None = None
io_counters_write_time: float | None = None
partitions: float


Expand All @@ -31,13 +29,13 @@ class Disk(BaseModel):
class Config:
extra = Extra.allow

id: Optional[str] = Field(None, description="Event ID")
id: str | None = Field(None, description="Event ID")
devices: list
io_counters_read_count: Optional[int] = None
io_counters_write_count: Optional[int] = None
io_counters_read_bytes: Optional[int] = None
io_counters_write_bytes: Optional[int] = None
io_counters_read_time: Optional[int] = None
io_counters_write_time: Optional[int] = None
io_counters_read_count: int | None = None
io_counters_write_count: int | None = None
io_counters_read_bytes: int | None = None
io_counters_write_bytes: int | None = None
io_counters_read_time: int | None = None
io_counters_write_time: int | None = None
partitions: list
last_updated: Optional[LastUpdated] = Field(None, description="Last updated")
last_updated: LastUpdated | None = Field(None, description="Last updated")
10 changes: 4 additions & 6 deletions systembridgemodels/display.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field


Expand All @@ -13,7 +11,7 @@ class LastUpdated(BaseModel):
Last updated
"""

displays: Optional[float] = None
displays: float | None = None


class Display(BaseModel):
Expand All @@ -24,6 +22,6 @@ class Display(BaseModel):
class Config:
extra = Extra.allow

id: Optional[str] = Field(None, description="Event ID")
displays: Optional[list] = None
last_updated: Optional[LastUpdated] = Field(None, description="Last updated")
id: str | None = Field(None, description="Event ID")
displays: list | None = None
last_updated: LastUpdated | None = Field(None, description="Last updated")
10 changes: 4 additions & 6 deletions systembridgemodels/gpu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import annotations

from typing import Optional

from pydantic import BaseModel, Extra, Field


Expand All @@ -13,7 +11,7 @@ class LastUpdated(BaseModel):
Last updated
"""

gpus: Optional[float] = None
gpus: float | None = None


class Gpu(BaseModel):
Expand All @@ -24,6 +22,6 @@ class Gpu(BaseModel):
class Config:
extra = Extra.allow

id: Optional[str] = Field(None, description="Event ID")
gpus: Optional[list] = None
last_updated: Optional[LastUpdated] = Field(None, description="Last updated")
id: str | None = Field(None, description="Event ID")
gpus: list | None = None
last_updated: LastUpdated | None = Field(None, description="Last updated")
Loading

0 comments on commit 085f4d6

Please sign in to comment.