From 72f8d1b0e70ca6053f83ea222cae1e80e59783bd Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 26 Sep 2024 19:21:11 +0200 Subject: [PATCH] more --- .github/workflows/build.yml | 2 +- pyproject.toml | 3 +-- requirements-test.txt | 26 +------------------------- requirements.txt | 4 ++-- 4 files changed, 5 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c90871f..6b8b53a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox tox-gh-actions + pip install tox tox-gh-actions setuptools - name: Run tox run: tox diff --git a/pyproject.toml b/pyproject.toml index fdb0831..67f5f2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,14 +26,13 @@ hvutil = "hvcc.utils:main" [tool.poetry.dependencies] python = "^3.8.1" Jinja2 = ">=2.11" -importlib-resources = { version = ">=5.1", python = "==3.8" } +importlib-resources = ">=5.1" wstd2daisy = ">=0.5.3" pydantic = ">=2.9.1" [tool.poetry.group.dev.dependencies] numpy = "^1.24.1" scipy = "^1.9.1" -tox = "^4.20.0" pytest-cov = "^5.0.0" flake8 = "^7.1.1" mypy = "^1.11.2" diff --git a/requirements-test.txt b/requirements-test.txt index 64a9e62..f40f0f0 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,10 +1,4 @@ -cachetools==5.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \ - --hash=sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a -chardet==5.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \ - --hash=sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970 -colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ +colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32" \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 coverage[toml]==7.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ @@ -80,15 +74,9 @@ coverage[toml]==7.6.1 ; python_full_version >= "3.8.1" and python_full_version < --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \ --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \ --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc -distlib==0.3.8 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \ - --hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 exceptiongroup==1.2.2 ; python_full_version >= "3.8.1" and python_version < "3.11" \ --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \ --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc -filelock==3.16.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \ - --hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435 flake8==7.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38 \ --hash=sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213 @@ -161,9 +149,6 @@ numpy==1.24.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" packaging==24.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \ --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124 -platformdirs==4.3.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \ - --hash=sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb pluggy==1.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \ --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669 @@ -173,9 +158,6 @@ pycodestyle==2.12.1 ; python_full_version >= "3.8.1" and python_full_version < " pyflakes==3.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f \ --hash=sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a -pyproject-api==1.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:3d7d347a047afe796fd5d1885b1e391ba29be7169bd2f102fcd378f04273d228 \ - --hash=sha256:77b8049f2feb5d33eefcc21b57f1e279636277a8ac8ad6b5871037b243778496 pytest-cov==5.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652 \ --hash=sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857 @@ -207,12 +189,6 @@ scipy==1.9.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" tomli==2.0.1 ; python_full_version >= "3.8.1" and python_full_version <= "3.11.0a6" \ --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f -tox==4.20.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:21a8005e3d3fe5658a8e36b8ca3ed13a4230429063c5cc2a2fdac6ee5aa0de34 \ - --hash=sha256:5b78a49b6eaaeab3ae4186415e7c97d524f762ae967c63562687c3e5f0ec23d5 typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \ --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 -virtualenv==20.26.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ - --hash=sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6 \ - --hash=sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4 diff --git a/requirements.txt b/requirements.txt index 63dbd8b..1525bce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ annotated-types==0.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \ --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89 -importlib-resources==6.4.5 ; python_full_version >= "3.8.1" and python_version == "3.8" \ +importlib-resources==6.4.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065 \ --hash=sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717 jinja2==3.1.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ @@ -167,6 +167,6 @@ typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_full_versi wstd2daisy==0.5.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" \ --hash=sha256:1cf6bbc6d08cf1f4d36c1aac2f1ca0c7a7b393c49308757bb3f91b05f8cf397a \ --hash=sha256:cd566d89bb36ec9fb245acff166f401a71374f044ec8db421a08eedd52bbe07b -zipp==3.20.2 ; python_full_version >= "3.8.1" and python_version == "3.8" \ +zipp==3.20.2 ; python_full_version >= "3.8.1" and python_version < "3.10" \ --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \ --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29