diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 446f4d0..7ab71b4 100644 --- a/.gitlab-ci.yml +++ b/.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/ diff --git a/.readthedocs.yml b/.readthedocs.yml index 9880aa8..bc6732d 100644 --- a/.readthedocs.yml +++ b/.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 diff --git a/noxfile.py b/noxfile.py index 9f207ed..a3479e6 100644 --- a/noxfile.py +++ b/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) diff --git a/pdm.lock b/pdm.lock index cb671db..4ec04e9 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "dev", "doc", "jupyter", "pyvista", "qt", "solvers", "test"] strategy = ["cross_platform"] lock_version = "4.4.1" -content_hash = "sha256:3f9c72d74ade371240a10a05676b62a384b903e01e60fbb6e6d0ff5bda13210b" +content_hash = "sha256:dbd5989aa6462745d309e03a755fb82475f3f0926901c4b6fcdc3d06fdaddd4d" [[package]] name = "accessible-pygments" @@ -1911,12 +1911,12 @@ files = [ [[package]] name = "nest-asyncio" -version = "1.5.9" +version = "1.6.0" requires_python = ">=3.5" summary = "Patch asyncio to allow nested event loops" files = [ - {file = "nest_asyncio-1.5.9-py3-none-any.whl", hash = "sha256:61ec07ef052e72e3de22045b81b2cc7d71fceb04c568ba0b2e4b2f9f5231bec2"}, - {file = "nest_asyncio-1.5.9.tar.gz", hash = "sha256:d1e1144e9c6e3e6392e0fcf5211cb1c8374b5648a98f1ebe48e5336006b41907"}, + {file = "nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"}, + {file = "nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe"}, ] [[package]] @@ -2006,12 +2006,12 @@ files = [ [[package]] name = "overrides" -version = "7.4.0" +version = "7.6.0" requires_python = ">=3.6" summary = "A decorator to automatically detect mismatch when overriding a method." files = [ - {file = "overrides-7.4.0-py3-none-any.whl", hash = "sha256:3ad24583f86d6d7a49049695efe9933e67ba62f0c7625d53c59fa832ce4b8b7d"}, - {file = "overrides-7.4.0.tar.gz", hash = "sha256:9502a3cca51f4fac40b5feca985b6703a5c1f6ad815588a7ca9e285b9dca6757"}, + {file = "overrides-7.6.0-py3-none-any.whl", hash = "sha256:c36e6635519ea9c5b043b65c36d4b886aee8bd45b7d4681d2a6df0898df4b654"}, + {file = "overrides-7.6.0.tar.gz", hash = "sha256:01e15bbbf15b766f0675c275baa1878bd1c7dc9bc7b9ee13e677cdba93dc1bd9"}, ] [[package]] @@ -2101,6 +2101,15 @@ files = [ {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"}, ] +[[package]] +name = "pickleshare" +version = "0.7.5" +summary = "Tiny 'shelve'-like database with concurrency support" +files = [ + {file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"}, + {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, +] + [[package]] name = "pillow" version = "10.2.0" diff --git a/pyproject.toml b/pyproject.toml index 92b0ef2..b0ff144 100644 --- a/pyproject.toml +++ b/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]