Compare commits
No commits in common. "9260c225e4277d0fe1eced9930368e05318c759e" and "5e3faa5367ba6092d63959f5919dc80ad33a3340" have entirely different histories.
9260c225e4
...
5e3faa5367
6 changed files with 7 additions and 25 deletions
21
justfile
21
justfile
|
|
@ -1,17 +1,10 @@
|
||||||
[private]
|
|
||||||
default:
|
default:
|
||||||
@just --list
|
@just --list
|
||||||
|
|
||||||
# create venv, install dependencies
|
|
||||||
setup:
|
setup:
|
||||||
uv sync
|
uv sync
|
||||||
# install the other tools: prek, mise
|
|
||||||
|
|
||||||
# builds a package (tgz and whl)
|
# run Textual's console
|
||||||
build:
|
|
||||||
uv build
|
|
||||||
|
|
||||||
# console to observe log messages
|
|
||||||
console:
|
console:
|
||||||
uv run textual console
|
uv run textual console
|
||||||
|
|
||||||
|
|
@ -21,50 +14,42 @@ the_app := "teilchensammler_cli.main"
|
||||||
run-dev:
|
run-dev:
|
||||||
uv run textual run --dev {{ the_app }}
|
uv run textual run --dev {{ the_app }}
|
||||||
|
|
||||||
# run the app
|
|
||||||
run:
|
run:
|
||||||
uv run python -m {{ the_app }}
|
uv run python -m {{ the_app }}
|
||||||
|
|
||||||
uv_export_options := "--frozen --format requirements.txt --quiet --no-install-project"
|
uv_export_options := "--frozen --format requirements.txt --quiet --no-install-project"
|
||||||
# export dependencies into requirements files
|
|
||||||
exports-deps:
|
exports-deps:
|
||||||
uv export {{ uv_export_options }} --output-file requirements.txt
|
uv export {{ uv_export_options }} --output-file requirements.txt
|
||||||
uv export {{ uv_export_options }} --output-file requirements.dev.txt --only-dev
|
uv export {{ uv_export_options }} --output-file requirements.dev.txt --only-dev
|
||||||
|
|
||||||
# Update dependencies to new versions
|
install-deps: setup
|
||||||
|
|
||||||
update-deps:
|
update-deps:
|
||||||
uv lock --upgrade
|
uv lock --upgrade
|
||||||
uv sync
|
uv sync
|
||||||
|
|
||||||
# Run tests, args are passed-through to pytest
|
|
||||||
test *ARGS:
|
test *ARGS:
|
||||||
uv run pytest tests.py {{ ARGS }}
|
uv run pytest tests.py {{ ARGS }}
|
||||||
|
|
||||||
# run tests and create coverage reports
|
|
||||||
coverage:
|
coverage:
|
||||||
uv run pytest tests.py --cov=src/ --cov-report term --cov-report xml --cov-report html --cov-config pyproject.toml
|
uv run pytest tests.py --cov=src/ --cov-report term --cov-report xml --cov-report html --cov-config pyproject.toml
|
||||||
|
|
||||||
# lint python code
|
|
||||||
lint-python:
|
lint-python:
|
||||||
uv run ruff check .
|
uv run ruff check .
|
||||||
|
|
||||||
# lint markdown documents
|
|
||||||
lint-markdown:
|
lint-markdown:
|
||||||
markdownlint-cli2 .
|
markdownlint-cli2 .
|
||||||
|
|
||||||
# run python and markdown
|
|
||||||
lint: lint-python lint-markdown
|
lint: lint-python lint-markdown
|
||||||
|
|
||||||
# remove artefacts from dist/
|
# remove artefacts from dist/
|
||||||
clean:
|
clean:
|
||||||
rm dist/*.whl dist/*.tar.gz
|
rm dist/*.whl dist/*.tar.gz
|
||||||
|
|
||||||
# pretend we are CI
|
|
||||||
ci: lint
|
ci: lint
|
||||||
prek run --all-files
|
prek run --all-files
|
||||||
# woodpecker-cli exec "whatever"
|
# woodpecker-cli exec "whatever"
|
||||||
|
|
||||||
# create a new realese [CURRENTLY USELESS]
|
|
||||||
release:
|
release:
|
||||||
@echo remember to git tag and update pyproject.toml
|
@echo remember to git tag and update pyproject.toml
|
||||||
uv build
|
uv build
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
[env]
|
[env]
|
||||||
'_'.python.venv = { path = ".venv", create = true }
|
'_'.python.venv = { path = ".venv", create = true }
|
||||||
DATABASE_URL = "sqlite:///database.db"
|
|
||||||
|
|
||||||
[tools]
|
[tools]
|
||||||
markdownlint-cli2 = "latest"
|
markdownlint-cli2 = "latest"
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
import os
|
|
||||||
from sqlmodel import SQLModel, create_engine
|
from sqlmodel import SQLModel, create_engine
|
||||||
|
|
||||||
|
sqlite_url = "sqlite:///database.db" # TODO: get url from environment
|
||||||
sqlite_url = os.environ.get("DATABASE_URL", "sqlite:///database.db")
|
|
||||||
engine = create_engine(sqlite_url, echo=True)
|
engine = create_engine(sqlite_url, echo=True)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,6 @@ async def load_initial_data() -> Sequence[Teilchen]:
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
statement = select(
|
statement = select(
|
||||||
Teilchen.id, Teilchen.name, Teilchen.description, Teilchen.number, Teilchen.tags
|
Teilchen.id, Teilchen.name, Teilchen.description, Teilchen.number, Teilchen.tags
|
||||||
) # ty:ignore[no-matching-overload]
|
)
|
||||||
all_teilchen = session.exec(statement).all()
|
all_teilchen = session.exec(statement).all()
|
||||||
return all_teilchen
|
return all_teilchen
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ class SearchResults(Widget):
|
||||||
async def on_mount(self) -> None:
|
async def on_mount(self) -> None:
|
||||||
table: DataTable[None] = self.query_one(DataTable[None])
|
table: DataTable[None] = self.query_one(DataTable[None])
|
||||||
_ = table.add_columns(*FAKE_DATA_HEADER)
|
_ = table.add_columns(*FAKE_DATA_HEADER)
|
||||||
_ = table.add_rows(await load_initial_data())
|
_ = table.add_rows(await load_initial_data()) # ty:ignore[invalid-argument-type]
|
||||||
|
|
||||||
|
|
||||||
class AddInventoryScreen(Screen[None]):
|
class AddInventoryScreen(Screen[None]):
|
||||||
|
|
|
||||||
2
tests.py
2
tests.py
|
|
@ -1,4 +1,4 @@
|
||||||
def test_initial_layout(snap_compare):
|
def test_initial_layout(snap_compare): # pyright: ignore[reportMissingParameterType, reportUnknownParameterType]
|
||||||
from teilchensammler_cli.main import app
|
from teilchensammler_cli.main import app
|
||||||
|
|
||||||
assert snap_compare(app, terminal_size=(130, 40))
|
assert snap_compare(app, terminal_size=(130, 40))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue