Merge pull request #497 from canonical/chore-cc005-v1.5

chore: Use uv for python dependency management
canonical · Dec 19, 2024 · f023ea4 · f023ea4
2 parents 31fda26 + 304cbe6
commit f023ea4
Show file tree

Hide file tree

Showing 7 changed files with 1,163 additions and 190 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,9 @@
 
 # Python
 **/venv/**
+**/.venv/**
 *.pyc
+*.egg-info/
 
 # Charmcraft
 *.charm

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,17 +2,29 @@
 
 To make contributions to this project, you'll need a working [Juju development setup](https://juju.is/docs/sdk/dev-setup).
 
-You can use the environments created by `tox` for development:
+This project uses `uv`. You can install it on Ubuntu with:
 
 ```shell
-tox --notest -e integration
-source .tox/integration/bin/activate
+sudo snap install --classic astral-uv
+```
+
+You can create an environment for development with `uv`:
+
+```shell
+uv sync
+source .venv/bin/activate
 ```
 
 ## Testing
+This project uses `tox` for managing test environments. It can be installed
+with:
+
+```shell
+uv tool install tox --with tox-uv
+```
 
-This project uses `tox` for managing test environments. There are some pre-configured environments
-that can be used for linting and formatting code when you're preparing contributions to the project:
+There are some pre-configured environments
+that can be used for linting and formatting code when you're preparing contributions to the charm:
 
 ```shell
 tox -e fmt           # Format code

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,18 @@
+[project]
+name = "sdcore-tests"
+version = "0.1.0"
+requires-python = ">=3.10"
+
+dependencies = [
+    "codespell",
+    "jinja2",
+    "juju",
+    "pyright",
+    "pytest",
+    "pytest-operator",
+    "ruff",
+]
+
 # Testing tools configuration
 [tool.coverage.run]
 branch = true

diff --git a/requirements.in b/requirements.in
diff --git a/requirements.txt b/requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -16,7 +16,7 @@ setenv =
   PYTHONBREAKPOINT=pdb.set_trace
   PY_COLORS=1
 deps =
-    -r{toxinidir}/requirements.txt
+    .
 passenv =
   PYTHONPATH
   MODEL_SETTINGS