diff --git a/poetry.lock b/poetry.lock index 3892fa4ed..a5166f855 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,8 @@ +<<<<<<< HEAD # This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand. +======= +# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand. +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) [[package]] name = "accessible-pygments" @@ -123,25 +127,19 @@ files = [ [[package]] name = "argon2-cffi" -version = "23.1.0" +version = "25.1.0" description = "Argon2 for Python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" groups = ["main", "dev"] files = [ - {file = "argon2_cffi-23.1.0-py3-none-any.whl", hash = "sha256:c670642b78ba29641818ab2e68bd4e6a78ba53b7eff7b4c3815ae16abf91c7ea"}, - {file = "argon2_cffi-23.1.0.tar.gz", hash = "sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08"}, + {file = "argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741"}, + {file = "argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1"}, ] [package.dependencies] argon2-cffi-bindings = "*" -[package.extras] -dev = ["argon2-cffi[tests,typing]", "tox (>4)"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-copybutton", "sphinx-notfound-page"] -tests = ["hypothesis", "pytest"] -typing = ["mypy"] - [[package]] name = "argon2-cffi-bindings" version = "21.2.0" @@ -481,18 +479,31 @@ css = ["tinycss2 (>=1.1.0,<1.5)"] [[package]] name = "boto3" +<<<<<<< HEAD version = "1.36.0" +======= +version = "1.38.28" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) description = "The AWS SDK for Python" optional = false python-versions = ">=3.8" groups = ["main"] files = [ +<<<<<<< HEAD {file = "boto3-1.36.0-py3-none-any.whl", hash = "sha256:d0ca7a58ce25701a52232cc8df9d87854824f1f2964b929305722ebc7959d5a9"}, {file = "boto3-1.36.0.tar.gz", hash = "sha256:159898f51c2997a12541c0e02d6e5a8fe2993ddb307b9478fd9a339f98b57e00"}, ] [package.dependencies] botocore = ">=1.36.0,<1.37.0" +======= + {file = "boto3-1.38.28-py3-none-any.whl", hash = "sha256:1bbf770339d294c91dd396ac90588753d89b9fdd63496edc9bc6f710f24ed25a"}, + {file = "boto3-1.38.28.tar.gz", hash = "sha256:69395075d54be4552719ccadad9f65a3dee5bb3751701e8851d65d71974a791d"}, +] + +[package.dependencies] +botocore = ">=1.38.28,<1.39.0" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.11.0,<0.12.0" @@ -501,14 +512,23 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" +<<<<<<< HEAD version = "1.36.0" +======= +version = "1.38.28" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">=3.8" groups = ["main"] files = [ +<<<<<<< HEAD {file = "botocore-1.36.0-py3-none-any.whl", hash = "sha256:b54b11f0cfc47fc1243ada0f7f461266c279968487616720fa8ebb02183917d7"}, {file = "botocore-1.36.0.tar.gz", hash = "sha256:0232029ff9ae3f5b50cdb25cbd257c16f87402b6d31a05bd6483638ee6434c4b"}, +======= + {file = "botocore-1.38.28-py3-none-any.whl", hash = "sha256:515e1a535a27f17e1381aec1fb48eaa2c2308258c4db0bfd09e4f1cd1f239c44"}, + {file = "botocore-1.38.28.tar.gz", hash = "sha256:63d5977a10a375c3fc11c8e15e1ae5a4daaf450af135d55c170cc537648edf25"}, +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) ] [package.dependencies] @@ -801,14 +821,23 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} [[package]] name = "cmd2" +<<<<<<< HEAD version = "2.5.8" +======= +version = "2.6.0" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) description = "cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] files = [ +<<<<<<< HEAD {file = "cmd2-2.5.8-py3-none-any.whl", hash = "sha256:aeb6eb6cd6d783bb7d92d37aa920bcfa7379690ba9ab1188576562f73a13471c"}, {file = "cmd2-2.5.8.tar.gz", hash = "sha256:ddf29beaa7c9d4e9806eefad528a59c372ca97b4c0d83e019fef0e37c44f4497"}, +======= + {file = "cmd2-2.6.0-py3-none-any.whl", hash = "sha256:832f8121c4f21ebf2af4292051b34579d7d4c9e917dc54f8e322feb911d76da1"}, + {file = "cmd2-2.6.0.tar.gz", hash = "sha256:8cffaba7810526421cab3bfa0101b4907e1298ff2bcd8119615965a2eae5d95f"}, +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) ] [package.dependencies] @@ -1768,6 +1797,99 @@ test = ["pickleshare", "pytest (<7.1)", "pytest-asyncio (<0.22)", "testpath"] test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.22)", "pandas", "pickleshare", "pytest (<7.1)", "pytest-asyncio (<0.22)", "testpath", "trio"] [[package]] +<<<<<<< HEAD +======= +name = "ipython" +version = "8.37.0" +description = "IPython: Productive Interactive Computing" +optional = false +python-versions = ">=3.10" +groups = ["main", "dev"] +markers = "python_version == \"3.10\"" +files = [ + {file = "ipython-8.37.0-py3-none-any.whl", hash = "sha256:ed87326596b878932dbcb171e3e698845434d8c61b8d8cd474bf663041a9dcf2"}, + {file = "ipython-8.37.0.tar.gz", hash = "sha256:ca815841e1a41a1e6b73a0b08f3038af9b2252564d01fc405356d34033012216"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +decorator = "*" +exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} +jedi = ">=0.16" +matplotlib-inline = "*" +pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""} +prompt_toolkit = ">=3.0.41,<3.1.0" +pygments = ">=2.4.0" +stack_data = "*" +traitlets = ">=5.13.0" +typing_extensions = {version = ">=4.6", markers = "python_version < \"3.12\""} + +[package.extras] +all = ["ipython[black,doc,kernel,matplotlib,nbconvert,nbformat,notebook,parallel,qtconsole]", "ipython[test,test-extra]"] +black = ["black"] +doc = ["docrepr", "exceptiongroup", "intersphinx_registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "tomli ; python_version < \"3.11\"", "typing_extensions"] +kernel = ["ipykernel"] +matplotlib = ["matplotlib"] +nbconvert = ["nbconvert"] +nbformat = ["nbformat"] +notebook = ["ipywidgets", "notebook"] +parallel = ["ipyparallel"] +qtconsole = ["qtconsole"] +test = ["packaging", "pickleshare", "pytest", "pytest-asyncio (<0.22)", "testpath"] +test-extra = ["curio", "ipython[test]", "jupyter_ai", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.23)", "pandas", "trio"] + +[[package]] +name = "ipython" +version = "9.3.0" +description = "IPython: Productive Interactive Computing" +optional = false +python-versions = ">=3.11" +groups = ["main", "dev"] +markers = "python_version >= \"3.11\"" +files = [ + {file = "ipython-9.3.0-py3-none-any.whl", hash = "sha256:1a0b6dd9221a1f5dddf725b57ac0cb6fddc7b5f470576231ae9162b9b3455a04"}, + {file = "ipython-9.3.0.tar.gz", hash = "sha256:79eb896f9f23f50ad16c3bc205f686f6e030ad246cc309c6279a242b14afe9d8"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +decorator = "*" +ipython-pygments-lexers = "*" +jedi = ">=0.16" +matplotlib-inline = "*" +pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""} +prompt_toolkit = ">=3.0.41,<3.1.0" +pygments = ">=2.4.0" +stack_data = "*" +traitlets = ">=5.13.0" +typing_extensions = {version = ">=4.6", markers = "python_version < \"3.12\""} + +[package.extras] +all = ["ipython[doc,matplotlib,test,test-extra]"] +black = ["black"] +doc = ["docrepr", "exceptiongroup", "intersphinx_registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinx_toml (==0.0.4)", "typing_extensions"] +matplotlib = ["matplotlib"] +test = ["packaging", "pytest", "pytest-asyncio (<0.22)", "testpath"] +test-extra = ["curio", "ipykernel", "ipython[test]", "jupyter_ai", "matplotlib (!=3.2.0)", "nbclient", "nbformat", "numpy (>=1.23)", "pandas", "trio"] + +[[package]] +name = "ipython-pygments-lexers" +version = "1.1.1" +description = "Defines a variety of Pygments lexers for highlighting IPython code." +optional = false +python-versions = ">=3.8" +groups = ["main", "dev"] +markers = "python_version >= \"3.11\"" +files = [ + {file = "ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c"}, + {file = "ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81"}, +] + +[package.dependencies] +pygments = "*" + +[[package]] +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) name = "ipywidgets" version = "8.1.5" description = "Jupyter interactive widgets" @@ -3564,14 +3686,23 @@ colorama = "*" [[package]] name = "prometheus-client" +<<<<<<< HEAD version = "0.21.1" +======= +version = "0.22.1" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) description = "Python client for the Prometheus monitoring system." optional = false python-versions = ">=3.8" groups = ["main", "dev"] files = [ +<<<<<<< HEAD {file = "prometheus_client-0.21.1-py3-none-any.whl", hash = "sha256:594b45c410d6f4f8888940fe80b5cc2521b305a1fafe1c58609ef715a001f301"}, {file = "prometheus_client-0.21.1.tar.gz", hash = "sha256:252505a722ac04b0456be05c05f75f45d760c2911ffc45f2a06bcaed9f3ae3fb"}, +======= + {file = "prometheus_client-0.22.1-py3-none-any.whl", hash = "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"}, + {file = "prometheus_client-0.22.1.tar.gz", hash = "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28"}, +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) ] [package.extras] @@ -5528,14 +5659,24 @@ files = [ [[package]] name = "typing-extensions" +<<<<<<< HEAD version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" +======= +version = "4.14.0" +description = "Backported and Experimental Type Hints for Python 3.9+" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main", "dev"] files = [ +<<<<<<< HEAD {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, +======= + {file = "typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"}, + {file = "typing_extensions-4.14.0.tar.gz", hash = "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4"}, +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) ] [[package]] @@ -5552,19 +5693,20 @@ files = [ [[package]] name = "unyt" -version = "2.9.5" +version = "3.0.4" description = "A package for handling numpy arrays with units" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] files = [ - {file = "unyt-2.9.5-py2.py3-none-any.whl", hash = "sha256:c5d0af78a9a8687902dc7de5ba562fa73b70c8e4d92920d6a702df22cb5612e0"}, - {file = "unyt-2.9.5.tar.gz", hash = "sha256:99892f33b5c6bf97053beac84c8a136747631828f030725e9a01147d48377337"}, + {file = "unyt-3.0.4-py3-none-any.whl", hash = "sha256:323564921b8744e900a5db7b8dc60e315b4d11f35f23203a513b14977252acdb"}, + {file = "unyt-3.0.4.tar.gz", hash = "sha256:17ea7013ef4004507fe193193e80b30645ec269b5b3f5fca80eda8f7cb961213"}, ] [package.dependencies] -numpy = ">=1.17.5" -sympy = ">=1.5" +numpy = ">=1.19.3,<3.0" +packaging = ">=20.9" +sympy = ">=1.7" [[package]] name = "uri-template" @@ -5770,4 +5912,8 @@ docs = ["autodoc_pydantic", "cairosvg", "ipython", "jinja2", "jupyter", "myst-pa [metadata] lock-version = "2.1" python-versions = ">=3.9,<3.13" +<<<<<<< HEAD content-hash = "f6e849640056d92b016231dd52b15c5e5c06cd38f7fc68705b5429b8f595e560" +======= +content-hash = "d7237b9da025ad53ac567cea60056e220f48a9c00be58915eea2bf4ed7ec6688" +>>>>>>> b893c663 ([FL-58] Update Unyt package version (#1095)) diff --git a/pyproject.toml b/pyproject.toml index 8daf47465..87b6fe38b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,8 +28,7 @@ pyyaml = "^6.0.1" rich = "^13.3.4" h5py = "^3.10.0" zstandard = "^0.21.0" -unyt = [{ python = "^3.7", version = "^2.8.0" }, - { python = "^3.8", version = "^2.9.5" }] +unyt = "^3.0.0" pandas = "^2.2.1" pylint = "^3.1.0" black = {extras = ["jupyter"], version = "^24.10.0"} diff --git a/tests/simulation/params/test_unit_conversions.py b/tests/simulation/params/test_unit_conversions.py index f7892de05..b24619b25 100644 --- a/tests/simulation/params/test_unit_conversions.py +++ b/tests/simulation/params/test_unit_conversions.py @@ -175,9 +175,13 @@ def test_operations_on_units(): replaced = ( params.operating_condition.thermal_state.temperature.to("degC") - 25 * fl.u.degC ).to("K") - assertions.assertAlmostEqual(replaced.value, 263.15) + assertions.assertAlmostEqual(replaced.value, -10) assert str(replaced.units) == "K" + replaced = params.operating_condition.thermal_state.temperature.to("degC") - 25 * fl.u.degC + assertions.assertAlmostEqual(replaced.value, -10) + assert str(replaced.units.expr) == "delta_degC" # unyt 3.0+ + replaced = params.operating_condition.thermal_state.density + 2 * fl.u.g / fl.u.cm**3 assertions.assertAlmostEqual(replaced.value, 2001.2249999999997) assert str(replaced.units) == "kg/m**3"