diff --git a/flake.nix b/flake.nix index 63dadcb..54d6cab 100644 --- a/flake.nix +++ b/flake.nix @@ -96,8 +96,8 @@ inputsFrom = [packages.default]; }; - devShells.pure-python = pkgs.mkShell { - name = "niar-pure-python"; + devShells.pdm = pkgs.mkShell { + name = "niar-pdm"; buildInputs = [ diff --git a/pdm.lock b/pdm.lock index 138b4a9..d5ccd57 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,18 +5,15 @@ groups = ["default", "test"] strategy = ["inherit_metadata"] lock_version = "4.5.0" -content_hash = "sha256:5432adbed676bebf63d12df3090bd10bd9bf18b8e79c04ca8aa7cb96999b1624" +content_hash = "sha256:c8192a2280add1e85232fe7060c86d6b37d1cd2bd56dc5d913e67695c31b3732" [[metadata.targets]] requires_python = ">=3.8" [[package]] name = "amaranth" -version = "0.6.0.dev45" +version = "0.5.3" requires_python = "~=3.8" -git = "https://github.com/amaranth-lang/amaranth" -ref = "bc2e90913311e326d8f396e33d7a1c7f6eef6e4e" -revision = "bc2e90913311e326d8f396e33d7a1c7f6eef6e4e" summary = "Amaranth hardware definition language" groups = ["default", "test"] dependencies = [ @@ -25,6 +22,10 @@ dependencies = [ "jschon~=0.11.1", "pyvcd<0.5,>=0.2.2", ] +files = [ + {file = "amaranth-0.5.3-py3-none-any.whl", hash = "sha256:6a3cfda5951b7503858f8b2167106c794edc8d5c2989c010eaef949d329e6548"}, + {file = "amaranth-0.5.3.tar.gz", hash = "sha256:29de98fc917f7d67d989a615e3538e617eca442ae97ed36fcf078d57352cdfaf"}, +] [[package]] name = "amaranth-boards" @@ -41,31 +42,32 @@ dependencies = [ [[package]] name = "amaranth-yosys" -version = "0.40.0.0.post98" +version = "0.40.0.0.post100" requires_python = "~=3.8" summary = "Specialized WebAssembly build of Yosys used by Amaranth HDL" groups = ["default"] dependencies = [ "importlib-resources>=1.4; python_version < \"3.9\"", - "wasmtime<24,>=1", + "wasmtime<26,>=1", ] files = [ - {file = "amaranth_yosys-0.40.0.0.post98-py3-none-any.whl", hash = "sha256:c8ec7c38e57e09aa88a0f4108df803bbca8753e7774e85abab950cdeefaa449d"}, + {file = "amaranth_yosys-0.40.0.0.post100-py3-none-any.whl", hash = "sha256:5df73a9d2d12683ad59c86e50f17b2d0f2758927dc42a32d718a981748ac729a"}, ] [[package]] name = "amaranth" -version = "0.6.0.dev45" +version = "0.5.3" extras = ["builtin-yosys"] requires_python = "~=3.8" -git = "https://github.com/amaranth-lang/amaranth" -ref = "bc2e90913311e326d8f396e33d7a1c7f6eef6e4e" -revision = "bc2e90913311e326d8f396e33d7a1c7f6eef6e4e" summary = "Amaranth hardware definition language" groups = ["default"] dependencies = [ - "amaranth @ git+https://github.com/amaranth-lang/amaranth@bc2e90913311e326d8f396e33d7a1c7f6eef6e4e", "amaranth-yosys>=0.40", + "amaranth==0.5.3", +] +files = [ + {file = "amaranth-0.5.3-py3-none-any.whl", hash = "sha256:6a3cfda5951b7503858f8b2167106c794edc8d5c2989c010eaef949d329e6548"}, + {file = "amaranth-0.5.3.tar.gz", hash = "sha256:29de98fc917f7d67d989a615e3538e617eca442ae97ed36fcf078d57352cdfaf"}, ] [[package]] @@ -94,7 +96,7 @@ files = [ [[package]] name = "importlib-resources" -version = "6.4.3" +version = "6.4.5" requires_python = ">=3.8" summary = "Read resources from Python packages" groups = ["default", "test"] @@ -102,8 +104,8 @@ dependencies = [ "zipp>=3.1.0; python_version < \"3.10\"", ] files = [ - {file = "importlib_resources-6.4.3-py3-none-any.whl", hash = "sha256:2d6dfe3b9e055f72495c2085890837fc8c758984e209115c8792bddcb762cd93"}, - {file = "importlib_resources-6.4.3.tar.gz", hash = "sha256:4a202b9b9d38563b46da59221d77bb73862ab5d79d461307bcb826d725448b98"}, + {file = "importlib_resources-6.4.5-py3-none-any.whl", hash = "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717"}, + {file = "importlib_resources-6.4.5.tar.gz", hash = "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065"}, ] [[package]] @@ -229,7 +231,7 @@ files = [ [[package]] name = "pytest" -version = "8.3.2" +version = "8.3.3" requires_python = ">=3.8" summary = "pytest: simple powerful testing with Python" groups = ["test"] @@ -242,8 +244,8 @@ dependencies = [ "tomli>=1; python_version < \"3.11\"", ] files = [ - {file = "pytest-8.3.2-py3-none-any.whl", hash = "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5"}, - {file = "pytest-8.3.2.tar.gz", hash = "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"}, + {file = "pytest-8.3.3-py3-none-any.whl", hash = "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"}, + {file = "pytest-8.3.3.tar.gz", hash = "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181"}, ] [[package]] @@ -270,19 +272,19 @@ files = [ [[package]] name = "tomli" -version = "2.0.1" -requires_python = ">=3.7" +version = "2.0.2" +requires_python = ">=3.8" summary = "A lil' TOML parser" groups = ["test"] marker = "python_version < \"3.11\"" files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, + {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"}, + {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"}, ] [[package]] name = "wasmtime" -version = "23.0.0" +version = "25.0.0" requires_python = ">=3.8" summary = "A WebAssembly runtime powered by Wasmtime" groups = ["default"] @@ -290,23 +292,23 @@ dependencies = [ "importlib-resources>=5.10", ] files = [ - {file = "wasmtime-23.0.0-py3-none-any.whl", hash = "sha256:f496a3fb4e3a7c666aca6aedb2acd56402f300e2a1136fc768ed8d81e6aff7f4"}, - {file = "wasmtime-23.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:7bbba2a4a6f2d7273021db3ac7f5a7a6cd806c3086b59490dee990ebf130a707"}, - {file = "wasmtime-23.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1267df7b9c83898de0884dc0a9bfa1fa6219dad9242708aee70db501a2d71108"}, - {file = "wasmtime-23.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:4144847d89a133a25783e9ee11126dd3e1accea52ee20ed91e2d0315fda3abf2"}, - {file = "wasmtime-23.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:ba664d1298f5e37cafefc97a870e832862f1e60284c82dd3da8aba54457db372"}, - {file = "wasmtime-23.0.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d9e2e16272f0d00ff224f9014eba4f031e01966a97599e15f3c66840f52520c7"}, - {file = "wasmtime-23.0.0-py3-none-win_amd64.whl", hash = "sha256:bedd46766ab44b7910869eaac09ede904eb8fbe80ec7f9b8a13222c6df198549"}, + {file = "wasmtime-25.0.0-py3-none-any.whl", hash = "sha256:22aa59fc6e01deec8a6703046f82466090d5811096a3bb5c169907e36c842af1"}, + {file = "wasmtime-25.0.0-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:13e9a718e9d580c1738782cc19f4dcb9fb068f7e51778ea621fd664f4433525b"}, + {file = "wasmtime-25.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5bdf1214ee3ee78a4a8a92da339f4c4c8c109e65af881b37f4adfc05d02af426"}, + {file = "wasmtime-25.0.0-py3-none-manylinux1_x86_64.whl", hash = "sha256:b4364e14d44e3b7afe6a40bf608e9d0d2c40b09dece441d20f4f6e31906b729c"}, + {file = "wasmtime-25.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a07445073cf36a6e5d1dc28246a897dcbdaa537ba8be8805be65422ecca297eb"}, + {file = "wasmtime-25.0.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:53d5f614348a28aabdf80ae4f6fdfa803031af1f74ada03826fd4fd43aeee6c8"}, + {file = "wasmtime-25.0.0-py3-none-win_amd64.whl", hash = "sha256:f8a2a213b9179965db2d2eedececd69a37e287e902330509afae51c71a3a6842"}, ] [[package]] name = "zipp" -version = "3.20.0" +version = "3.20.2" requires_python = ">=3.8" summary = "Backport of pathlib-compatible object wrapper for zip files" groups = ["default", "test"] marker = "python_version < \"3.10\"" files = [ - {file = "zipp-3.20.0-py3-none-any.whl", hash = "sha256:58da6168be89f0be59beb194da1250516fdaa062ccebd30127ac65d30045e10d"}, - {file = "zipp-3.20.0.tar.gz", hash = "sha256:0145e43d89664cfe1a2e533adc75adafed82fe2da404b4bbb6b026c0157bdb31"}, + {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"}, + {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"}, ]