Merge pull request #126463 from fabaff/bump-prom_client

python3Packages.prometheus-client: enable tests
2021-08-26 03:23:59 +02:00
parent b0e0357e65 6b77988f96
commit 743eca9b2f
25 changed files with 67 additions and 55 deletions
@@ -16,7 +16,7 @@
 , cryptography
 , beautifulsoup4
 , sqlalchemy-utils
-, prometheus_client
+, prometheus-client
 , celery
 , alembic
 , importlib-metadata
@@ -70,7 +70,7 @@ buildPythonPackage rec {
    cryptography
    beautifulsoup4
    sqlalchemy-utils
-    prometheus_client
+    prometheus-client

    # Unofficial runtime dependencies?
    celery
@@ -14,7 +14,7 @@
 , dnspython
 , sshpubkeys
 , weasyprint
-, prometheus_client
+, prometheus-client
 , python
 }:
 let
@@ -52,7 +52,7 @@ buildPythonPackage rec {
    pystache
    sshpubkeys
    weasyprint
-    prometheus_client
+    prometheus-client
    dnspython
  ];

@@ -6,7 +6,7 @@
 , mock
 , pytz
 , tornado
-, prometheus_client
+, prometheus-client
 , pytestCheckHook
 }:

@@ -30,7 +30,7 @@ buildPythonPackage rec {
    pytz
    tornado
    humanize
-    prometheus_client
+    prometheus-client
  ];

  checkInputs = [
@@ -5,7 +5,7 @@
 , mock
 , numpy
 , poetry-core
-, prometheus_client
+, prometheus-client
 , pytestCheckHook
 , requests
 }:
@@ -26,14 +26,15 @@ buildPythonPackage rec {
    substituteInPlace pyproject.toml \
      --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
      --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
-      --replace 'wheel = "^0.35.1"' 'wheel = "*"'
+      --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
+      --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
  '';

  nativeBuildInputs = [ poetry-core ];

  propagatedBuildInputs = [
    hyperopt
-    prometheus_client
+    prometheus-client
    numpy
  ];

@@ -17,7 +17,7 @@
 , nbconvert
 , send2trash
 , terminado
-, prometheus_client
+, prometheus-client
 , anyio
 , websocket-client
 , requests
@@ -46,7 +46,7 @@ buildPythonPackage rec {
    nbconvert
    send2trash
    terminado
-    prometheus_client
+    prometheus-client
    anyio
    websocket-client
  ];
@@ -13,7 +13,7 @@
 , jupyter-telemetry
 , oauthlib
 , pamela
-, prometheus_client
+, prometheus-client
 , requests
 , sqlalchemy
 , tornado
@@ -121,7 +121,7 @@ buildPythonPackage rec {
    jupyter-telemetry
    oauthlib
    pamela
-    prometheus_client
+    prometheus-client
    requests
    sqlalchemy
    tornado
@@ -4,7 +4,7 @@
 , flask
 , karton-core
 , mistune
-, prometheus_client
+, prometheus-client
 }:

 buildPythonPackage rec {
@@ -22,13 +22,13 @@ buildPythonPackage rec {
    flask
    karton-core
    mistune
-    prometheus_client
+    prometheus-client
  ];

  postPatch = ''
    substituteInPlace requirements.txt \
      --replace "Flask==1.1.1" "Flask" \
-      --replace "prometheus_client==0.9.0" "prometheus-client"
+      --replace "prometheus-client==0.9.0" "prometheus-client"
  '';

  # Project has no tests. pythonImportsCheck requires MinIO configuration
@@ -20,7 +20,7 @@
 , requests
 , send2trash
 , pexpect
-, prometheus_client
+, prometheus-client
 }:

 buildPythonPackage rec {
@@ -40,7 +40,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
-    prometheus_client
+    prometheus-client
  ];

  # disable warning_filters
@@ -21,7 +21,7 @@
 , requests
 , send2trash
 , pexpect
-, prometheus_client
+, prometheus-client
 , pytestCheckHook
 }:

