tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ruff fixes

Browse Source
This commit is contained in:
Donkie
2023-05-28 22:55:11 +02:00
parent 639f91bd49
commit 235236d435
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@@ -16,7 +16,7 @@ exclude = ["client"]
[tool.ruff] [tool.ruff]
select = ["ALL"] select = ["ALL"]
ignore = ["A003", "D101", "D104", "D406", "D407", "S104", "TRY201", "TRY003", "EM101", "EM102", "DTZ003", "PLR0913"] ignore = ["ANN101", "A003", "D101", "D104", "D203", "D213", "D406", "D407", "S104", "TRY201", "TRY003", "EM101", "EM102", "DTZ003", "PLR0913"]
line-length = 120 line-length = 120
target-version = "py39" target-version = "py39"

4
requirements_dev.txt
View File

@@ -1,2 +1,2 @@
ruff==0.0.260 ruff
black==23.3.0 black

2
spoolman/api/v1/models.py
View File

@@ -132,7 +132,7 @@ class Spool(BaseModel):
def from_db(item: models.Spool) -> "Spool": def from_db(item: models.Spool) -> "Spool":
"""Create a new Pydantic spool object from a database spool object.""" """Create a new Pydantic spool object from a database spool object."""
filament = Filament.from_db(item.filament) filament = Filament.from_db(item.filament)
remaining_weight: Optional[float] = None remaining_weight: float | None = None
if filament.weight is not None: if filament.weight is not None:
remaining_weight = max(filament.weight - item.used_weight, 0) remaining_weight = max(filament.weight - item.used_weight, 0)

2
spoolman/database/filament.py
View File

@@ -28,7 +28,7 @@ async def create(
settings_bed_temp: Optional[int] = None, settings_bed_temp: Optional[int] = None,
) -> models.Filament: ) -> models.Filament:
"""Add a new filament to the database.""" """Add a new filament to the database."""
vendor_item: Optional[models.Vendor] = None vendor_item: models.Vendor | None = None
if vendor_id is not None: if vendor_id is not None:
vendor_item = await vendor.get_by_id(db, vendor_id) vendor_item = await vendor.get_by_id(db, vendor_id)

1
spoolman/database/models.py
View File

@@ -41,7 +41,6 @@ class Filament(Base):
comment: Mapped[Optional[str]] = mapped_column(String(1024)) comment: Mapped[Optional[str]] = mapped_column(String(1024))
settings_extruder_temp: Mapped[Optional[int]] = mapped_column(comment="Overridden extruder temperature.") settings_extruder_temp: Mapped[Optional[int]] = mapped_column(comment="Overridden extruder temperature.")
settings_bed_temp: Mapped[Optional[int]] = mapped_column(comment="Overridden bed temperature.") settings_bed_temp: Mapped[Optional[int]] = mapped_column(comment="Overridden bed temperature.")
# TODO: Color?
class Spool(Base): class Spool(Base):

1
spoolman/database/spool.py
View File

@@ -139,7 +139,6 @@ async def use_weight_safe(db: AsyncSession, spool_id: int, weight: float) -> Non
) )
# TODO: Make unit tests for race conditions on these
async def use_weight(db: AsyncSession, spool_id: int, weight: float) -> models.Spool: async def use_weight(db: AsyncSession, spool_id: int, weight: float) -> models.Spool:
"""Consume filament from a spool by weight. """Consume filament from a spool by weight.

2
spoolman/main.py
View File

@@ -90,7 +90,7 @@ async def startup() -> None:
# There is some issue with the uvicorn worker that causes the process to hang when running alembic directly. # There is some issue with the uvicorn worker that causes the process to hang when running alembic directly.
# See: https://github.com/sqlalchemy/alembic/discussions/1155 # See: https://github.com/sqlalchemy/alembic/discussions/1155
project_root = Path(__file__).parent.parent project_root = Path(__file__).parent.parent
subprocess.run(["alembic", "upgrade", "head"], check=True, cwd=project_root) # noqa: S603, S607 subprocess.run(["alembic", "upgrade", "head"], check=True, cwd=project_root) # noqa: S603, S607, ASYNC101
logger.info("Startup complete.") logger.info("Startup complete.")

2
tests_integration/run.py
View File

@@ -1,5 +1,7 @@
"""Build and run the integration tests.""" """Build and run the integration tests."""
# ruff: noqa: S605, S607
import os import os
os.system("docker build -t donkie/spoolman:test .") os.system("docker build -t donkie/spoolman:test .")