From 89502b6b0e3683c9c957174eafce827161e60e97 Mon Sep 17 00:00:00 2001 From: andreasgriffin <116060138+andreasgriffin@users.noreply.github.com> Date: Thu, 16 May 2024 22:15:52 +0200 Subject: [PATCH] Prepare Release (#2) * downgrade nostr-sdk to be able to build * regex bugfix --- .pre-commit-config.yaml | 2 +- bitcoin_safe/signature_manager.py | 4 +-- poetry.lock | 44 +++++++++++++++---------------- pyproject.toml | 4 +-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9dc6851..f2825ff 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: hooks: - id: check-header name: Check Python File Headers - entry: poetry run python tools/check_header.py + entry: python tools/check_header.py language: system types: [python] files: '\.py$' diff --git a/bitcoin_safe/signature_manager.py b/bitcoin_safe/signature_manager.py index 70b929f..42e38d4 100644 --- a/bitcoin_safe/signature_manager.py +++ b/bitcoin_safe/signature_manager.py @@ -56,12 +56,12 @@ def extract_prefix_and_version(filename: str) -> tuple[Optional[str], Optional[s import re # try with - separator - match = re.search(r"(.*?)-([\d\.]+[a-zA-Z0-9]*)-", filename) + match = re.search(r"(.*?)-([\d\.]+[a-zA-Z0-9]*)", filename) if match: return (match.group(1), match.group(2)) # try with _ separator - match = re.search(r"(.*?)_([\d\.]+[a-zA-Z0-9]*)_", filename) + match = re.search(r"(.*?)_([\d\.]+[a-zA-Z0-9]*)", filename) if match: return (match.group(1), match.group(2)) return (None, None) diff --git a/poetry.lock b/poetry.lock index c8e571a..6e297ff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1333,31 +1333,31 @@ cryptography = ">=2.8" [[package]] name = "nostr-sdk" -version = "0.11.0" +version = "0.10.0" description = "High level client library." optional = false python-versions = "*" files = [ - {file = "nostr_sdk-0.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c2b1ab9cefd968e81815199ae0119749568b968726f81a237086f8eb82571ae0"}, - {file = "nostr_sdk-0.11.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:f1ca6774682ece51eb73a0352afcdb79ec702d4f347fe4ce8e96074cbff724c9"}, - {file = "nostr_sdk-0.11.0-cp310-cp310-manylinux_2_31_aarch64.whl", hash = "sha256:28a28de9145e04d8bb3e7b222017b95a407da26926fc90af8beb517e70832b51"}, - {file = "nostr_sdk-0.11.0-cp310-cp310-manylinux_2_31_x86_64.whl", hash = "sha256:1f4cad26ea3449cea72d97fb56af4a82491959e3adbfb2ea76b8ada7c79a6ed8"}, - {file = "nostr_sdk-0.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:994c509534ace04cb6262f1830b088cb405fc46ae34a4dd08ed911866cb4c5ab"}, - {file = "nostr_sdk-0.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0e8c9aca8c4c85d2f7810f6fabe6c7b6c58baf659ebd79eefd4f6d9e65a5de2e"}, - {file = "nostr_sdk-0.11.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:3843d3ba049094ea89d8909bf38d3b5e47b260037ad4477cb57e9e0390238fa4"}, - {file = "nostr_sdk-0.11.0-cp311-cp311-manylinux_2_31_aarch64.whl", hash = "sha256:526ceab4a126d8ae3d71e078451e87f0b2a9af8425c0295de010defdcafeebd2"}, - {file = "nostr_sdk-0.11.0-cp311-cp311-manylinux_2_31_x86_64.whl", hash = "sha256:853d5ba5cfdfbb8938dc293e121fb5afdf18da6ac34c6f0a45d6738226daabbf"}, - {file = "nostr_sdk-0.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:c37ca037f995a0bd7d183df44b3a650eefacbaef06720606f0ccbd9f47d64e87"}, - {file = "nostr_sdk-0.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:92dce8428dd623383386ead8183394f28f4ad694b2127aa93338379bab229fd4"}, - {file = "nostr_sdk-0.11.0-cp312-cp312-macosx_11_0_x86_64.whl", hash = "sha256:c8a9af2ac95710a575b65f352c6375e80f09c097a0f3c44998a898e5bd685fa3"}, - {file = "nostr_sdk-0.11.0-cp312-cp312-manylinux_2_31_aarch64.whl", hash = "sha256:eb251751875a379deda5f5b00001dd69ea1f655c0d13f58bc39f463b224e9d27"}, - {file = "nostr_sdk-0.11.0-cp312-cp312-manylinux_2_31_x86_64.whl", hash = "sha256:ef9de5c28a74215cb381c6004b3cf8b87527212b5f768d3cd432c895e7a2afd1"}, - {file = "nostr_sdk-0.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:efba2ab075e60bf4ef1d93953da89edd2b3c79b7a92b490d7774695706ef14c8"}, - {file = "nostr_sdk-0.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:59f63726909260a189012320c0665193e5135d3515160b30e40c6dc180929687"}, - {file = "nostr_sdk-0.11.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:003086d44f331406bba53a80efd0417fe98ef29798dd750cb7562350a9aa205c"}, - {file = "nostr_sdk-0.11.0-cp39-cp39-manylinux_2_31_aarch64.whl", hash = "sha256:dfabca1ffb677434e323e760af37b09db0badfe8915daf83c972cbec68080850"}, - {file = "nostr_sdk-0.11.0-cp39-cp39-manylinux_2_31_x86_64.whl", hash = "sha256:758348a132baa232f08b29842c07b4a24333ca5c8ece2a6e880910f684e39d8d"}, - {file = "nostr_sdk-0.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8074a2e39a5a3b5a707acb2339dd119836ea54bfc63c8b377c30a5c6c3b0771"}, + {file = "nostr_sdk-0.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:64184379a8cbab44be36aa1f64eccbf18c1ec585d5558fbecd7dcc8ba973095a"}, + {file = "nostr_sdk-0.10.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:c6e4fddd8537de17c18c0bc6677817affaa7b91ce2c7648d5d24acbb1f7851be"}, + {file = "nostr_sdk-0.10.0-cp310-cp310-manylinux_2_17_x86_64.whl", hash = "sha256:817b2d19ef5e9b4acc29e97b808dd6b8cdd946f89fdaed48200d3346775317ac"}, + {file = "nostr_sdk-0.10.0-cp310-cp310-manylinux_2_31_aarch64.whl", hash = "sha256:af92766a9a1e212a9ab665020827fb4cdba3710a3932e637dbf9469c511e89fa"}, + {file = "nostr_sdk-0.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:3e63c6e322c2b7251b97de6fd9daf31a254712be23fd5e22d4a49a846c2170a6"}, + {file = "nostr_sdk-0.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9a8e34dd443f1c58428d1f00ecbb3ef0000522ba9349b0750d10bb88e6631a80"}, + {file = "nostr_sdk-0.10.0-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:1d97764b7d312b199c3c16fd3c099db658c73bb5398c26244912ffd18ea739d8"}, + {file = "nostr_sdk-0.10.0-cp311-cp311-manylinux_2_17_x86_64.whl", hash = "sha256:04cd5f6ec450e65e777b55924969aca34af8c8b64681d394c606166a789fec76"}, + {file = "nostr_sdk-0.10.0-cp311-cp311-manylinux_2_31_aarch64.whl", hash = "sha256:6a0c4280bbbeaafbb4c443f1fbd99cd9713c080f04cecf99b9da92b37201ccff"}, + {file = "nostr_sdk-0.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:ee4c52152ae5bb2903e859db3ea43312f97f5efc9a4f7cc02ddb2b4423f7ea8a"}, + {file = "nostr_sdk-0.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:437e3e44b5807249d9edc53544e66d737b87de86b0f82f8300467c07080389ab"}, + {file = "nostr_sdk-0.10.0-cp312-cp312-macosx_11_0_x86_64.whl", hash = "sha256:e97617579edbd8696f7e507465fb1608b8cb77d6965c931220ed6a09a58e87ff"}, + {file = "nostr_sdk-0.10.0-cp312-cp312-manylinux_2_17_x86_64.whl", hash = "sha256:a91af900ced001e9ce072e267b674e11cba518e31561dc32b78a1f9f667b4f0b"}, + {file = "nostr_sdk-0.10.0-cp312-cp312-manylinux_2_31_aarch64.whl", hash = "sha256:e777fa99005e014025aab18ee501eb440e4c132f9978281c3d0d3ac17edcc579"}, + {file = "nostr_sdk-0.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:6adfcbfd6e4722b8c322d58425300532be5ef101562a55319619673daad3e095"}, + {file = "nostr_sdk-0.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6451b5fb7b8b7862f48d131e943f0b0e88de6dc30a8d10e6b313c22127632ddb"}, + {file = "nostr_sdk-0.10.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:ee16f650bc16214c576e5d9d5cf31bacdaa1310f36081e9c213080dcdf20cf95"}, + {file = "nostr_sdk-0.10.0-cp39-cp39-manylinux_2_17_x86_64.whl", hash = "sha256:9395b50bc4f4a90bf6521ed6328db25905b8006df5b648d2b1677a75d283206c"}, + {file = "nostr_sdk-0.10.0-cp39-cp39-manylinux_2_31_aarch64.whl", hash = "sha256:702892320f607e63762502c926685c10ea169657f17c5cb9588ec5d1cd064b8c"}, + {file = "nostr_sdk-0.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:8c8e035e3fdb1652cf96dd0b252f6fb12e82cec102bc19a09b2ec658187a5337"}, ] [[package]] @@ -2369,4 +2369,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "c36d795e0843a24ae2da6d875fb1f42d6ded4aebf55d9ccd3c7538592222d7b3" +content-hash = "1b41af0ef522e14da5a3af72185b364023aa79c01414cb46d13df5b278322f12" diff --git a/pyproject.toml b/pyproject.toml index 637eb35..39e549b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ cryptography = "40.0.2" hwi = ">=2.3.1" appdirs = "1.4.4" reportlab = "4.0.8" -nostr-sdk = "0.11.0" +nostr-sdk = "0.10.0" cbor2 = "^5.6.0" bitcoin-qrreader = ">=0.8.8" bitcoin-usb = ">=0.1.14" @@ -60,7 +60,7 @@ long_description = "More details about the app should go here.\n" sources = [ "bitcoin_safe",] test_sources = [ "tests",] test_requires = [ "pytest",] -requires = [ "appdirs==1.4.4", "arrow==1.3.0", "asn1crypto==1.5.1", "atomicwrites==1.4.1", "attrs==23.2.0", "base58==2.1.1", "bdkpython==0.31.0", "binaryornot==0.4.4", "bitcoin-qrreader==0.8.7", "bitcoin-usb==0.1.13", "briefcase==0.3.17", "build==1.2.1", "cbor==1.0.0", "cbor2==5.6.3", "certifi==2024.2.2", "cffi==1.16.0", "cfgv==3.4.0", "chardet==5.2.0", "charset-normalizer==3.3.2", "click==8.1.7", "colorama==0.4.6", "cookiecutter==2.6.0", "cryptography==40.0.2", "defusedxml==0.7.1", "distlib==0.3.8", "dmgbuild==1.6.1", "ds-store==1.3.1", "ecdsa==0.19.0", "electrumsv-secp256k1==18.0.0", "filelock==3.14.0", "fonttools==4.51.0", "fpdf2==2.7.4", "gitdb==4.0.11", "gitpython==3.1.43", "hidapi==0.14.0", "hwi==2.3.1", "identify==2.5.36", "idna==3.7", "importlib-metadata==7.1.0", "iniconfig==2.0.0", "jinja2==3.1.4", "libusb1==3.1.0", "lxml==5.2.2", "mac-alias==2.2.2", "markdown-it-py==3.0.0", "markupsafe==2.1.5", "mdurl==0.1.2", "mnemonic==0.21", "mss==9.0.1", "nodeenv==1.8.0", "noiseprotocol==0.3.1", "nostr-sdk==0.8.0", "numpy==1.26.4", "opencv-python==4.9.0.80", "packaging==24.0", "pillow==9.5.0", "pip==24.0", "platformdirs==4.2.2", "pluggy==1.5.0", "pre-commit==3.7.1", "protobuf==4.25.3", "psutil==5.9.8", "py==1.11.0", "pyaes==1.6.1", "pycparser==2.22", "pygame==2.5.0", "pygments==2.18.0", "pyprof2calltree==1.4.5", "pyproject-hooks==1.1.0", "pyqt6==6.7.0", "pyqt6-charts==6.7.0", "pyqt6-charts-qt6==6.7.0", "pyqt6-qt6==6.7.0", "pyqt6-sip==13.6.0", "pyserial==3.5", "pytest==6.2.5", "pytest-qt==4.4.0", "python-bitcointx==1.1.4", "python-dateutil==2.9.0.post0", "python-gnupg==0.5.2", "python-slugify==8.0.4", "pyyaml==6.0", "pyzbar==0.1.9", "reportlab==4.0.8", "requests==2.31.0", "rich==13.7.1", "segno==1.5.3", "semver==3.0.2", "setuptools==69.5.1", "sip==6.8.3", "six==1.16.0", "smmap==5.0.1", "snakeviz==2.2.0", "text-unidecode==1.3", "toml==0.10.2", "tomli==2.0.1", "tomli-w==1.0.0", "tornado==6.4", "translate-toolkit==3.13.0", "types-python-dateutil==2.9.0.20240316", "typing-extensions==4.11.0", "urllib3==2.2.1", "virtualenv==20.26.2", "wheel==0.43.0", "zipp==3.18.2",] +requires = [ "appdirs==1.4.4", "arrow==1.3.0", "asn1crypto==1.5.1", "atomicwrites==1.4.1", "attrs==23.2.0", "base58==2.1.1", "bdkpython==0.31.0", "binaryornot==0.4.4", "bitcoin-qrreader==0.8.8", "bitcoin-usb==0.1.14", "briefcase==0.3.17", "build==1.2.1", "cbor==1.0.0", "cbor2==5.6.3", "certifi==2024.2.2", "cffi==1.16.0", "cfgv==3.4.0", "chardet==5.2.0", "charset-normalizer==3.3.2", "click==8.1.7", "colorama==0.4.6", "cookiecutter==2.6.0", "cryptography==40.0.2", "defusedxml==0.7.1", "distlib==0.3.8", "dmgbuild==1.6.1", "ds-store==1.3.1", "ecdsa==0.19.0", "electrumsv-secp256k1==18.0.0", "filelock==3.14.0", "fonttools==4.51.0", "fpdf2==2.7.4", "gitdb==4.0.11", "gitpython==3.1.43", "hidapi==0.14.0", "hwi==2.3.1", "identify==2.5.36", "idna==3.7", "importlib-metadata==7.1.0", "iniconfig==2.0.0", "jinja2==3.1.4", "libusb1==3.1.0", "lxml==5.2.2", "mac-alias==2.2.2", "markdown-it-py==3.0.0", "markupsafe==2.1.5", "mdurl==0.1.2", "mnemonic==0.21", "mss==9.0.1", "nodeenv==1.8.0", "noiseprotocol==0.3.1", "nostr-sdk==0.10.0", "numpy==1.26.4", "opencv-python-headless==4.9.0.80", "packaging==24.0", "pillow==9.5.0", "pip==24.0", "platformdirs==4.2.2", "pluggy==1.5.0", "pre-commit==3.7.1", "protobuf==4.25.3", "psutil==5.9.8", "py==1.11.0", "pyaes==1.6.1", "pycparser==2.22", "pygame==2.5.2", "pygments==2.18.0", "pyprof2calltree==1.4.5", "pyproject-hooks==1.1.0", "pyqt6==6.7.0", "pyqt6-charts==6.7.0", "pyqt6-charts-qt6==6.7.0", "pyqt6-qt6==6.7.0", "pyqt6-sip==13.6.0", "pyserial==3.5", "pytest==6.2.5", "pytest-qt==4.4.0", "pytest-xvfb==3.0.0", "python-bitcointx==1.1.4", "python-dateutil==2.9.0.post0", "python-gnupg==0.5.2", "python-slugify==8.0.4", "pyvirtualdisplay==3.0", "pyyaml==6.0", "pyzbar==0.1.9", "reportlab==4.0.8", "requests==2.31.0", "rich==13.7.1", "segno==1.5.3", "semver==3.0.2", "setuptools==69.5.1", "six==1.16.0", "smmap==5.0.1", "snakeviz==2.2.0", "text-unidecode==1.3", "toml==0.10.2", "tomli==2.0.1", "tomli-w==1.0.0", "tornado==6.4", "translate-toolkit==3.13.0", "types-python-dateutil==2.9.0.20240316", "typing-extensions==4.11.0", "urllib3==2.2.1", "virtualenv==20.26.2", "wheel==0.43.0", "zipp==3.18.2",] icon = "tools/resources/icon" resources = [ "bitcoin_safe/gui/locales/*.qm",]