From ecdf4f91c71b7a0fbd54432155bf63a18119b843 Mon Sep 17 00:00:00 2001 From: Chris Rose Date: Thu, 26 Sep 2024 14:02:35 -0700 Subject: [PATCH] No need to pin importlib_resource any more Fixes #236 --- tox.ini | 1 - uv.lock | 81 +++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 27 deletions(-) diff --git a/tox.ini b/tox.ini index 46f5946..c5d9d39 100644 --- a/tox.ini +++ b/tox.ini @@ -152,7 +152,6 @@ commands = basepython = python3.12 deps = towncrier - importlib_resources<6 # TODO: remove once twisted/towncrier#528 is released skip_install = true commands = towncrier --draft diff --git a/uv.lock b/uv.lock index 71c1e3b..88ed4ce 100644 --- a/uv.lock +++ b/uv.lock @@ -593,12 +593,12 @@ name = "jsonschema" version = "4.23.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "attrs" }, - { name = "importlib-resources", marker = "python_full_version < '3.9'" }, - { name = "jsonschema-specifications" }, - { name = "pkgutil-resolve-name", marker = "python_full_version < '3.9'" }, - { name = "referencing" }, - { name = "rpds-py" }, + { name = "attrs", marker = "platform_python_implementation != 'PyPy'" }, + { name = "importlib-resources", marker = "python_full_version < '3.9' and platform_python_implementation != 'PyPy'" }, + { name = "jsonschema-specifications", marker = "platform_python_implementation != 'PyPy'" }, + { name = "pkgutil-resolve-name", marker = "python_full_version < '3.9' and platform_python_implementation != 'PyPy'" }, + { name = "referencing", marker = "platform_python_implementation != 'PyPy'" }, + { name = "rpds-py", marker = "platform_python_implementation != 'PyPy'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/38/2e/03362ee4034a4c917f697890ccd4aec0800ccf9ded7f511971c75451deec/jsonschema-4.23.0.tar.gz", hash = "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4", size = 325778 } wheels = [ @@ -610,8 +610,8 @@ name = "jsonschema-specifications" version = "2023.12.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "importlib-resources", marker = "python_full_version < '3.9'" }, - { name = "referencing" }, + { name = "importlib-resources", marker = "python_full_version < '3.9' and platform_python_implementation != 'PyPy'" }, + { name = "referencing", marker = "platform_python_implementation != 'PyPy'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/f8/b9/cc0cc592e7c195fb8a650c1d5990b10175cf13b4c97465c72ec841de9e4b/jsonschema_specifications-2023.12.1.tar.gz", hash = "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc", size = 13983 } wheels = [ @@ -932,7 +932,7 @@ wheels = [ [[package]] name = "pyhamcrest" -version = "2.1.1.dev14" +version = "2.1.1.dev29" source = { editable = "." } [package.optional-dependencies] @@ -952,7 +952,7 @@ dev = [ { name = "sphinx" }, { name = "towncrier" }, { name = "tox" }, - { name = "tox-asdf" }, + { name = "tox-uv" }, { name = "twine" }, { name = "types-mock" }, ] @@ -1017,7 +1017,7 @@ requires-dist = [ { name = "sphinx", marker = "extra == 'docs'", specifier = "~=5.0" }, { name = "towncrier", marker = "extra == 'dev'" }, { name = "tox", marker = "extra == 'dev'" }, - { name = "tox-asdf", marker = "extra == 'dev'" }, + { name = "tox-uv", marker = "extra == 'dev'" }, { name = "twine", marker = "extra == 'dev'" }, { name = "types-mock", marker = "extra == 'dev'" }, { name = "types-mock", marker = "extra == 'tests'" }, @@ -1074,15 +1074,15 @@ name = "pytest-mypy-plugins" version = "3.1.2" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "decorator" }, - { name = "jinja2" }, - { name = "jsonschema" }, - { name = "mypy" }, - { name = "packaging" }, - { name = "pytest" }, - { name = "pyyaml" }, - { name = "regex" }, - { name = "tomlkit" }, + { name = "decorator", marker = "platform_python_implementation != 'PyPy'" }, + { name = "jinja2", marker = "platform_python_implementation != 'PyPy'" }, + { name = "jsonschema", marker = "platform_python_implementation != 'PyPy'" }, + { name = "mypy", marker = "platform_python_implementation != 'PyPy'" }, + { name = "packaging", marker = "platform_python_implementation != 'PyPy'" }, + { name = "pytest", marker = "platform_python_implementation != 'PyPy'" }, + { name = "pyyaml", marker = "platform_python_implementation != 'PyPy'" }, + { name = "regex", marker = "platform_python_implementation != 'PyPy'" }, + { name = "tomlkit", marker = "platform_python_implementation != 'PyPy'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/95/36/5411148fa0ad3242e38364152016a9d56758c0e0808fcb1909562f85b328/pytest-mypy-plugins-3.1.2.tar.gz", hash = "sha256:14fa9b00e59713a6fdb88fcf04e8139b9467e117b98d61fc12038c60afb7febe", size = 26202 } wheels = [ @@ -1213,8 +1213,8 @@ name = "referencing" version = "0.35.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "attrs" }, - { name = "rpds-py" }, + { name = "attrs", marker = "platform_python_implementation != 'PyPy'" }, + { name = "rpds-py", marker = "platform_python_implementation != 'PyPy'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/99/5b/73ca1f8e72fff6fa52119dbd185f73a907b1989428917b24cff660129b6d/referencing-0.35.1.tar.gz", hash = "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c", size = 62991 } wheels = [ @@ -1660,15 +1660,19 @@ wheels = [ ] [[package]] -name = "tox-asdf" -version = "0.1.0" +name = "tox-uv" +version = "1.13.0" source = { registry = "https://pypi.org/simple" } dependencies = [ + { name = "importlib-resources", marker = "python_full_version < '3.9'" }, + { name = "packaging" }, { name = "tox" }, + { name = "typing-extensions", marker = "python_full_version < '3.10'" }, + { name = "uv" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/45/f0/446767bddd9bdd32302f607f9a7a99b3e1bfe572e8133420f280dbc439f7/tox-asdf-0.1.0.tar.gz", hash = "sha256:09e8a425eecc0545305ad4e4266367560bf4375a4f880db56a1b6b4287c7b7f1", size = 5339 } +sdist = { url = "https://files.pythonhosted.org/packages/31/23/752b7bc25013d2958df6adac2bce983b0984930444f2f23926cc325e2848/tox_uv-1.13.0.tar.gz", hash = "sha256:fb087b8b4ff779c72b48fc72ea1995387bb1c0dfb37910c20e46cef8b5f98c15", size = 15643 } wheels = [ - { url = "https://files.pythonhosted.org/packages/0a/12/0729c96439a93cdae156747c5b9953cd6673d007fe1fb1a486b93b075534/tox_asdf-0.1.0-py2.py3-none-any.whl", hash = "sha256:18b40e396b70ed9cfb68af2c9463cfd3d38d2786a32872d37a0fe58392e4535f", size = 5065 }, + { url = "https://files.pythonhosted.org/packages/40/93/1b0b0c27177f4816594683cd4e008e07137756f5b8ba55483c30789bf08c/tox_uv-1.13.0-py3-none-any.whl", hash = "sha256:1037e4abad15a3b708b5970ed7a17a0765d7249b641a92b155bc3343b8b0145b", size = 13383 }, ] [[package]] @@ -1718,6 +1722,31 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", size = 126338 }, ] +[[package]] +name = "uv" +version = "0.4.16" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/5a/7a/ace9d252218058b4bcab29fc44f866388da7d9aa71c736b84f7133154641/uv-0.4.16.tar.gz", hash = "sha256:2144995a87b161d063bd4ef8294b1e948677bd90d01f8394d0e3fca037bb847f", size = 1996719 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/10/e607af4571057cf309038b6249e3d559996d9df6b828505360d999e176af/uv-0.4.16-py3-none-linux_armv6l.whl", hash = "sha256:9de9bfd82d5ec1b0180976b1e5db389c7f13e59a2b08037faa93fef474c63517", size = 11612648 }, + { url = "https://files.pythonhosted.org/packages/ff/e3/2646adc62c090fdcf864828a8c1ddb7981c2b76c8fb27faa10cf233a8d28/uv-0.4.16-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d501b14f491057c102e2f6be92e5a1da973453b893fd727a552908fe8a8a1061", size = 11958498 }, + { url = "https://files.pythonhosted.org/packages/0c/32/443b9ae56645983897d41a3166e0f62031c934f7a884a3e3ecdee7fe5ee8/uv-0.4.16-py3-none-macosx_11_0_arm64.whl", hash = "sha256:97529f45c0720cafa6870ae3d9a43449c34f6c762505249dcd033ca6d7b121ec", size = 11102085 }, + { url = "https://files.pythonhosted.org/packages/c7/1a/5072db5b6bd71bc0e504a6c2927a909ccf0a68ecb7a8fa49deaaaee82b7d/uv-0.4.16-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:c390d0887e0bc918d96660460a89101368af28815c40ea26795ab801651d128e", size = 11439596 }, + { url = "https://files.pythonhosted.org/packages/0c/eb/1084f082f6d04c3c29cb0edabc201783906a7d428865b8f9d50b10ccb949/uv-0.4.16-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c54b1725836e5a84168f705a395e21353bdbb2d47e77d645cb0622a77defcf04", size = 11394982 }, + { url = "https://files.pythonhosted.org/packages/a0/32/b4bf9ee2c7f0940bec3ac81c39590e37ab6e52f8fd3d7450f3ffee1fd387/uv-0.4.16-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43c7339114431565679f42d3c85b4c7ba5dfdf1d9ad5f89682c1177828161602", size = 12060833 }, + { url = "https://files.pythonhosted.org/packages/d2/0e/9df458aba4355bb315a2a0231d47be43ff31532b83e0fbbd8cb1d1845e49/uv-0.4.16-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5ee1c25c8296d932fa2f0629ad6d1b9b04e9f5f0a0f1e90e64d488d13861e533", size = 12880630 }, + { url = "https://files.pythonhosted.org/packages/ad/fa/77d72f20fb6e3e405b8af867dc7c2d660bb2e8fddd03f5ef2b3f7d071cf7/uv-0.4.16-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:68390b39b36ddbfe48033f308f4e983879b49ce345de2105e5cf3d3baa22dfea", size = 12651867 }, + { url = "https://files.pythonhosted.org/packages/86/62/d40b84bcf798d4ecb937cb505ac96c27808bf22ce24ce7d2e5fcfab1e625/uv-0.4.16-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c92a1a2bf541a3f65b5b2502ca51f8709e8ac8bb85846c87c65d343e66ede622", size = 16006428 }, + { url = "https://files.pythonhosted.org/packages/1e/38/9c4464a36b04eb03cad3ae7aeb48a0f0024063cefe15198f0aa2f9274da8/uv-0.4.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:050715938e78c6d69d9bdd6a9bd536c92c9f516ac0ca252726c546e8dc7af30d", size = 12323582 }, + { url = "https://files.pythonhosted.org/packages/fc/17/df1e4ce851a9175e2390d588f04a3a2f4241eea5b549ad86de27ce02bd08/uv-0.4.16-py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:29fdf36b2e4de02e676bb2ae3ca25bccb97d457f8bbb5c5a58fc4f223df1e235", size = 11549981 }, + { url = "https://files.pythonhosted.org/packages/86/21/7f0860ae1dccee958f988c3dbf0860f28efef4d30a371edfed8d2fb73641/uv-0.4.16-py3-none-musllinux_1_1_armv7l.whl", hash = "sha256:8147b2998bf9eb743d872de3e469bbe71622126be54ca377bfc0028042bfdad2", size = 11402581 }, + { url = "https://files.pythonhosted.org/packages/b2/7b/f04b0a3fdb107867ef09fbe27a8c0b1f11f23f0cf85786fa18d57e452cec/uv-0.4.16-py3-none-musllinux_1_1_i686.whl", hash = "sha256:87505d25163f6fe0afd85c7952ab66593aa1ecc77a41f65e910760e90bd53b4f", size = 11856713 }, + { url = "https://files.pythonhosted.org/packages/06/e6/e3d4b6b7347b66b1b9dbc9a5cac4faddd299b1f2e33d547507b78f70a4eb/uv-0.4.16-py3-none-musllinux_1_1_ppc64le.whl", hash = "sha256:2a566febc7cbe76e42ad83352c28dd2fe64290e6809f1dfd07f3f158ea5cc68d", size = 13773396 }, + { url = "https://files.pythonhosted.org/packages/d4/92/b93efc1ee1412f260f2191746635f7981af33caedf944f66311bb2cd89b4/uv-0.4.16-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:d1712f1c0df309f7682d7e40783ab55927cc1e7108e43847b2a0b795ea855c45", size = 12463367 }, + { url = "https://files.pythonhosted.org/packages/8c/07/c7f0ce4d06e9f78cc90b543dcfe71e7ae454db97f56278afe7bf3a2f69a1/uv-0.4.16-py3-none-win32.whl", hash = "sha256:1497dbb3a1b41c6c407e0dc7c6b40ca012796b3f9370f0dcbe4edf4dc098a2ec", size = 11847689 }, + { url = "https://files.pythonhosted.org/packages/40/ee/eaf7556ad82a8e99de73a2e4065d1ee22a8dc4b49c18d2eb3d346cb6418b/uv-0.4.16-py3-none-win_amd64.whl", hash = "sha256:136f4b1f8d3a6f2e7f87d009cc4b75be1e52b8b9837ee97600fdd3b2db960a53", size = 13082200 }, +] + [[package]] name = "virtualenv" version = "20.26.5"