diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 4d5027687310..13875854934e 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -12,18 +12,19 @@ pytestCheckHook, pytest-xdist, eth-hash, + pydantic, }: buildPythonPackage rec { pname = "eth-abi"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; tag = "v${version}"; - hash = "sha256-D3aGMx2oZFttwQ90ouwQbbRelCb2bvyQgvamKweX9Nw="; + hash = "sha256-/tyGm/lH72oZEKfTd25t+k0y3TuAZQg+hUABT4YCP2g="; }; build-system = [ setuptools ]; @@ -38,12 +39,14 @@ buildPythonPackage rec { hypothesis pytestCheckHook pytest-xdist + pydantic ] ++ eth-hash.optional-dependencies.pycryptodome; disabledTests = [ # boolean list representation changed "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" + "test_install_local_wheel" ]; pythonImportsCheck = [ "eth_abi" ]; diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index be26789c0623..43b996fa24ce 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.13.5"; + version = "0.13.7"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; tag = "v${version}"; - hash = "sha256-CBD0vJLYA+3FreOTsVXJlDJhRvPbDUn4X55o6EF+uBA="; + hash = "sha256-Ipz2zIKCpIzKBtX0UZnvpKZeTUcDPbGTzMgmcJC/4qs="; }; build-system = [ setuptools ]; @@ -48,6 +48,7 @@ buildPythonPackage rec { eth-rlp eth-utils hexbytes + pydantic rlp websockets ]; @@ -74,6 +75,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_account" ]; + pythonRelaxDeps = [ "eth-keyfile" ]; + meta = { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index 0d16bc1ff21a..62be7f6e7307 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -7,13 +7,15 @@ eth-keys, eth-utils, pycryptodome, + py-ecc, # nativeCheckInputs pytestCheckHook, + pydantic, }: buildPythonPackage rec { pname = "eth-keyfile"; - version = "0.8.1"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { @@ -21,7 +23,7 @@ buildPythonPackage rec { repo = "eth-keyfile"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-HufsN3aXdQErcQmnG2PZnEm5joqpy4f8IWNm3VrzJSY="; + hash = "sha256-DR17EupRDnviN6OXF+B+RlCVdG8cfcvnIgIEKxrXFKs="; }; build-system = [ setuptools ]; @@ -30,12 +32,20 @@ buildPythonPackage rec { eth-keys eth-utils pycryptodome + py-ecc ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pydantic + ]; pythonImportsCheck = [ "eth_keyfile" ]; + disabledTests = [ + "test_install_local_wheel" + ]; + meta = { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index e09926107189..7377ae5f925b 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -15,18 +15,19 @@ coincurve, eth-hash, isPyPy, + pydantic, }: buildPythonPackage rec { pname = "eth-keys"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keys"; tag = "v${version}"; - hash = "sha256-HyOfuzwldtqjjowW7HGdZ8RNMXNK3y2NrXUoeMlWJjs="; + hash = "sha256-H/s/D4f4tqP/WTil9uLmFw2Do9sEjMWwEreQEooeszQ="; }; build-system = [ setuptools ]; @@ -42,6 +43,7 @@ buildPythonPackage rec { hypothesis pyasn1 pytestCheckHook + pydantic ] ++ optional-dependencies.coincurve ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 @@ -49,6 +51,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keys" ]; + disabledTests = [ "test_install_local_wheel" ]; + optional-dependencies = { coincurve = [ coincurve ]; }; diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix index 3bc8d7c35b83..2b2d6e3597d6 100644 --- a/pkgs/development/python-modules/eth-rlp/default.nix +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -9,11 +9,12 @@ pytestCheckHook, pythonOlder, rlp, + pydantic, }: buildPythonPackage rec { pname = "eth-rlp"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-rlp"; rev = "v${version}"; - hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ="; + hash = "sha256-e8nPfxk3OnFEcPnfTy1IEUCHVId6E/ssNOUeAe331+U="; }; build-system = [ setuptools ]; @@ -32,10 +33,18 @@ buildPythonPackage rec { rlp ]; - nativeCheckInputs = [ pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; + nativeCheckInputs = [ + pytestCheckHook + pydantic + ] + ++ eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_rlp" ]; + disabledTests = [ + "test_install_local_wheel" + ]; + meta = with lib; { description = "RLP definitions for common Ethereum objects"; homepage = "https://github.com/ethereum/eth-rlp"; diff --git a/pkgs/development/python-modules/eth-tester/default.nix b/pkgs/development/python-modules/eth-tester/default.nix index 7d2210c5450b..f83a8f3e5253 100644 --- a/pkgs/development/python-modules/eth-tester/default.nix +++ b/pkgs/development/python-modules/eth-tester/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "eth-tester"; - version = "0.12.0-beta.2"; + version = "0.13.0-beta.1"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-tester"; tag = "v${version}"; - hash = "sha256-ox7adsqD0MPZFcxBhino8cgwYYEWrBnD+ugPQOuOO2U="; + hash = "sha256-ssPtsEQAyaJde/empEpGU1bf3s4yxwlEXqpacN5GWDw="; }; build-system = [ setuptools ]; @@ -49,6 +49,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_tester" ]; + disabledTests = [ + "test_install_local_wheel" + ]; + meta = { description = "Tool suite for testing ethereum applications"; homepage = "https://github.com/ethereum/eth-tester"; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 19d4101c83c3..0760c299b336 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; tag = "v${version}"; - hash = "sha256-IOWd6WFPAYO+VZwlMilRVHtudEjHt5p8Xu4WloFB/ww="; + hash = "sha256-w/xYqDmtlNs9dk4lTX0zxjdlUc7l7vi8ZnSE62W0m8o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 3e4f1f7aa114..78a10d9a4c3d 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -9,6 +9,7 @@ eth-typing, cytoolz, toolz, + pydantic, # nativeCheckInputs hypothesis, mypy, @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "5.1.0"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-utils"; tag = "v${version}"; - hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4="; + hash = "sha256-VWNQyLfOEQTusdNHO/8/fWyGVFVwr1Cg1IfyNMSsfGQ="; }; build-system = [ setuptools ]; @@ -40,6 +41,7 @@ buildPythonPackage rec { hypothesis mypy pytestCheckHook + pydantic ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix index 0e36d028b6fa..ea1e5692a54d 100644 --- a/pkgs/development/python-modules/hexbytes/default.nix +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -7,11 +7,12 @@ hypothesis, pytestCheckHook, pythonOlder, + pydantic, }: buildPythonPackage rec { pname = "hexbytes"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "hexbytes"; tag = "v${version}"; - hash = "sha256-8st1nQiGApt+aNl8/cftYk0ZzA+MxbLyGi53UWUlAjM="; + hash = "sha256-xYXxlyVGdsksxZJtSpz1V3pj4NL7IzX0gaQeCoiHr8g="; }; build-system = [ setuptools ]; @@ -28,8 +29,11 @@ buildPythonPackage rec { eth-utils hypothesis pytestCheckHook + pydantic ]; + disabledTests = [ "test_install_local_wheel" ]; + pythonImportsCheck = [ "hexbytes" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 6ee5b0534673..d39204e9dd92 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -9,11 +9,12 @@ pythonAtLeast, pythonOlder, setuptools, + pydantic, }: buildPythonPackage rec { pname = "py-ecc"; - version = "7.0.0"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "py_ecc"; rev = "v${version}"; - hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs="; + hash = "sha256-4nmmX4TuErHxIDrBi+Ppr+4vuE7dSeqf8OqOxtqb3sY="; }; nativeBuildInputs = [ setuptools ]; @@ -32,7 +33,10 @@ buildPythonPackage rec { eth-utils ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pydantic + ]; disabledTests = lib.optionals (pythonAtLeast "3.12") [ # https://github.com/ethereum/py_ecc/issues/133 @@ -44,6 +48,7 @@ buildPythonPackage rec { "test_pairing_negative_G1" "test_pairing_negative_G2" "test_pairing_output_order" + "test_install_local_wheel" ]; pythonImportsCheck = [ "py_ecc" ]; diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix index 9ec30e60434e..9b78ea9c6180 100644 --- a/pkgs/development/python-modules/py-evm/default.nix +++ b/pkgs/development/python-modules/py-evm/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "py-evm"; - version = "0.10.1-beta.2"; + version = "0.12.1-beta.1"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "py-evm"; tag = "v${version}"; - hash = "sha256-2BWMen/6ZcL1/SgGP0XcrTC63+LEjZO7Ogb3anhavsE="; + hash = "sha256-n2F0ApdmIED0wrGuNN45lyb7cGu8pRn8mLDehT7Ru9E="; }; build-system = [ setuptools ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { eth-typing eth-utils lru-dict + pydantic py-ecc rlp trie diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 3c258f2b8fea..7f1dd65edf4a 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -6,18 +6,19 @@ eth-utils, hypothesis, pytestCheckHook, + pydantic, }: buildPythonPackage rec { pname = "rlp"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "pyrlp"; rev = "v${version}"; - hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU="; + hash = "sha256-moerdcAJXqhlzDnTlvxL3Nzz485tOzJVCPlGrof80eQ="; }; build-system = [ setuptools ]; @@ -27,10 +28,13 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis pytestCheckHook + pydantic ]; pythonImportsCheck = [ "rlp" ]; + disabledTests = [ "test_install_local_wheel" ]; + meta = with lib; { description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 770e6d837350..2b637314e7ea 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.3"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; tag = version; - hash = "sha256-KWLv0tpd1FHZ9apipVPWw6VjtfYpngsH7XDQQ3luBZA="; + hash = "sha256-HgPQPyxDvKrmqGiHjiVGxEguYUcaNYwK1gZoMMkQWhM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trie/default.nix b/pkgs/development/python-modules/trie/default.nix index 5e1359151709..4a8baa0082d9 100644 --- a/pkgs/development/python-modules/trie/default.nix +++ b/pkgs/development/python-modules/trie/default.nix @@ -13,18 +13,19 @@ hypothesis, pytestCheckHook, pytest-xdist, + pydantic, }: buildPythonPackage rec { pname = "trie"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "py-trie"; tag = "v${version}"; - hash = "sha256-kG/5ijckiEOfB5y1c3Yqudqnb1MDbPD25YZZM+H13Lw="; + hash = "sha256-QDywlAyFbQGgkATVifdixlnob4Tmsvr/VZ1rafzWKrU="; }; build-system = [ setuptools ]; @@ -41,6 +42,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook pytest-xdist + pydantic ] ++ eth-hash.optional-dependencies.pycryptodome; @@ -49,6 +51,7 @@ buildPythonPackage rec { "test_fixtures_exist" "test_bin_trie_update_value" "test_branch_updates" + "test_install_local_wheel" ]; disabledTestPaths = [ "tests/core/test_iter.py" ]; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 1ec9324c3392..630ad19b2953 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "web3"; - version = "7.8.0"; + version = "7.12.1"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; tag = "v${version}"; - hash = "sha256-Rk12QZK47oF0ri1+kCquW4vaqPPPO5UPYOhq4StR1+U="; + hash = "sha256-5fmZJun8yRm+BSKPfe9Fsmp7IWpFhwHD3+iBtkKmr1w="; }; build-system = [ setuptools ];