Unverified Commit 99818b53 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #240007 from hellwolf/update-many-web3-python-packages

parents 03dab3df 3b29138b
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -12,19 +12,19 @@

buildPythonPackage rec {
  pname = "eth-abi";
  version = "3.0.1";
  version = "4.1.0";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "ethereum";
    repo = "eth-abi";
    rev = "v${version}";
    hash = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY=";
    hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA=";
  };

  postPatch = ''
    substituteInPlace setup.py \
      --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious"
      --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious"
  '';

  propagatedBuildInputs = [
+4 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
, eth-keys
, eth-rlp
, eth-utils
, websockets
, hexbytes
, pythonOlder
, rlp
@@ -14,21 +15,16 @@

buildPythonPackage rec {
  pname = "eth-account";
  version = "0.6.1";
  version = "0.9.0";
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "ethereum";
    repo = "eth-account";
    rev = "v${version}";
    hash = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs=";
    hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs=";
  };

  postPatch = ''
    substituteInPlace setup.py \
      --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3"
  '';

  propagatedBuildInputs = [
    bitarray
    eth-abi
@@ -38,6 +34,7 @@ buildPythonPackage rec {
    eth-utils
    hexbytes
    rlp
    websockets
  ];

  # require buildinga npm project
+2 −2
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@

buildPythonPackage rec {
  pname = "eth-hash";
  version = "0.3.2";
  version = "0.5.2";
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "ethereum";
    repo = "eth-hash";
    rev = "v${version}";
    hash = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ=";
    hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU=";
  };

  nativeCheckInputs = [
+8 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@

buildPythonPackage rec {
  pname = "eth-utils";
  version = "2.0.0";
  version = "2.1.1";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "ethereum";
    repo = pname;
    rev = "v${version}";
    hash = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw=";
    hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE=";
  };

  propagatedBuildInputs = [
@@ -29,12 +29,17 @@ buildPythonPackage rec {
  ] ++ lib.optional (!isPyPy) cytoolz
  ++ lib.optional isPyPy toolz;


  nativeCheckInputs = [
    hypothesis
    pytestCheckHook
  ] ++ eth-hash.optional-dependencies.pycryptodome;

  # Removing a poorly written test case from test suite.
  # TODO work with the upstream
  disabledTestPaths = [
    "tests/functional-utils/test_type_inference.py"
  ];

  pythonImportsCheck = [ "eth_utils" ];

  meta = {
+2 −0
Original line number Diff line number Diff line
@@ -40,5 +40,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/rmeissner/py-eth-sig-utils";
    license = licenses.mit;
    maintainers = with maintainers; [ SuperSandro2000 ];
    # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more.
    broken = true;
  };
}
Loading