Merge branch 'master' into pixi_update_129

Author: JoerivanEngelen

.teamcity/Templates/AcceptanceTestsTemplate.kt

@@ -30,6 +30,9 @@ object AcceptanceTestsTemplate : Template({
             workingDir = "imod-python"
             scriptContent = """
                 SET PATH=%%PATH%%;%system.teamcity.build.checkoutDir%\modflow6
+
+                pixi config set --local detached-environments "C:\pixi_envs"
+                pixi install --environment user-acceptance --frozen
                 
                 pixi run --environment user-acceptance --frozen dvc remote modify --local minio access_key_id %env.access_key%
                 pixi run --environment user-acceptance --frozen dvc remote modify --local minio secret_access_key %env.secret_access_key%

.teamcity/Templates/ExamplesTemplate.kt

@@ -28,6 +28,8 @@ object ExamplesTemplate : Template({
             workingDir = "imod-python"
             scriptContent = """
                 SET PATH=%%PATH%%;%system.teamcity.build.checkoutDir%\modflow6
+                pixi config set --local detached-environments "C:\pixi_envs"
+                pixi install --environment default --frozen
                 pixi run --environment default --frozen examples
             """.trimIndent()
             formatStderrAsError = true

.teamcity/Templates/LintTemplate.kt

@@ -23,6 +23,8 @@ object LintTemplate : Template({
             id = "Static_code_analysis"
             workingDir = "imod-python"
             scriptContent = """
+                    pixi config set --local detached-environments "C:\pixi_envs"
+                    pixi install --environment default --frozen
                     pixi run --environment default --frozen lint 
                 """.trimIndent()
             formatStderrAsError = true

.teamcity/Templates/MyPyTemplate.kt

@@ -27,13 +27,15 @@ object MyPyTemplate : Template({
             id = "MyPy_analysis"
             workingDir = "imod-python"
             scriptContent = """
+                    pixi config set --local detached-environments "C:\pixi_envs"
+                    pixi install --environment default --frozen
                     pixi run --environment default --frozen mypy_report
-                    pixi run --environment default --frozen mypy
+                    pixi run --environment default --frozen mypy_lint
                 """.trimIndent()
             formatStderrAsError = true
             dockerImage = "%DockerContainer%:%DockerVersion%"
             dockerImagePlatform = ScriptBuildStep.ImagePlatform.Windows
-            dockerRunParameters = """--cpus=4 --memory=16g"""
+            dockerRunParameters = """--cpus=8 --memory=16g"""
             dockerPull = false
         }
     }

.teamcity/Templates/PipPythonTemplate.kt

@@ -24,6 +24,8 @@ object PipPythonTemplate : Template({
             id = "pip_install"
             workingDir = "imod-python"
             scriptContent = """
+                    pixi config set --local detached-environments "C:\pixi_envs"
+                    pixi install --environment  %python_env% --frozen
                     pixi run --environment %python_env% --frozen test_import
                 """.trimIndent()
             formatStderrAsError = true

.teamcity/Templates/UnitTestsTemplate.kt

@@ -31,6 +31,8 @@ object UnitTestsTemplate : Template({
             workingDir = "imod-python"
             scriptContent = """
                 SET PATH=%%PATH%%;%system.teamcity.build.checkoutDir%\modflow6
+                pixi config set --local detached-environments "C:\pixi_envs"
+                pixi install --environment default --frozen
                 pixi run --environment default --frozen unittests
             """.trimIndent()
             formatStderrAsError = true
@@ -45,7 +47,9 @@ object UnitTestsTemplate : Template({
             workingDir = "imod-python/imod/tests"
             scriptMode = script {
                 content = """
-                    ${'$'}REPORT = echo "coverage report" | pixi shell --environment default
+                    pixi config set --local detached-environments "C:\pixi_envs"
+                    
+                    ${'$'}REPORT = echo "coverage report" | pixi shell --environment default --frozen
                     
                     ${'$'}TOTALS = ${'$'}REPORT | Select-String -Pattern 'TOTAL' -CaseSensitive -SimpleMatch
                     ${'$'}STATISTICS = ${'$'}TOTALS -split "\s+"

docs/faq/python.rst

@@ -128,7 +128,7 @@ practical sense.)
 To create a Pixi environment open a command prompt and ``cd`` to the imod folder.
 In the imod folder use the following command::
 
-    pixi run install
+    pixi install
 
 This will create a conda environment inside the imod folder. To activate the environment run::
 

docs/installation.rst

@@ -170,7 +170,7 @@ With pixi you can install the latest development version of imod::
 
   git clone https://github.com/Deltares/imod-python.git
   cd imod-python
-  pixi run install
+  pixi install
 
 This will install the same python installation the iMOD Python developers work
 with, so it should work (otherwise we couldn't do our work!). This contains an