Merge pull request #402 from halfguru/chore/ruff-uv-migration

Replace black/isort/flake8 with ruff, migrate to uv/pyproject.toml

Author: ic-dev21

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,14 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "version": "1.1.0",
+      "resolved": "ghcr.io/devcontainers/features/github-cli@sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671",
+      "integrity": "sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671"
+    },
+    "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {
+      "version": "1.0.0",
+      "resolved": "ghcr.io/jsburckhardt/devcontainer-features/uv@sha256:542a0bc2203205b3c696de650ba862f280b20af3543493cc232edd9ac35791f7",
+      "integrity": "sha256:542a0bc2203205b3c696de650ba862f280b20af3543493cc232edd9ac35791f7"
+    }
+  }
+}

.devcontainer/devcontainer.json

@@ -1,7 +1,4 @@
 {
-  "containerEnv": {
-    "POETRY_VIRTUALENVS_IN_PROJECT": "true"
-  },
   "customizations": {
     "codespaces": {
       "openFiles": [
@@ -13,53 +10,44 @@
     "vscode": {
       "extensions": [
         "charliermarsh.ruff",
-        "esbenp.prettier-vscode",
-        "esbenp.prettier-vscode",
         "GitHub.vscode-github-actions",
         "GitHub.vscode-pull-request-github",
         "ms-python.mypy-type-checker",
-        "ms-python.pylint",
         "ms-python.python",
         "ms-python.vscode-pylance",
         "redhat.vscode-yaml",
-        "redhat.vscode-yaml",
         "ryanluker.vscode-ecoverage-gutters",
-        "visualstudioexptteam.vscodeintellicode"
+        "tamasfe.even-better-toml"
       ],
       "settings": {
         "[python]": {
           "editor.codeActionsOnSave": {
             "source.fixAll": true,
             "source.organizeImports": true,
             "files.trimTrailingWhitespace": true
-          }
+          },
+          "editor.defaultFormatter": "charliermarsh.ruff"
         },
         "coverage-gutters.customizable.context-menu": true,
         "coverage-gutters.customizable.status-bar-toggler-watchCoverageAndVisibleEditors-enabled": true,
         "coverage-gutters.showGutterCoverage": false,
         "coverage-gutters.showLineCoverage": true,
         "coverage-gutters.xmlname": "coverage.xml",
-        "python.analysis.extraPaths": ["${workspaceFolder}/pyhilo"],
         "python.defaultInterpreterPath": ".venv/bin/python",
-        "python.formatting.provider": "ruff",
         "python.testing.cwd": "${workspaceFolder}",
         "python.testing.pytestArgs": ["--cov-report=xml"],
-        "python.testing.pytestEnabled": true,
+        "python.testing.enabled": true,
         "ruff.importStrategy": "fromEnvironment",
         "ruff.interpreter": [".venv/bin/python"],
         "terminal.integrated.defaultProfile.linux": "zsh"
       }
     }
   },
   "features": {
-    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
     "ghcr.io/devcontainers/features/github-cli:1": {},
-    "ghcr.io/devcontainers/features/node:1": {},
-    "ghcr.io/devcontainers/features/python:1": {
-      "installTools": false
-    }
+    "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
   },
-  "image": "mcr.microsoft.com/devcontainers/python:3",
+  "image": "mcr.microsoft.com/devcontainers/python:3.11-bookworm",
   "name": "A Python3, async interface to the Hilo API",
-  "updateContentCommand": ". ${NVM_DIR}/nvm.sh && nvm install && nvm use && npm install && poetry install && poetry run pre-commit install"
+  "postCreateCommand": "uv sync --group dev --group test && uv run pre-commit install"
 }

.flake8

@@ -4,11 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
-  - package-ecosystem: pip
-    directory: "/.github/workflows"
-    schedule:
-      interval: weekly
-  - package-ecosystem: pip
+  - package-ecosystem: uv
     directory: "/"
     schedule:
       interval: weekly

.github/dependabot.yml

@@ -1,4 +1,4 @@
-name: Linting
+name: CI
 
 on:
   push:
@@ -23,17 +23,34 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
-      - name: Upgrade pip
-        run: |
-          pip install --constraint=.github/workflows/constraints.txt pip
-          pip --version
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.1.0
+
+      - name: Install dependencies
+        run: uv sync --group dev
 
-      - name: Install Python modules
-        run: |
-          pip install --constraint=.github/workflows/constraints.txt pre-commit black flake8 reorder-python-imports
-          
       - name: Run pre-commit on all files
         env:
           SKIP: no-commit-to-branch
-        run: |
-          pre-commit run --all-files --show-diff-on-failure --color=always
+        run: uv run pre-commit run --all-files --show-diff-on-failure --color=always
+
+  tests:
+    runs-on: "ubuntu-latest"
+    name: Tests
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v6.2.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.1.0
+
+      - name: Install dependencies
+        run: uv sync --group test
+
+      - name: Run tests
+        run: uv run pytest -v

.github/workflows/constraints.txt

@@ -1,45 +1,32 @@
 ---
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: '1.7.9'
+    rev: '1.9.2'
     hooks:
       - id: bandit
         args:
           - --quiet
           - --format=custom
           - --configfile=.bandit.yaml
         files: ^pyhilo/.+\.py$
-  - repo: https://github.com/psf/black
-    rev: 24.1.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.9
     hooks:
-      - id: black
-        args:
-          - --safe
-          - --quiet
-        language_version: python3
-        files: ^((pyhilo|tests)/.+)?[^/]+\.py$
+      - id: ruff-format
+        args: [--quiet]
+        files: ^pyhilo/.+\.py$
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+        files: ^pyhilo/.+\.py$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.4.1
     hooks:
       - id: codespell
         args:
           - --skip="./.*,*.json"
           - --quiet-level=4
           - -L ba,hass,manuel,connexion
         exclude_types: [json]
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-docstrings==1.7.0
-          - pydocstyle==6.3.0
-        files: ^pyhilo/.+\.py$
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        files: ^(pyhilo|tests)/.+\.py$
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.19.1
     hooks:
@@ -51,9 +38,13 @@ repos:
           - types-PyYAML
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-json
+        # Exclude .devcontainer.json and .vscode since it uses JSONC
+        exclude: (.vscode|.devcontainer)
+      - id: check-yaml
+      - id: trailing-whitespace
       - id: no-commit-to-branch
         args:
           - --branch=dev
@@ -64,7 +55,7 @@ repos:
 #      - id: pydocstyle
 #        files: ^((pyhilo|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/gruntwork-io/pre-commit
-    rev: v0.1.12
+    rev: v0.1.30
     hooks:
       - id: shellcheck
         files: ^script/.+