Merge pull request #21 from canonical/post-review-cleanup

Post review cleanup

Author: lvoytek

.github/workflows/integration_test.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   integration-tests:
     name: Integration Tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/test.yaml

@@ -13,3 +13,4 @@ jobs:
     secrets: inherit
     with:
       self-hosted-runner: false
+      with-uv: true

.licenserc.yaml

@@ -30,4 +30,5 @@ header:
     - 'pyproject.toml'
     - 'lib/**'
     - 'tests/integration/test-ssh-key'
+    - 'uv.lock'
   comment: on-failure

charmcraft.yaml

@@ -16,8 +16,10 @@ platforms:
 
 parts:
   git-ubuntu-charm:
-    plugin: charm
+    plugin: uv
     source: .
+    build-snaps:
+      - astral-uv
 
   debian-archive-keyring:
     plugin: dump

pyproject.toml

@@ -1,3 +1,68 @@
+# Copyright 2025 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+[project]
+name = "git-ubuntu-operator"
+version = "1.0.0"
+requires-python = ">=3.12"
+
+# Charm code dependencies
+dependencies = [
+    "charmlibs-apt>=1.0.0",
+    "charmlibs-pathops>=1.0.0",
+    "ops~=2.17",
+]
+
+[dependency-groups]
+
+charmlibs = [
+    "charmlibs-apt>=1.0.0",
+    "charmlibs-pathops>=1.0.0",
+]
+
+format = [
+    "black",
+    "isort",
+]
+
+lint = [
+    "mypy",
+    "isort",
+    "black",
+    "flake8-docstrings",
+    "flake8-docstrings-complete",
+    "flake8-builtins",
+    "flake8-test-docs",
+    "pep8-naming",
+    "codespell",
+    "pylint",
+    "pyproject-flake8",
+    "pydocstyle",
+    "types-PyYAML",
+]
+
+unit = [
+    "pytest",
+    "coverage[toml]",
+    "ops[testing]",
+]
+
+coverage-report = [
+    "pytest",
+    "coverage[toml]",
+    "ops[testing]",
+]
+
+static = [
+    "pyright",
+    "ops[testing]",
+]
+
+integration = [
+    "pytest",
+    "jubilant~=1.0",
+]
+
 # Testing tools configuration
 [tool.coverage.run]
 branch = true
@@ -54,8 +119,8 @@ lint.extend-ignore = [
     "D409",
     "D413",
 ]
-extend-exclude = ["__pycache__", "*.egg_info"]
 lint.per-file-ignores = {"tests/*" = ["D100","D101","D102","D103","D104"]}
+extend-exclude = ["__pycache__", "*.egg_info"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10

requirements.txt

@@ -25,32 +25,16 @@ pass_env =
 
 [testenv:format]
 description = Apply coding style standards to code
-deps =
-    black
-    isort
+dependency_groups = format
 commands =
     isort {[vars]all_path}
     black {[vars]all_path}
 
 [testenv:lint]
 description = Check code against coding style standards
-deps =
-    mypy
-    isort
-    black
-    flake8-docstrings
-    flake8-docstrings-complete
-    flake8-builtins
-    flake8-test-docs
-    pep8-naming
-    codespell
-    pylint
-    pyproject-flake8
-    pydocstyle
-    types-PyYAML
-    ops
-    charmlibs-pathops
-    charmlibs-apt
+dependency_groups =
+    lint
+    charmlibs
 commands =
     black --check --diff {[vars]all_path}
     codespell {[vars]all_path}
@@ -62,11 +46,9 @@ commands =
 
 [testenv:unit]
 description = Run unit tests
-deps =
-    pytest
-    coverage[toml]
-    ops[testing]
-    -r {tox_root}/requirements.txt
+dependency_groups =
+    unit
+    charmlibs
 commands =
     coverage run --source={[vars]src_path} \
                  -m pytest \
@@ -79,29 +61,22 @@ commands =
 
 [testenv:coverage-report]
 description = Create test coverage report
-deps =
-    pytest
-    coverage[toml]
-    ops[testing]
-    -r {tox_root}/requirements.txt
+dependency_groups = coverage-report
 commands =
     coverage report
 
 [testenv:static]
 description = Run static type checks
-deps =
-    pyright
-    ops[testing]
-    -r {tox_root}/requirements.txt
+dependency_groups =
+    static
+    charmlibs
 commands =
     pyright {posargs}
 
 [testenv:integration]
 description = Run integration tests
-deps =
-    pytest
-    jubilant~=1.0
-    -r {tox_root}/requirements.txt
+dependency_groups =
+    integration
 commands =
     pytest -v \
            -s \