python3Packages.joinmarket: update to nixos 24.05

This commit is contained in:
Erik Arvstedt 2024-07-15 20:31:30 +02:00
parent 7f8563afec
commit e8e5d8cf4c
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 31 additions and 4 deletions

View File

@ -62,12 +62,22 @@ buildPythonPackage rec {
pyopenssl
];
# TODO-EXTERNAL:
# Remove this when fixed upstream.
#
# Fix the following error during checkPhase:
# File "/nix/store/...-python3.11-pytest-8.1.1/lib/python3.11/site-packages/_pytest/config/argparsing.py", line 133, in _getparser
# arggroup.add_argument(*n, **a)
# File "/nix/store/...-python3-3.11.9/lib/python3.11/argparse.py", line 1460, in add_argument
# raise ValueError('%r is not callable' % (type_func,))
# ValueError: 'int' is not callable
patches = [ ./fix-conftest-arg-type-error.patch ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'txtorcon==23.11.0' 'txtorcon==23.5.0' \
--replace-fail 'twisted==23.10.0' 'twisted==23.8.0' \
--replace-fail 'service-identity==21.1.0' 'service-identity==23.1.0' \
--replace-fail 'cryptography==41.0.6' 'cryptography==41.0.3'
--replace-fail 'twisted==23.10.0' 'twisted==24.3.0' \
--replace-fail 'service-identity==21.1.0' 'service-identity==24.1.0' \
--replace-fail 'cryptography==41.0.6' 'cryptography==42.0.5'
# Modify pyproject.toml to include only specific modules. Do not include 'jmqtui'.
sed -i '/^\[tool.setuptools.packages.find\]/a include = ["jmbase", "jmbitcoin", "jmclient", "jmdaemon"]' pyproject.toml

View File

@ -0,0 +1,17 @@
diff --git a/conftest.py b/conftest.py
index 1cc56d5..54b0a4c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -74,12 +74,6 @@ def pytest_addoption(parser: Any) -> None:
action="store",
default='bitcoinrpc',
help="the RPC username for your test bitcoin instance (default=bitcoinrpc)")
- parser.addoption("--nirc",
- type="int",
- action="store",
- default=1,
- help="the number of local miniircd instances")
-
@pytest.fixture(scope="session", autouse=True)
def setup_early_if_needed(request) -> None: