diff options
author | Robert Schütz <nix@dotlambda.de> | 2022-12-21 00:20:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-21 00:20:58 -0800 |
commit | 0776b54a89aaac95fc9881b37ad061bf07b29c60 (patch) | |
tree | 8568b05cd611b2bc3985c421ec8337229b59ff3f | |
parent | 826704674f48928e9787ba5bea0366c75b974a7c (diff) | |
parent | 354e079535fc4c7a2a7cad2acbbee249cbfc2539 (diff) |
Merge pull request #206523 from Ma27/bump-dmarc-metrics-exporter
dmarc-metrics-exporter: 0.6.1 -> 0.8.0
4 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index afd60ec2aebc..a9b6e156b874 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -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>=' diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 26d23f08afa4..e48536e66359 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -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 diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index b9cd883f43c0..116a9f1d28d0 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -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" ]; } diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 46e81508b4d2..47c43917ec6c 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -1,28 +1,28 @@ { 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; [ |