diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 68473159f..828da670d 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -84,20 +84,20 @@ jobs: uses: actions/cache@v4 with: path: ~/.local - key: poetry-1 # increment to reset cache + key: poetry-3 # increment to reset cache - name: Install Poetry 📜 if: steps.poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 with: - version: 1.8.5 + version: 2.0.1 - name: Restore Poetry environments 📌 id: poetry-venvs uses: actions/cache@v4 with: path: ~/.cache/pypoetry/virtualenvs - key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-3 # increment to reset cache + key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-5 # increment to reset cache - name: Create Poetry environments 📜 if: steps.poetry-venvs.outputs.cache-hit != 'true' diff --git a/package.json b/package.json index cb1936707..158ad2bad 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "lint:root:eslint": "eslint \"**/*.{js,cjs,ts,tsx}\" --max-warnings=0", "test": "vitest", "support:setup": "poetry -C support/sample install && poetry -C support/h5grove install", - "support:sample": "poetry -C support/sample run python support/sample/create_h5_sample.py", - "support:h5grove": "poetry -C support/h5grove run python support/h5grove/tornado_app.py --basedir support/sample/dist", + "support:sample": "poetry -C support/sample run python create_h5_sample.py", + "support:h5grove": "poetry -C support/h5grove run python tornado_app.py --basedir ../sample/dist", "cypress": "cypress open --e2e --browser firefox", "cypress:run": "cypress run --e2e", "version": "pnpm -r sync-version && git add .", diff --git a/support/h5grove/poetry.lock b/support/h5grove/poetry.lock index 87b76a04c..34e3d7ae4 100644 --- a/support/h5grove/poetry.lock +++ b/support/h5grove/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. [[package]] name = "h5grove" @@ -6,6 +6,7 @@ version = "2.3.0" description = "Core utilities to serve HDF5 file contents" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "h5grove-2.3.0-py3-none-any.whl", hash = "sha256:7000a5aa64a6d77997ad18296552ec4def62d4e24aa05219b59c535233017fdf"}, {file = "h5grove-2.3.0.tar.gz", hash = "sha256:8d438f2a4616d64b176e6ff352d23b39027b9f1ab2c9169fcfd6f5f1caca8728"}, @@ -31,6 +32,7 @@ version = "3.11.0" description = "Read and write HDF5 files from Python" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "h5py-3.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1625fd24ad6cfc9c1ccd44a66dac2396e7ee74940776792772819fc69f3a3731"}, {file = "h5py-3.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c072655ad1d5fe9ef462445d3e77a8166cbfa5e599045f8aa3c19b75315f10e5"}, @@ -64,6 +66,7 @@ version = "2.1.1" description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.10" +groups = ["main"] files = [ {file = "numpy-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c8a0e34993b510fc19b9a2ce7f31cb8e94ecf6e924a40c0c9dd4f62d0aac47d9"}, {file = "numpy-2.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7dd86dfaf7c900c0bbdcb8b16e2f6ddf1eb1fe39c6c8cca6e94844ed3152a8fd"}, @@ -126,6 +129,7 @@ version = "3.10.7" description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "orjson-3.10.7-cp310-cp310-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:74f4544f5a6405b90da8ea724d15ac9c36da4d72a738c64685003337401f5c12"}, {file = "orjson-3.10.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34a566f22c28222b08875b18b0dfbf8a947e69df21a9ed5c51a6bf91cfb944ac"}, @@ -192,6 +196,7 @@ version = "2024.8.30" description = "Read and write TIFF files" optional = false python-versions = ">=3.9" +groups = ["main"] files = [ {file = "tifffile-2024.8.30-py3-none-any.whl", hash = "sha256:8bc59a8f02a2665cd50a910ec64961c5373bee0b8850ec89d3b7b485bf7be7ad"}, {file = "tifffile-2024.8.30.tar.gz", hash = "sha256:2c9508fe768962e30f87def61819183fb07692c258cb175b3c114828368485a4"}, @@ -214,6 +219,7 @@ version = "6.4.1" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:163b0aafc8e23d8cdc3c9dfb24c5368af84a81e3364745ccb4427669bf84aec8"}, {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6d5ce3437e18a2b66fbadb183c1d3364fb03f2be71299e7d10dbeeb69f4b2a14"}, @@ -234,12 +240,13 @@ version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] [metadata] -lock-version = "2.0" -python-versions = "^3.12" -content-hash = "a370263af9dcc0cd82b2075f69907a87412ad3de5a8cdd8400b4ec7ac1a4cc9f" +lock-version = "2.1" +python-versions = ">=3.12" +content-hash = "be023f9a40cc27ae9bdf80c66ef9ddb40e1b395c5751a2a20e0c238b5b753fe8" diff --git a/support/h5grove/pyproject.toml b/support/h5grove/pyproject.toml index 1f23f1500..add11bda8 100644 --- a/support/h5grove/pyproject.toml +++ b/support/h5grove/pyproject.toml @@ -1,15 +1,18 @@ -[tool.poetry] +[project] name = "h5grove-tornado" version = "0.1.0" -package-mode = false description = "h5grove tornado server for testing purposes" -authors = ["NA"] +authors = [{name = "ESRF"}] +requires-python = ">=3.12" +dependencies = [ + "h5grove[tornado] (==2.3.0)", + "typing-extensions (~=4.10)" +] -[tool.poetry.dependencies] -python = "^3.12" -h5grove = {version = "2.3.0", extras = ["tornado"]} -typing-extensions = "^4.10.0" +[tool.poetry] +package-mode = false +requires-poetry = ">=2" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core>=2"] build-backend = "poetry.core.masonry.api" diff --git a/support/sample/poetry.lock b/support/sample/poetry.lock index 8eddaf958..0c23920b3 100644 --- a/support/sample/poetry.lock +++ b/support/sample/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. [[package]] name = "h5py" @@ -6,6 +6,7 @@ version = "3.11.0" description = "Read and write HDF5 files from Python" optional = false python-versions = ">=3.8" +groups = ["main"] files = [ {file = "h5py-3.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1625fd24ad6cfc9c1ccd44a66dac2396e7ee74940776792772819fc69f3a3731"}, {file = "h5py-3.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c072655ad1d5fe9ef462445d3e77a8166cbfa5e599045f8aa3c19b75315f10e5"}, @@ -39,6 +40,7 @@ version = "1.26.4" description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.9" +groups = ["main"] files = [ {file = "numpy-1.26.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0"}, {file = "numpy-1.26.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a"}, @@ -79,6 +81,6 @@ files = [ ] [metadata] -lock-version = "2.0" -python-versions = "^3.10" -content-hash = "8bae5063166f039f9d6d09dc49de0e6b7ed69964b9a3baceb4788d4b8c765d9b" +lock-version = "2.1" +python-versions = ">=3.12" +content-hash = "5059d76a12a071a4b9d4729fa91729cafff74c43caba08fa1fd094ce20d9fbd4" diff --git a/support/sample/pyproject.toml b/support/sample/pyproject.toml index 59ae0ec50..6b9d9d1ae 100644 --- a/support/sample/pyproject.toml +++ b/support/sample/pyproject.toml @@ -1,15 +1,18 @@ -[tool.poetry] +[project] name = "sample" version = "0.1.0" -package-mode = false description = "Script to create HDF5 sample file for testing purposes" -authors = ["NA"] +authors = [{name = "ESRF"}] +requires-python = ">=3.12" +dependencies = [ + "numpy (~=1.26)", + "h5py (~=3.10)" +] -[tool.poetry.dependencies] -python = "^3.10" -numpy = "^1.26.4" -h5py = "^3.10.0" +[tool.poetry] +package-mode = false +requires-poetry = ">=2" [build-system] -requires = ["poetry-core"] +requires = ["poetry-core>=2"] build-backend = "poetry.core.masonry.api"