From 463d945d6bdfbf81d49ce67b02fc3248c9c94b7a Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 12 Nov 2024 12:58:04 +0900 Subject: [PATCH 1/7] Move requirements into pyproject.toml --- pyproject.toml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 79c8ec7e7..68aefa293 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,49 @@ name = "pyvista-tutorial" requires-python = '>=3.9' +[project.optional-dependencies] +docs = [ +cmocean==4.0.3 +colorcet==3.1.0 +geovista==0.5.3 +imageio>=2.5.0 +imageio-ffmpeg==0.5.1 +ipygany==0.5.0 +ipywidgets==8.1.5 +jupyter_sphinx==0.5.3 +jupyterlab==4.3.0 +lxml==5.3.0 +matplotlib==3.9.2 +meshio==5.3.5 +mypy==1.13.0 +mypy-extensions==1.0.0 +numpydoc==1.8.0 +osmnx==1.9.4 +pypandoc==1.14 +pytest-sphinx==0.6.3 +pyvista-xarray==0.1.7 +pyvista[all]==0.44.1 +scipy==1.14.1 +Sphinx==8.1.3 +sphinx-autobuild==2024.10.3 +sphinx-book-theme==1.1.3 +sphinx-copybutton==0.5.2 +sphinx-gallery==0.18.0 +sphinx-notfound-page==1.0.4 +sphinx_design==0.6.1 +sphinxcontrib-websupport==2.0.0 +sphinxcontrib.asciinema==0.4.2 +trame==3.7.0 +trame-client==3.4.0 +trame-server==3.2.3 +trame-vtk==2.8.11 +trame-vuetify==2.7.1 +trimesh==4.5.1 +typed-ast==1.5.5 +typing_extensions==4.12.2 +vtk<9.4 +] + [tool.ruff] exclude = [ '.git', From 8d1508c003667083e512524f60d2f2c971ca0345 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 12 Nov 2024 12:59:14 +0900 Subject: [PATCH 2/7] Delete requirements_docs.txt --- requirements_docs.txt | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 requirements_docs.txt diff --git a/requirements_docs.txt b/requirements_docs.txt deleted file mode 100644 index 62f19228c..000000000 --- a/requirements_docs.txt +++ /dev/null @@ -1,39 +0,0 @@ -cmocean==4.0.3 -colorcet==3.1.0 -geovista==0.5.3 -imageio>=2.5.0 -imageio-ffmpeg==0.5.1 -ipygany==0.5.0 -ipywidgets==8.1.5 -jupyter_sphinx==0.5.3 -jupyterlab==4.3.0 -lxml==5.3.0 -matplotlib==3.9.2 -meshio==5.3.5 -mypy==1.13.0 -mypy-extensions==1.0.0 -numpydoc==1.8.0 -osmnx==1.9.4 -pypandoc==1.14 -pytest-sphinx==0.6.3 -pyvista-xarray==0.1.7 -pyvista[all]==0.44.1 -scipy==1.14.1 -Sphinx==8.1.3 -sphinx-autobuild==2024.10.3 -sphinx-book-theme==1.1.3 -sphinx-copybutton==0.5.2 -sphinx-gallery==0.18.0 -sphinx-notfound-page==1.0.4 -sphinx_design==0.6.1 -sphinxcontrib-websupport==2.0.0 -sphinxcontrib.asciinema==0.4.2 -trame==3.7.0 -trame-client==3.4.0 -trame-server==3.2.3 -trame-vtk==2.8.11 -trame-vuetify==2.7.1 -trimesh==4.5.1 -typed-ast==1.5.5 -typing_extensions==4.12.2 -vtk<9.4 From f552ee20d514ea96c760f6d9b774987e36bbbd88 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Wed, 13 Nov 2024 10:24:27 +0900 Subject: [PATCH 3/7] Update --- pyproject.toml | 78 +++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e57031f3..1e1ff86ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,45 +4,45 @@ requires-python = '>=3.9' [project.optional-dependencies] docs = [ -cmocean==4.0.3 -colorcet==3.1.0 -geovista==0.5.3 -imageio>=2.5.0 -imageio-ffmpeg==0.5.1 -ipygany==0.5.0 -ipywidgets==8.1.5 -jupyter_sphinx==0.5.3 -jupyterlab==4.3.0 -lxml==5.3.0 -matplotlib==3.9.2 -meshio==5.3.5 -mypy==1.13.0 -mypy-extensions==1.0.0 -numpydoc==1.8.0 -osmnx==1.9.4 -pypandoc==1.14 -pytest-sphinx==0.6.3 -pyvista-xarray==0.1.7 -pyvista[all]==0.44.1 -scipy==1.14.1 -Sphinx==8.1.3 -sphinx-autobuild==2024.10.3 -sphinx-book-theme==1.1.3 -sphinx-copybutton==0.5.2 -sphinx-gallery==0.18.0 -sphinx-notfound-page==1.0.4 -sphinx_design==0.6.1 -sphinxcontrib-websupport==2.0.0 -sphinxcontrib.asciinema==0.4.2 -trame==3.7.0 -trame-client==3.4.0 -trame-server==3.2.3 -trame-vtk==2.8.11 -trame-vuetify==2.7.1 -trimesh==4.5.1 -typed-ast==1.5.5 -typing_extensions==4.12.2 -vtk<9.4 + 'Sphinx==8.1.3', + 'cmocean==4.0.3', + 'colorcet==3.1.0', + 'geovista==0.5.3', + 'imageio-ffmpeg==0.5.1', + 'imageio>=2.5.0', + 'ipygany==0.5.0', + 'ipywidgets==8.1.5', + 'jupyter_sphinx==0.5.3', + 'jupyterlab==4.3.0', + 'lxml==5.3.0', + 'matplotlib==3.9.2', + 'meshio==5.3.5', + 'mypy-extensions==1.0.0', + 'mypy==1.13.0', + 'numpydoc==1.8.0', + 'osmnx==1.9.4', + 'pypandoc==1.14', + 'pytest-sphinx==0.6.3', + 'pyvista-xarray==0.1.7', + 'pyvista[all]==0.44.1', + 'scipy==1.14.1', + 'sphinx-autobuild==2024.10.3', + 'sphinx-book-theme==1.1.3', + 'sphinx-copybutton==0.5.2', + 'sphinx-gallery==0.18.0', + 'sphinx-notfound-page==1.0.4', + 'sphinx_design==0.6.1', + 'sphinxcontrib-websupport==2.0.0', + 'sphinxcontrib.asciinema==0.4.2', + 'trame-client==3.4.0', + 'trame-server==3.2.3', + 'trame-vtk==2.8.11', + 'trame-vuetify==2.7.1', + 'trame==3.7.0', + 'trimesh==4.5.1', + 'typed-ast==1.5.5', + 'typing_extensions==4.12.2', + 'vtk<9.4', ] [tool.ruff] From 6257ec4f1392625bee8d52f5926dd773767bbba7 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Wed, 13 Nov 2024 10:26:39 +0900 Subject: [PATCH 4/7] Update doc.yml --- .github/workflows/doc.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 70aa0bd08..59ad4871f 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -30,8 +30,6 @@ jobs: - uses: syphar/restore-virtualenv@v1 id: cache-virtualenv - with: - requirement_files: requirements_docs.txt - name: Install OS Packages run: | @@ -45,7 +43,7 @@ jobs: - name: Install Dependencies run: | sudo apt -y install libgeos-dev - pip install -r requirements_docs.txt + pip install -e .[docs] - name: PyVista Report run: | @@ -114,7 +112,6 @@ jobs: cp README.md tutorial-content/ cp LICENSE tutorial-content/ cp requirements.txt tutorial-content/ - cp requirements_docs.txt tutorial-content/ cp start tutorial-content/ cp Dockerfile tutorial-content/ From 70c0bf0837056cc3c1217b7feae688b9384c5b79 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Wed, 13 Nov 2024 13:03:54 +0900 Subject: [PATCH 5/7] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 1e1ff86ea..1240ee76a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,6 +3,7 @@ name = "pyvista-tutorial" requires-python = '>=3.9' [project.optional-dependencies] +all = ['docs'] docs = [ 'Sphinx==8.1.3', 'cmocean==4.0.3', From 6dd515515730ef95be2102b16d740c41f822b7c6 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Fri, 22 Nov 2024 05:46:05 +0900 Subject: [PATCH 6/7] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 8fe920577..aea8057cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "pyvista-tutorial" requires-python = '>=3.9' +dynamic = ['version'] [project.optional-dependencies] all = ['docs'] From 50878e6edb3bed04ede1e48f7cdf57d566b03207 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:46:22 +0000 Subject: [PATCH 7/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index aea8057cf..8d555e5a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] +dynamic = ['version'] name = "pyvista-tutorial" requires-python = '>=3.9' -dynamic = ['version'] [project.optional-dependencies] all = ['docs']