From c3ded859df9913e8721126fd105b6ab08f5542b9 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sun, 4 Oct 2020 12:10:56 -0300 Subject: [PATCH] fix requirements after rebase. --- Pipfile.lock | 29 ++++++++++++++++++++++++++++- lnbits/app.py | 2 +- lnbits/extensions/lnurlp/lnurl.py | 3 +-- lnbits/wallets/lndrest.py | 1 - requirements.txt | 8 +++++++- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index c71f0e7c..fff2e83f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -44,6 +44,7 @@ "sha256:7d6db8214603bd7871fcfa6c0826ef68b85b0abd90fa21c285a9c5e21d2bd899", "sha256:990dc8e5a5e4feabbdf55207b5315fdd9b73db40be294a19b3752cde9e79d981" ], + "markers": "python_version >= '3.5'", "version": "==1.2.0" }, "bitstring": { @@ -117,6 +118,7 @@ "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, "ecdsa": { @@ -147,6 +149,7 @@ "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25", "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d" ], + "markers": "python_full_version >= '3.6.1'", "version": "==4.0.0" }, "hpack": { @@ -154,6 +157,7 @@ "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c", "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095" ], + "markers": "python_full_version >= '3.6.1'", "version": "==4.0.0" }, "httpcore": { @@ -161,6 +165,7 @@ "sha256:72cfaa461dbdc262943ff4c9abf5b195391a03cdcc152e636adb4239b15e77e1", "sha256:a35dddd1f4cc34ff37788337ef507c0ad0276241ece6daf663ac9e77c0b87232" ], + "markers": "python_version >= '3.6'", "version": "==0.11.1" }, "httpx": { @@ -179,6 +184,7 @@ "sha256:6540faeba9dd44f7e74c7cc1beae3a438a7efb5f77323d1199457da46d32c2c2", "sha256:b5c479023757e279f954b46a4ec9dd85e58a2bcbf4d959d5601cbced593e711d" ], + "markers": "python_version >= '3.7'", "version": "==0.11.0" }, "hyperframe": { @@ -186,6 +192,7 @@ "sha256:742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1", "sha256:a51026b1591cac726fc3d0b7994fbc7dc5efab861ef38503face2930fd7b2d34" ], + "markers": "python_full_version >= '3.6.1'", "version": "==6.0.0" }, "idna": { @@ -200,6 +207,7 @@ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.0" }, "jinja2": { @@ -207,6 +215,7 @@ "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.11.2" }, "lnurl": { @@ -252,6 +261,7 @@ "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, "marshmallow": { @@ -259,6 +269,7 @@ "sha256:2272273505f1644580fbc66c6b220cc78f893eb31f1ecde2af98ad28011e9811", "sha256:47911dd7c641a27160f0df5fd0fe94667160ffe97f70a42c3cc18388d86098cc" ], + "markers": "python_version >= '3.5'", "version": "==3.8.0" }, "outcome": { @@ -296,6 +307,7 @@ "sha256:f769141ab0abfadf3305d4fcf36660e5cf568a666dd3efab7c3d4782f70946b1", "sha256:f8af9b840a9074e08c0e6dc93101de84ba95df89b267bf7151d74c553d66833b" ], + "markers": "python_version >= '3.6'", "version": "==1.6.1" }, "pyscss": { @@ -353,6 +365,9 @@ "version": "==2.24.0" }, "rfc3986": { + "extras": [ + "idna2008" + ], "hashes": [ "sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d", "sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50" @@ -380,6 +395,7 @@ "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.15.0" }, "sniffio": { @@ -387,6 +403,7 @@ "sha256:20ed6d5b46f8ae136d00b9dcb807615d83ed82ceea6b2058cecb696765246da5", "sha256:8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21" ], + "markers": "python_version >= '3.5'", "version": "==1.1.0" }, "sortedcontainers": { @@ -425,6 +442,7 @@ "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a", "sha256:e7983572181f5e1522d9c98453462384ee92a0be7fac5f1413a1e35c56cc0461" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.25.10" }, "werkzeug": { @@ -432,6 +450,7 @@ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", "sha256:6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.0.1" }, "wsproto": { @@ -439,6 +458,7 @@ "sha256:614798c30e5dc2b3f65acc03d2d50842b97621487350ce79a80a711229edfa9d", "sha256:e3d190a11d9307112ba23bbe60055604949b172143969c8f641318476a9b6f1d" ], + "markers": "python_full_version >= '3.6.1'", "version": "==0.15.0" } }, @@ -463,6 +483,7 @@ "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594", "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.2.0" }, "black": { @@ -477,6 +498,7 @@ "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, "coverage": { @@ -516,6 +538,7 @@ "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636", "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==5.3" }, "idna": { @@ -523,7 +546,6 @@ "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.10" }, "iniconfig": { @@ -573,6 +595,7 @@ "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8", "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.4" }, "pathspec": { @@ -587,6 +610,7 @@ "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.13.1" }, "py": { @@ -594,6 +618,7 @@ "sha256:366389d1db726cd2fcfc79732e75410e5fe4d31db13692115529d34069a043c2", "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.9.0" }, "pyparsing": { @@ -601,6 +626,7 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pytest": { @@ -658,6 +684,7 @@ "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.15.0" }, "sniffio": { diff --git a/lnbits/app.py b/lnbits/app.py index 5f61f057..64e286c5 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -1,4 +1,4 @@ -import trio # type: ignore +import trio # type: ignore import importlib from quart import g diff --git a/lnbits/extensions/lnurlp/lnurl.py b/lnbits/extensions/lnurlp/lnurl.py index 747e5bac..5275927f 100644 --- a/lnbits/extensions/lnurlp/lnurl.py +++ b/lnbits/extensions/lnurlp/lnurl.py @@ -2,11 +2,10 @@ import hashlib from http import HTTPStatus from quart import jsonify, url_for from lnurl import LnurlPayResponse, LnurlPayActionResponse -from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl from lnbits.core.services import create_invoice -from lnbits.extensions.lnurlp import lnurlp_ext +from . import lnurlp_ext from .crud import increment_pay_link, save_link_invoice diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py index 64001f33..a2bea09c 100644 --- a/lnbits/wallets/lndrest.py +++ b/lnbits/wallets/lndrest.py @@ -4,7 +4,6 @@ import base64 from os import getenv from typing import Optional, Dict, AsyncGenerator -from lnbits import bolt11 from .base import InvoiceResponse, PaymentResponse, PaymentStatus, Wallet diff --git a/requirements.txt b/requirements.txt index b62cf657..30136a08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,6 @@ aiofiles==0.5.0 +async-generator==1.10 +attrs==20.2.0 bech32==1.2.0 bitstring==3.1.7 blinker==1.4 @@ -13,7 +15,7 @@ h11==0.9.0 h2==4.0.0 hpack==4.0.0 httpcore==0.11.1 -httpx==0.15.4 +httpx==0.15.5 hypercorn==0.11.0 hyperframe==6.0.0 idna==2.10 @@ -22,6 +24,7 @@ jinja2==2.11.2 lnurl==0.3.5 markupsafe==1.1.1 marshmallow==3.8.0 +outcome==1.0.1 priority==1.3.0 pydantic==1.6.1 pyscss==1.3.7 @@ -29,13 +32,16 @@ python-dotenv==0.14.0 quart==0.13.1 quart-compress==0.2.1 quart-cors==0.3.0 +quart-trio==0.5.1 requests==2.24.0 rfc3986==1.4.0 secure==0.2.1 shortuuid==1.0.1 six==1.15.0 sniffio==1.1.0 +sortedcontainers==2.2.2 toml==0.10.1 +trio==0.17.0 typing-extensions==3.7.4.3 urllib3==1.25.10 werkzeug==1.0.1