Unverified Commit 0776b54a authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #206523 from Ma27/bump-dmarc-metrics-exporter 

dmarc-metrics-exporter: 0.6.1 -> 0.8.0
parents 82670467 354e0795

pkgs/development/embedded/platformio/core.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ with python3.pkgs; buildPythonApplication rec { 
      --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}'



    substituteInPlace setup.py \

      --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16,<=0.19"' \

      --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \

      --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \

      --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \

      --replace 'wsproto==' 'wsproto>='

pkgs/development/python-modules/uvicorn/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -11,19 +11,22 @@ 
, uvloop

, watchfiles

, websockets

, hatchling

, pythonOlder

}:



buildPythonPackage rec {

  pname = "uvicorn";

  version = "0.18.2";

  disabled = pythonOlder "3.6";

  version = "0.20.0";

  disabled = pythonOlder "3.7";



  format = "pyproject";



  src = fetchFromGitHub {

    owner = "encode";

    repo = pname;

    rev = version;

    hash = "sha256-nxtDqYh2OmDtoV10CEBGYQrQBf+Xtuf5k9yR6UfCgYc=";

    hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng=";

  };



  outputs = [
@@ -31,6 +34,8 @@ buildPythonPackage rec { 
    "testsout"

  ];



  nativeBuildInputs = [ hatchling ];



  propagatedBuildInputs = [

    click

    h11

pkgs/development/python-modules/uvicorn/tests.nix

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ buildPythonPackage rec { 
  pname = "uvicorn-tests";

  inherit (uvicorn) version;



  format = "other";



  src = uvicorn.testsout;



  dontBuild = true;
@@ -44,6 +46,8 @@ buildPythonPackage rec { 
  disabledTests = [

    "test_supported_upgrade_request"

    "test_invalid_upgrade"

    "test_no_server_headers"

    "test_multiple_server_header"

  ];

}

pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix

+9 −9
Original line number Diff line number Diff line 
{ lib

, python3

, fetchFromGitHub

}:



python3.pkgs.buildPythonApplication rec {

  pname = "dmarc-metrics-exporter";

  version = "0.6.1";

  version = "0.8.0";



  disabled = python3.pythonOlder "3.7";



  format = "pyproject";



  src = python3.pkgs.fetchPypi {

    inherit pname version;

    hash = "sha256-VYmSHDde3zLq7NcsX7xp1JYe6x6RKFEravpakIzW390=";

  src = fetchFromGitHub {

    owner = "jgosmann";

    repo = "dmarc-metrics-exporter";

    rev = "v${version}";

    hash = "sha256-uZCPEUoWNrcSz5qV24eFdZOOxKkoz+Qn6HpELBwOK2I=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace 'uvicorn = {extras = ["standard"], version = "^0.15.0"}' 'uvicorn = {version = "^0.15.0"}' \

      --replace '"^' '">='

  '';

  pythonRelaxDeps = true;



  nativeBuildInputs = with python3.pkgs; [

    poetry-core

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = with python3.pkgs; [