Unverified Commit ab31931b authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #287414 from fabaff/faraday-agent-parameters-types-bump

python311Packages.faraday-agent-parameters-types: 1.3.1 -> 1.4.0, python311Packages.faraday-plugins: 1.15.1 -> 1.16.0 
parents 9f4fcd7d 5c966ddc
Loading
Loading
Loading
Loading
+13 −8
Original line number Diff line number Diff line
@@ -5,21 +5,31 @@
, packaging
, pytestCheckHook
, pythonOlder
, setuptools
}:

buildPythonPackage rec {
  pname = "faraday-agent-parameters-types";
  version = "1.3.1";
  format = "setuptools";
  version = "1.4.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    pname = "faraday_agent_parameters_types";
    inherit version;
    hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs=";
    hash = "sha256-pene97VKOX8mZEQgHkOBDu72Dpww2D9nDjA94s5F9rM=";
  };

  postPatch = ''
    substituteInPlace setup.py \
      --replace-warn '"pytest-runner",' ""
  '';

  nativeBuildInputs = [
    setuptools
  ];

  propagatedBuildInputs = [
    marshmallow
    packaging
@@ -29,11 +39,6 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

  postPatch = ''
    substituteInPlace setup.py \
      --replace '"pytest-runner",' ""
  '';

  pythonImportsCheck = [
    "faraday_agent_parameters_types"
    "faraday_agent_parameters_types.utils"
+9 −4
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@
, pythonOlder
, pytz
, requests
, setuptools
, simplejson
, tabulate
}:

buildPythonPackage rec {
  pname = "faraday-plugins";
  version = "1.15.1";
  format = "setuptools";
  version = "1.16.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

@@ -27,14 +28,18 @@ buildPythonPackage rec {
    owner = "infobyte";
    repo = "faraday_plugins";
    rev = "refs/tags/${version}";
    hash = "sha256-cJ7gFE8zTN+7fp4EY8ZRwjS8i0r+8WaIH/EdY89nZew=";
    hash = "sha256-1haWRuWK9WCgdR4geT2w3E95+CapBYDohGowUmnJ2H4=";
  };

  postPatch = ''
    substituteInPlace setup.py \
      --replace "version=version," "version='${version}',"
      --replace-warn "version=version," "version='${version}',"
  '';

  nativeBuildInputs = [
    setuptools
  ];

  propagatedBuildInputs = [
    beautifulsoup4
    click