Merge branch 'topic/default/fix-pdm-lock' into 'branch/default'

Fix PDM deps and lock

See merge request fluiddyn/fluidsimfoam!113

.gitlab-ci.yml

@@ -55,7 +55,7 @@ CI image:
 pytest:
   stage: test
   script:
-    - pdm sync --clean -G test -G pyvista
+    - pdm sync --clean -G test -G pyvista -G solvers
     - pdm run pytest tests doc/examples --cov --cov-report term --cov-report xml
   coverage: /(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/
   artifacts:
@@ -68,7 +68,7 @@ pytest:
 pages:
   stage: publish
   script:
-    - pdm sync --clean -G pyvista -G doc
+    - pdm sync --clean -G pyvista -G doc -G solvers
     - pdm run xvfb-run --auto-servernum sphinx-build -W -b html -d doc/_build/doctrees doc doc/_build/html
     - mkdir -p public/$CI_COMMIT_REF_NAME
     - rsync -rvc --delete doc/_build/html/* public/$CI_COMMIT_REF_NAME/

.readthedocs.yml

@@ -11,7 +11,7 @@ build:
       - pip install pdm
     post_install:
       - pdm use -f $READTHEDOCS_VIRTUALENV_PATH
-      - pdm sync -G pyvista -G doc
+      - pdm sync -G pyvista -G doc -G solvers
       - pip uninstall vtk -y
       - pip install vtk-osmesa --extra-index-url https://gitlab.kitware.com/api/v4/projects/13/packages/pypi/simple
 

noxfile.py

@@ -10,15 +10,16 @@
 
 @nox.session
 def test(session):
-    session.run_always(
-        "pdm", "sync", "-G", "test", "-G", "pyvista", "--clean", external=True
-    )
+    command = "pdm sync -G test -G pyvista -G solvers --clean"
+    session.run_always(command.split(), external=True)
     session.run("pdm", "run", "cov-xml", external=True)
 
 
 @nox.session
 def doc(session):
-    session.run_always("pdm", "sync", "-G", "doc", "--clean", external=True)
+    session.run_always(
+        "pdm", "sync", "-G", "doc", "-G", "solvers", "--clean", external=True
+    )
     session.chdir("doc")
     session.run("make", "cleanall", external=True)
     session.run("make", external=True)

pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "lark<2.0.0,>=1.1.5",
     "rich<14.0.0,>=13.3.3",
     "invoke<3.0.0,>=2.0.0",
+    "pickleshare>=0.7.5",
 ]
 requires-python = ">=3.9,<4.0"
 readme = "README.md"
@@ -53,7 +54,7 @@ test = [
     "pytest-mock<4.0.0,>=3.10.0",
     "pytest-cov<5.0.0,>=4.0.0",
     "pip",
-    "fluidsimfoam[solvers]"
+    # "fluidsimfoam[solvers]"
 ]
 dev = [
     "black<24.0.0,>=23.1.0",
@@ -68,7 +69,7 @@ doc = [
     "pydata-sphinx-theme<1.0.0,>=0.13.1",
     "sphinx-togglebutton<1.0.0,>=0.3.2",
     "pyvista<1.0.0,>=0.39.1",
-    "fluidsimfoam[solvers]",
+    # "fluidsimfoam[solvers]",
 ]
 
 [tool.pdm.scripts]