Merge branch 'main' into validate-jlink-plugin

canonical · Jan 29, 2025 · 9caa5cf · 9caa5cf
2 parents 0cba165 + 6f1048a
commit 9caa5cf
Show file tree

Hide file tree

Showing 6 changed files with 293 additions and 41 deletions.
diff --git a/docs/how-to/code/build-docs/task.yaml b/docs/how-to/code/build-docs/task.yaml
@@ -7,11 +7,16 @@
 ###########################################
 summary: test the "Build the docs" guide
 
+# Run this test first, as it needs a clean project tree
+priority: 100
+
 prepare: |
   tests.pkgs install python3-venv python3-dev libapt-pkg-dev
 
 execute: |
-  pushd $PROJECT_PATH/
+  mkdir $HOME/clean-rockcraft
+  cp -r $PROJECT_PATH/* $HOME/clean-rockcraft
+  pushd $HOME/clean-rockcraft
 
   git init .
 
@@ -34,3 +39,6 @@ execute: |
   then
     exit $ret
   fi
+
+restore: |
+  rm -rf $HOME/clean-rockcraft
diff --git a/docs/tutorial/code/fastapi/requirements.txt b/docs/tutorial/code/fastapi/requirements.txt
@@ -1 +1 @@
-fastapi[standard]
+fastapi[standard]>=0.109.1
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,15 +19,16 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "craft-application~=4.6.0",
-    "craft-archives>=2.0.0",
-    "craft-cli>=2.15.0",
+    "craft-application",
+    "craft-archives",
+    "craft-cli",
     "craft-parts@git+https://github.com/vpa1977/craft-parts@jlink-plugin",
-    "craft-platforms~=0.3",
-    "craft-providers>=2.0.4",
+    "craft-platforms",
+    "craft-providers",
+
     "overrides",
     "spdx-lookup",
-    "tabulate>=0.8.10",
+    "tabulate",
 ]
 
 [project.scripts]
@@ -333,7 +334,8 @@ dev = [
     "coverage>=7.6.8",
     "freezegun>=1.5.1",
     "hypothesis>=6.122.1",
-    "poetry>=1.8.5",  # Needed for testing the poetry plugin.
+    "poetry>=2.0.0",  # Needed for testing the poetry plugin.
+    "poetry-plugin-export",
     "pyfakefs>=5.7.2",
     "pylint>=3.3.2",
     "pytest>=8.3.4",