From a08fcaf8f4f833c771786dc5a54f960085e61fad Mon Sep 17 00:00:00 2001 From: Adrian Wilkins Date: Mon, 20 Sep 2021 17:48:14 +0100 Subject: [PATCH] Support most of the guaranteed hashes Works toward resolution of python-poetry/poetry#4523 - [X] Added tests for changed code - [X] Added documentation for changed code Documentation is at least equivalent to the existing stuff. - Implement most of the "guaranteed" hashes as per PEP 503 - Leave out shake, because they're variable length - Feel it's unlikely anyone's repo manager is using these --- poetry/core/packages/file_dependency.py | 4 ++-- pyproject.toml | 2 +- tests/packages/test_file_dependency.py | 32 ++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/poetry/core/packages/file_dependency.py b/poetry/core/packages/file_dependency.py index 939520acc..3c7c5676e 100644 --- a/poetry/core/packages/file_dependency.py +++ b/poetry/core/packages/file_dependency.py @@ -68,8 +68,8 @@ def full_path(self): # type: () -> Path def is_file(self): # type: () -> bool return True - def hash(self): # type: () -> str - h = hashlib.sha256() + def hash(self, hash_name = "sha256"): # type: (str) -> str + h = hashlib.new(hash_name) with self._full_path.open("rb") as fp: for content in iter(lambda: fp.read(io.DEFAULT_BUFFER_SIZE), b""): h.update(content) diff --git a/pyproject.toml b/pyproject.toml index c89c3a6c2..d7b5dee11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry-core" -version = "1.0.5" +version = "1.0.6-alpha.0" description = "Poetry PEP 517 Build Backend" authors = ["Sébastien Eustace "] diff --git a/tests/packages/test_file_dependency.py b/tests/packages/test_file_dependency.py index 7760ab5ce..db58d1f75 100644 --- a/tests/packages/test_file_dependency.py +++ b/tests/packages/test_file_dependency.py @@ -1,5 +1,7 @@ import pytest +import hashlib + from poetry.core.packages import FileDependency from poetry.core.packages import dependency_from_pep_508 from poetry.core.utils._compat import PY36 @@ -7,11 +9,12 @@ DIST_PATH = Path(__file__).parent.parent / "fixtures" / "distributions" +TEST_FILE = "demo-0.1.0.tar.gz" def test_file_dependency_wrong_path(): with pytest.raises(ValueError): - FileDependency("demo", DIST_PATH / "demo-0.2.0.tar.gz") + FileDependency("demo", DIST_PATH / TEST_FILE.replace("1", "2")) def test_file_dependency_dir(): @@ -19,6 +22,33 @@ def test_file_dependency_dir(): FileDependency("demo", DIST_PATH) +def test_default_hash(): + path = DIST_PATH / TEST_FILE + dep = FileDependency("demo", path) + SHA_256 = "72e8531e49038c5f9c4a837b088bfcb8011f4a9f76335c8f0654df6ac539b3d6" + assert dep.hash() == SHA_256 + +@pytest.mark.parametrize("hash_name,expected", [ + ("sha224", "972d02f36539a98599aed0566bc8aaf3e6701f4e895dd797d8f5248e"), + ("sha3_512", "c04ee109ae52d6440445e24dbd6d244a1d0f0289ef79cb7ba9bc3c139c0237169af9a8f61cd1cf4fc17f853ddf84f97c475ac5bb6c91a4aff0b825b884d4896c"), + ("blake2s", "c336ecbc9d867c9d860accfba4c3723c51c4b5c47a1e0a955e1c8df499e36741"), + ("sha3_384", "d4abb2459941369aabf8880c5287b7eeb80678e14f13c71b9ecf64c772029dc3f93939590bea9ecdb51a1d1a74fefc5a"), + ("blake2b", "48e70abac547ab38e2330e6e6743a0c0f6274dcaa6df2c98135a78a9dd5b04a072d551fc3851b34da03eb0bf50dd71c7f32a8c36956e99fd6c66491bc7844800"), + ("sha256", "72e8531e49038c5f9c4a837b088bfcb8011f4a9f76335c8f0654df6ac539b3d6"), + ("sha512", "e08a00a4b86358e49a318e7e3ba7a3d2fabdd17a2fef95559a0af681ea07ab1296b0b8e11e645297da296290661dc07ae3c8f74eab66bd18a80dce0c0ccb355b"), + ("sha384", "aa3144e28c6700a83247e8ec8711af5d3f5f75997990d48ec41e66bd275b3d0e19ee6f2fe525a358f874aa717afd06a9"), + ("sha3_224", "64bfc6e4125b4c6d67fd88ad1c7d1b5c4dc11a1970e433cd576c91d4"), + ("sha1", "4c057579005ac3e68e951a11ffdc4b27c6ae16af"), + ("sha3_256", "ba3d2a964b0680b6dc9565a03952e29c294c785d5a2307d3e2d785d73b75ed7e"), + # ("shake_256", "# fails, needs length"), + # ("shake_128", "# fails"), +]) +def test_guaranteed_hash(hash_name, expected): + path = DIST_PATH / TEST_FILE + dep = FileDependency("demo", path) + assert dep.hash(hash_name) == expected + + def _test_file_dependency_pep_508( mocker, name, path, pep_508_input, pep_508_output=None ):