From 87bde607726516783da0ebc48359512d6105d679 Mon Sep 17 00:00:00 2001 From: jstilley Date: Thu, 19 Dec 2024 09:55:00 -0800 Subject: [PATCH 1/3] Put first-order deps in pyproject.toml file --- pyproject.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a1b4c6a2f..021dd1cae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,17 +31,19 @@ authors = [ ] dependencies = [ "coverage>=7.2.0", # Code coverage tool. Sadly baked into every Case. - "h5py>=3.9 ; python_version >= '3.11.0'", # Needed because our database files are H5 format + "dateutil>=2.2", # To read a datetime string more easily. "h5py>=3.0,<=3.9 ; python_version < '3.11.0'", + "h5py>=3.9 ; python_version >= '3.11.0'", # Needed because our database files are H5 format "htmltree>=0.7.6", # Our reports have HTML output "matplotlib>=3.5.3,<3.8.0", # Important plotting library + "mpl_toolkits", # For adjusting matplotlib sub-plots "numpy>=1.21", # Important math library "ordered-set>=3.1.1", # A useful data structure "pluggy>=1.2.0", # Central tool behind the ARMI Plugin system "pyDOE>=0.3.8", # We import a Latin-hypercube algorithm to explore a phase space "pyevtk>=1.2.0", # Handles binary VTK visualization files - "ruamel.yaml.clib ; python_version >= '3.11.0'", # C-based core of ruamel below "ruamel.yaml ; python_version >= '3.11.0'", # Our foundational YAML library + "ruamel.yaml.clib ; python_version >= '3.11.0'", # C-based core of ruamel below "ruamel.yaml.clib<=0.2.7 ; python_version < '3.11.0'", # C-based core of ruamel below "ruamel.yaml<=0.17.21 ; python_version < '3.11.0'", # Our foundational YAML library "scipy>=1.7.0", # Used for curve-fitting and matrix math @@ -81,9 +83,10 @@ test = [ "ipykernel>=6.0.0", # IPython Kernel (We run test notebooks from the doc tutorials.) "jupyter_client>=7.0.0", # Reference implementation of the Jupyter protocol "nbconvert>=7.0.0", # Converting Jupyter Notebooks to other formats - "pytest>=7.0.0", # Our primary test tooling + "nbformat>=5.5.0", # Jupyter Notebook reader "pytest-cov>=4.0.0", # coverage plugin "pytest-xdist>=3.0.0", # To spread our tests over multiple CPUs + "pytest>=7.0.0", # Our primary test tooling "ruff==0.5.1", # Linting and code formatting (version-pinned) ] docs = [ From 389bb268b930e2b92fc3fea4771a879c82951c5d Mon Sep 17 00:00:00 2001 From: jstilley Date: Thu, 19 Dec 2024 09:56:36 -0800 Subject: [PATCH 2/3] whoops --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 021dd1cae..77718207a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,6 @@ authors = [ ] dependencies = [ "coverage>=7.2.0", # Code coverage tool. Sadly baked into every Case. - "dateutil>=2.2", # To read a datetime string more easily. "h5py>=3.0,<=3.9 ; python_version < '3.11.0'", "h5py>=3.9 ; python_version >= '3.11.0'", # Needed because our database files are H5 format "htmltree>=0.7.6", # Our reports have HTML output @@ -42,6 +41,7 @@ dependencies = [ "pluggy>=1.2.0", # Central tool behind the ARMI Plugin system "pyDOE>=0.3.8", # We import a Latin-hypercube algorithm to explore a phase space "pyevtk>=1.2.0", # Handles binary VTK visualization files + "python-dateutil>=2.2", # To read a datetime string more easily. "ruamel.yaml ; python_version >= '3.11.0'", # Our foundational YAML library "ruamel.yaml.clib ; python_version >= '3.11.0'", # C-based core of ruamel below "ruamel.yaml.clib<=0.2.7 ; python_version < '3.11.0'", # C-based core of ruamel below From 97ca092a58d63a1ac2d47e857ad82d0ad6beed4d Mon Sep 17 00:00:00 2001 From: jstilley Date: Thu, 19 Dec 2024 10:00:36 -0800 Subject: [PATCH 3/3] mpl_toolkits is just part of mat-props --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 77718207a..330094aa1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,6 @@ dependencies = [ "h5py>=3.9 ; python_version >= '3.11.0'", # Needed because our database files are H5 format "htmltree>=0.7.6", # Our reports have HTML output "matplotlib>=3.5.3,<3.8.0", # Important plotting library - "mpl_toolkits", # For adjusting matplotlib sub-plots "numpy>=1.21", # Important math library "ordered-set>=3.1.1", # A useful data structure "pluggy>=1.2.0", # Central tool behind the ARMI Plugin system