Merge branch 'main' into custom-templates

Author: FeodorFitsner

.ci/__init__.py

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.35.1"
+}

.ci/patch_toml_version.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -e
+
+# ------------------------------------------------------------------------------
+# This script determines the version numbers used in builds and releases.
+#
+# It sets three environment variables:
+#   - PKG_VER   → The package version (semantic version).
+#   - BUILD_VER → The build identifier (may include build number).
+#   - PYPI_VER  → A PyPI-compatible version string for publishing.
+#
+# Behavior:
+#   - On a tagged commit (e.g. "v1.2.3"), it uses that tag as the version.
+#   - On an untagged commit, it generates a "next dev version" by:
+#       • Taking the latest tag (default v0.0.0 if none).
+#       • Incrementing the minor version.
+#       • Appending "+<run number>".
+#   - PYPI_VER is derived from BUILD_VER by replacing "+" with ".dev".
+#
+# This ensures that:
+#   - Release builds (tags) get clean versions like "1.2.3".
+#   - Development builds get versions like "1.3.0+45" (PyPI: "1.3.0.dev45").
+# ------------------------------------------------------------------------------
+
+if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+    # -------------------------------------------------------------
+    # Case 1: This build is triggered by a Git tag
+    # -------------------------------------------------------------
+    # Extract the tag name (strip "refs/tags/")
+    tag="${GITHUB_REF#refs/tags/}"
+    # Remove leading "v" if present (e.g. "v1.2.3" → "1.2.3")
+    export PKG_VER="${tag#v}"
+    # For tagged releases, BUILD_VER is the same as PKG_VER
+    export BUILD_VER="$PKG_VER"
+else
+    # -------------------------------------------------------------
+    # Case 2: This is not a tagged build (e.g. main branch commit)
+    # -------------------------------------------------------------
+    # Get the latest tag, or fall back to "v0.0.0" if none exist
+    cv=$(git describe --abbrev=0 2>/dev/null || echo "v0.0.0")
+    # Remove leading "v" if present
+    cv=${cv#v}
+
+    # Split into major/minor components
+    major=$(echo "$cv" | cut -d. -f1)
+    minor=$(echo "$cv" | cut -d. -f2)
+
+    # Increment the minor version (e.g. "1.2" → "1.3")
+    minor=$((minor + 1))
+
+    # Construct the package version: <major>.<minor>.0
+    export PKG_VER="${major}.${minor}.0"
+
+    # Append the GitHub Actions run number for uniqueness
+    export BUILD_VER="${PKG_VER}+$((GITHUB_RUN_NUMBER + 500))"
+fi
+
+# -------------------------------------------------------------
+# Derive PyPI-compatible version
+# PyPI does not accept "+" in versions, so replace with ".dev"
+# Example: "1.3.0+45" → "1.3.0.dev45"
+# -------------------------------------------------------------
+export PYPI_VER="${BUILD_VER/+/.dev}"
+
+# Print values for debugging in logs
+echo "PKG_VER=$PKG_VER"
+echo "BUILD_VER=$BUILD_VER"
+echo "PYPI_VER=$PYPI_VER"
+
+# Export values as environment variables
+echo "PKG_VER=$PKG_VER" >> $GITHUB_ENV
+echo "BUILD_VER=$BUILD_VER" >> $GITHUB_ENV
+echo "PYPI_VER=$PYPI_VER" >> $GITHUB_ENV

.ci/update_build_version.sh

@@ -24,8 +24,7 @@ permissions:
   contents: write  # Required to push to the gh-pages branch
 
 env:
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}         # Token used by mkdocs for pushing
-  UV_SYSTEM_PYTHON: 1                       # Use system Python interpreter with uv
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}         # used by mkdocs for publishing
 
 jobs:
   deploy:
@@ -36,23 +35,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v6
+
       - name: Configure Git for mkdocs
         run: |
           git config user.name github-actions[bot]
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: "pyproject.toml"  # Match Python version with project config
-
-      - name: Install dependencies
-        run: |
-          uv pip install -e .
-          uv pip install --group docs --group lint
-
       - name: Deploy to GitHub Pages
-        run: uv run mkdocs gh-deploy --force
+        run: |
+          uv run --group docs --group lint mkdocs gh-deploy --force -v

.fvmrc

@@ -0,0 +1,70 @@
+name: Build & Publish
+
+on:
+  push:
+    branches:
+      - '**'   # match all branches
+    tags:
+      - '*'    # match all tags
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  build:
+    name: Publish flet-charts package
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0   # fetch all history
+          fetch-tags: true # ensure tags are available
+
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Patch versions
+        run: |
+          source .github/scripts/update_build_version.sh
+          uv version $PYPI_VER
+          uv run .github/scripts/patch_pubspec_version.py src/flutter/*/pubspec.yaml $PKG_VER
+
+      - name: Setup Flutter
+        uses: kuhnroyal/flutter-fvm-config-action/setup@v3
+        with:
+          path: '.fvmrc'
+          cache: true
+
+      - name: Analyze Flutter package
+        working-directory: src/flutter/flet_charts
+        run: |
+          dart pub get
+          dart analyze
+
+      - name: Build Python package
+        run: uv build
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/*.whl
+
+      - name: Filter publish-relevant changes
+        uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            publish:
+              - 'src/**'
+              - 'pyproject.toml'
+              - 'README.md'
+
+      - name: Publish Python package
+        if: steps.changes.outputs.publish == 'true' && github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
+        run: uv publish

.ci/patch_pubspec_version.py renamed to .github/scripts/patch_pubspec_version.py

@@ -24,7 +24,7 @@ test = [
     "pytest >=7.2.0",
 ]
 lint = [
-    "ruff >=0.11.7",
+    "ruff >=0.13.1",
 ]
 dev = [
     "pre-commit >=4.2.0",
@@ -36,14 +36,14 @@ docs-coverage = [
 ]
 docs = [
     "mkdocs >=1.6.1",
-    "mkdocs-material >=9.6.15",
-    "mkdocstrings-python >=1.16.12",
-    "mkdocstrings-python-xref >=1.16.3",
+    "mkdocs-material >=9.6.20",
+    "mkdocstrings-python >=1.18.2",
+    "mkdocstrings-python-xref >=1.16.4",
     "mike >=2.1.3",
-    "markdown >=3.6",
-    "pymdown-extensions >=10.16",
+    "markdown >=3.9",
+    "pymdown-extensions >=10.16.1",
     "mkdocs-exclude >=1.0.2",
-    "mkdocs-glightbox >=0.4.0",
+    "mkdocs-glightbox >=0.5.1",
     "mkdocs-open-in-new-tab >=1.0.8",
     "mkdocs-section-index >=0.3.10",
     "griffe-modernized-annotations >=1.0.8",