From 5e160e3684071616f7016258a03f53c1839837c9 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 30 Dec 2020 15:17:16 +0100 Subject: [PATCH 1/5] tools/suit/manifest-generator: set cbor2 dependency --- dist/tools/suit/suit-manifest-generator/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/tools/suit/suit-manifest-generator/setup.py b/dist/tools/suit/suit-manifest-generator/setup.py index bdf7d3e7af..6c1ea99f32 100644 --- a/dist/tools/suit/suit-manifest-generator/setup.py +++ b/dist/tools/suit/suit-manifest-generator/setup.py @@ -53,7 +53,7 @@ setuptools.setup ( entry_points = entry_points, zip_safe = False, install_requires = [ - 'cbor>=1.0.0', + 'cbor2>=5.0.0', 'colorama>=0.4.0', 'cryptography>=2.8', 'pyhsslms>=1.0.0', From 7f6f60b1a25cd329c1574e46c8903665c5acc492 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 30 Dec 2020 15:17:38 +0100 Subject: [PATCH 2/5] tools/suit/manifest-generator: remove unused pyhsslms dependency --- dist/tools/suit/suit-manifest-generator/setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/tools/suit/suit-manifest-generator/setup.py b/dist/tools/suit/suit-manifest-generator/setup.py index 6c1ea99f32..d0e453cd70 100644 --- a/dist/tools/suit/suit-manifest-generator/setup.py +++ b/dist/tools/suit/suit-manifest-generator/setup.py @@ -56,7 +56,6 @@ setuptools.setup ( 'cbor2>=5.0.0', 'colorama>=0.4.0', 'cryptography>=2.8', - 'pyhsslms>=1.0.0', ], classifiers = [ "Programming Language :: Python :: 3", From fb80ad531757310cf9b7618267bb2de6daf36d0b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 30 Dec 2020 15:18:10 +0100 Subject: [PATCH 3/5] examples/suit_update: fix python dependencies in README --- examples/suit_update/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/suit_update/README.md b/examples/suit_update/README.md index 90a8f4a6c3..2c4a08d1b0 100644 --- a/examples/suit_update/README.md +++ b/examples/suit_update/README.md @@ -33,7 +33,7 @@ Table of contents: - Install python dependencies (only Python3.6 and later is supported): - $ pip3 install --user ed25519 pyasn1 cbor + $ pip3 install --user cbor2 cryptography - Install aiocoap from the source From abfb289aa3e197fa7d349241a146680feb0514e6 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 30 Dec 2020 15:18:42 +0100 Subject: [PATCH 4/5] tools/suit/manifest-generator: fix dependencies alignment --- dist/tools/suit/suit-manifest-generator/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/tools/suit/suit-manifest-generator/setup.py b/dist/tools/suit/suit-manifest-generator/setup.py index d0e453cd70..07df6a025d 100644 --- a/dist/tools/suit/suit-manifest-generator/setup.py +++ b/dist/tools/suit/suit-manifest-generator/setup.py @@ -53,8 +53,8 @@ setuptools.setup ( entry_points = entry_points, zip_safe = False, install_requires = [ - 'cbor2>=5.0.0', - 'colorama>=0.4.0', + 'cbor2>=5.0.0', + 'colorama>=0.4.0', 'cryptography>=2.8', ], classifiers = [ From bb9e66af94cc8a397763aa696d383f688703e927 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 30 Dec 2020 15:47:09 +0100 Subject: [PATCH 5/5] examples/suit_update: fix typo in README --- examples/suit_update/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/suit_update/README.md b/examples/suit_update/README.md index 2c4a08d1b0..2b96f1b15b 100644 --- a/examples/suit_update/README.md +++ b/examples/suit_update/README.md @@ -69,7 +69,7 @@ Table of contents: ### Ble [prerequisites-ble]: #Ble -Make sure you fullfil the "Prerequisites" and "Preparing Linux" section in [README.ipv6-over-ble.md](../../pkg/nimble/README.ipv6-over-ble.md). +Make sure you fulfill the "Prerequisites" and "Preparing Linux" section in [README.ipv6-over-ble.md](../../pkg/nimble/README.ipv6-over-ble.md). ## Setup [setup]: #Setup