Merge pull request #67 from guerda/build_uv

draft: build: migrate to uv

Author: guerda

.github/workflows/python-app.yml

@@ -26,11 +26,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pipenv
-        if [ -f Pipfile.lock ]; then pipenv install --dev; fi
+        pip install uv
+        uv sync
     - name: Lint with ruff
       run: |
-        pipenv run ruff check . --statistics
+        uv run ruff check . --statistics
     - name: Test with pytest
       run: |
-        pipenv run pytest
+        uv run pytest

.gitignore

@@ -1,2 +1,3 @@
 musiclibrary.db
 .DS_Store
+__pycache__

Dockerfile

@@ -1,9 +1,11 @@
-FROM python:3.11
+FROM python:3.11-slim
+# Install uv.
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
 WORKDIR /app
-COPY ./Pipfile* /app/
-RUN pip install pipenv
-RUN pipenv sync
+COPY ./uv.lock ./pyproject.toml /app/
+RUN uv sync --frozen --no-cache
 COPY templates /app/templates/
 COPY static /app/static/
 COPY beetsstatistics.py app.py  /app
-CMD ["pipenv", "run", "prod"]
+CMD ["/app/.venv/bin/fastapi", "run", "app.py"]

Pipfile

@@ -1,16 +1,16 @@
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-from fastapi.staticfiles import StaticFiles
-from fastapi.responses import FileResponse, HTMLResponse
-from beetsstatistics import AlbumSort, BeetsStatistics, DBNotFoundError, DBQueryError
-import humanize
-from fastapi import Depends
-from typing import Annotated
-from pydantic_settings import BaseSettings
-from fastapi import HTTPException
 import logging
+from typing import Annotated
 from urllib.parse import quote_plus
 
+import humanize
+from fastapi import Depends, FastAPI, HTTPException, Request
+from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+from pydantic_settings import BaseSettings
+
+from beetsstatistics import AlbumSort, BeetsStatistics, DBNotFoundError, DBQueryError
+
 logger = logging.getLogger("uvicorn.error")
 
 
@@ -47,7 +47,8 @@ async def get_beets_statistics():
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
 templates = Jinja2Templates(directory="templates")
-templates.env.filters['quote_plus'] = lambda u: quote_plus(u)
+templates.env.filters["quote_plus"] = lambda u: quote_plus(u)
+
 
 @app.get("/", response_class=HTMLResponse)
 async def get_general_stats(

Pipfile.lock

@@ -1,10 +1,11 @@
-import sqlite3
-import yaml
-import os
 import argparse
+import os
 import os.path
+import sqlite3
 from enum import Enum
 
+import yaml
+
 LOSSY_FORMATS = ["mp3", "aac", "ogg"]
 LOSSLESS_FORMATS = ["flac", "wav"]
 

app.py

@@ -1,4 +1,33 @@
+[project]
+name = ""
+version = "0.0.1"
+requires-python = "~=3.11"
+dependencies = [
+    "fastapi[standard]",
+    "pyyaml",
+    "jinja2",
+    "humanize",
+    "pydantic",
+    "pydantic-settings",
+]
+
 [tool.pytest.ini_options]
 pythonpath = [
   "."
-]
+]
+
+[dependency-groups]
+dev = [
+    "ruff",
+    "pytest",
+]
+
+[tool.uv]
+package = false
+
+[[tool.uv.index]]
+name = "pypi"
+url = "https://pypi.org/simple"
+
+[tool.ruff.lint]
+select = ["I"]

beetsstatistics.py

@@ -1,4 +1,5 @@
 import pytest
+
 from beetsstatistics import BeetsStatistics