From ad8f6a26e9e70670712d9ecdfce296e0984254b2 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Thu, 10 Aug 2023 20:30:05 +0200
Subject: [PATCH] Support libnacl v1.9.0 onward
libnacl.version file removed:
https://github.com/saltstack/libnacl/commit/85e7b61b2c2dca957d5701c4cfc2b75fcdb46894
Get version with importlib.metadata.version("libnacl")
https://github.com/python-poetry/poetry/issues/273#issuecomment-570999678
Could have use pkg_resources.get_distribution("libnacl").version
https://github.com/python-poetry/poetry/issues/273#issuecomment-401983643
---
duniterpy/key/ascii_armor.py | 3 ++-
pyproject.toml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/duniterpy/key/ascii_armor.py b/duniterpy/key/ascii_armor.py
index 9ab3efe..84b8c68 100644
--- a/duniterpy/key/ascii_armor.py
+++ b/duniterpy/key/ascii_armor.py
@@ -14,11 +14,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import base64
+import importlib.metadata
import re
from typing import Any, Dict, List, Optional
import libnacl
-from libnacl.version import version as libnacl_version
from .encryption_key import PublicKey
from .signing_key import SigningKey
@@ -33,6 +33,7 @@ HEADER_PREFIX = "-----"
DASH_ESCAPE_PREFIX = "\x2D\x20"
# Version field value
+libnacl_version = importlib.metadata.version("libnacl")
VERSION_FIELD_VALUE = f"Python Libnacl {libnacl_version}"
# Parser cursor status
diff --git a/pyproject.toml b/pyproject.toml
index dde1ba6..c2a9b4d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,7 @@ websocket-client = "^1.5.2"
jsonschema = "^4.17.3"
pypeg2 = "^2.15.2"
base58 = "^2.1.1"
-libnacl = "^1.8.0"
+libnacl = "^2.1.0"
pyaes = "^1.6.1"
mnemonic = "^0.20"
--
GitLab