@@ -43,7 +43,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
-    prometheus_client argon2_cffi
+    prometheus-client argon2_cffi
  ];

  # disable warning_filters
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "prometheus-client";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "client_python";
+    rev = "v${version}";
+    sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "prometheus_client" ];
+
+  meta = with lib; {
+    description = "Prometheus instrumentation library for Python applications";
+    homepage = "https://github.com/prometheus/client_python";
+    license = licenses.asl20;
+  };
+}
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , flask
-, prometheus_client
+, prometheus-client
 , pytestCheckHook
 }:

@@ -17,7 +17,7 @@ buildPythonPackage rec {
    sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370";
  };

-  propagatedBuildInputs = [ flask prometheus_client ];
+  propagatedBuildInputs = [ flask prometheus-client ];

  checkInputs = [ pytestCheckHook ];
  pytestFlagsArray = [ "tests/" ];
@@ -1,19 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "prometheus_client";
-  version = "0.11.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86";
-  };
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Prometheus instrumentation library for Python applications";
-    homepage = "https://github.com/prometheus/client_python";
-    license = licenses.asl20;
-  };
-}
@@ -5,7 +5,7 @@
 , flask
 , isPy27
 , nixosTests
-, prometheus_client
+, prometheus-client
 , py-air-control
 , pytestCheckHook
 , setuptools-scm
@@ -28,7 +28,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    click
    flask
-    prometheus_client
+    prometheus-client
    py-air-control
  ];

@@ -658,7 +658,7 @@
    "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];
    "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
    "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
-    "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
+    "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ];
    "prosegur" = ps: with ps; [ pyprosegur ];
    "prowl" = ps: with ps; [ ];
    "proximity" = ps: with ps; [ ];
@@ -40,7 +40,7 @@ buildPythonApplication rec {
    netaddr
    phonenumbers
    pillow
-    prometheus_client
+    prometheus-client
    psutil
    psycopg2
    pyasn1
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec {
    mautrix
    phonenumbers
    pillow
-    prometheus_client
+    prometheus-client
    pycryptodome
    python-olm
    python_magic
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
    })
  ];

-  propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ];
+  propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ];

  installPhase = ''
    mkdir -p $out/bin
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {

  propagatedBuildInputs = with python3Packages; [
    click
-    prometheus_client
+    prometheus-client
  ];

  checkPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

    install -Dm0755 knot_exporter $out/bin/knot_exporter
    patchShebangs $out/bin
-    buildPythonPath ${python3.pkgs.prometheus_client}
+    buildPythonPath ${python3.pkgs.prometheus-client}
    patchPythonScript $out/bin/knot_exporter

    runHook postInstall
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
    sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0";
  };

-  propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ];
+  propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ];

  installPhase = ''
    mkdir -p $out/share/
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
  ] ++ (with python3Packages; [
    aiohttp
    slixmpp
-    prometheus_client
+    prometheus-client
    pyyaml
  ]);

@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
    icalendar
    jinja2
    multidict
-    prometheus_client
+    prometheus-client
  ];

  passthru.tests.xandikos = nixosTests.xandikos;
@@ -65,7 +65,7 @@ let
    pname = "checks-base";
    sourceRoot = "datadog_checks_base";
    propagatedBuildInputs = with python.pkgs; [
-      requests protobuf prometheus_client uuid simplejson uptime
+      requests protobuf prometheus-client uuid simplejson uptime
    ];
  };

@@ -53,7 +53,9 @@ mapAliases ({
  HAP-python = hap-python; # added 2021-06-01
  lammps-cython = throw "no longer builds and is unmaintained";
  MechanicalSoup = mechanicalsoup; # added 2021-06-01
+  pam = python-pam; # added 2020-09-07.
  privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20
+  prometheus_client = prometheus-client; # added 2021-06-10
  prompt_toolkit = prompt-toolkit;
  pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
  pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
@@ -63,7 +65,6 @@ mapAliases ({
  pytestquickcheck = pytest-quickcheck; # added 2021-07-20
  pytestrunner = pytest-runner; # added 2021-01-04
  python-lz4 = lz4; # added 2018-06-01
-  pam = python-pam; # added 2020-09-07.
  pytest_xdist = pytest-xdist; # added 2021-01-04
  python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
  qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
@@ -5671,7 +5671,7 @@ in {

  progress = callPackage ../development/python-modules/progress { };

-  prometheus_client = callPackage ../development/python-modules/prometheus_client { };
+  prometheus-client = callPackage ../development/python-modules/prometheus-client { };

  prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { };