From 33b38081d2a12f64d3627c2e829f7d7f0ab55b63 Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 24 Jan 2024 09:53:14 +0100 Subject: [PATCH 1/2] Add pytest to python provisioning --- .../provs/desktop/infrastructure/Python.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt index 4b4ba86..a2ad768 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt @@ -15,6 +15,7 @@ fun Prov.provisionPython(venvHome: String? = "~/.venv/meissa") = task { installJupyterlab(venvHome) installLinters(venvHome) installAsciinema(venvHome) + installPyTest(venvHome) } fun Prov.installPython3(): ProvResult = task { @@ -50,6 +51,10 @@ fun Prov.installAsciinema(venvHome: String? = null): ProvResult = task { pipInstall("asciinema", venvHome) } +fun Prov.installPyTest(venvHome: String? = null): ProvResult = task { + pipInstall("pytest", venvHome) +} + private fun Prov.pipInstall(pkg: String, venvHome: String? = null) { cmd(activateVenvCommandPrefix(venvHome) + "pip3 install $pkg") } -- 2.45.2 From 507475f40e7af42da7d3284b1460811116aeeb90 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 16 Feb 2024 09:54:13 +0100 Subject: [PATCH 2/2] Update k3s version --- .../domaindrivenarchitecture/provs/server/infrastructure/K3s.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt index e161e4c..89f4bc4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt @@ -10,7 +10,7 @@ import java.io.File // ----------------------------------- versions -------------------------------- -const val K3S_VERSION = "v1.27.4+k3s1" +const val K3S_VERSION = "v1.29.1+k3s2" // ----------------------------------- directories -------------------------------- const val k3sManualManifestsDir = "/etc/rancher/k3s/manifests/" -- 2.45.2