diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index e16d7d4d2a854..12535c9813b86 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -89,6 +89,9 @@ buildPythonPackage rec { "test_rabbitmq_process_100k_messages_with_cli" "test_rabbitmq_process_10k_fib_with_cli" "test_rabbitmq_process_1k_latency_with_cli" + # AssertionError + "test_cli_scrubs_stale_pid_files" + "test_message_contains_requeue_time_after_retry" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Takes too long for darwin ofborg diff --git a/pkgs/development/python-modules/flask-dramatiq/default.nix b/pkgs/development/python-modules/flask-dramatiq/default.nix index 1be6b757ec38e..7ee16fbd9423e 100644 --- a/pkgs/development/python-modules/flask-dramatiq/default.nix +++ b/pkgs/development/python-modules/flask-dramatiq/default.nix @@ -1,27 +1,25 @@ { lib, buildPythonPackage, - pythonOlder, - fetchFromGitLab, - poetry-core, dramatiq, - flask, - requests, - pytestCheckHook, - pytest-cov-stub, + fetchFromGitLab, flask-migrate, + flask, periodiq, + poetry-core, postgresql, postgresqlTestHook, psycopg2, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + requests, }: buildPythonPackage { pname = "flask-dramatiq"; version = "0.6.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitLab { owner = "bersace"; @@ -38,20 +36,21 @@ buildPythonPackage { patchShebangs --build ./example.py ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ dramatiq ]; + dependencies = [ dramatiq ]; nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub flask - requests flask-migrate periodiq postgresql postgresqlTestHook psycopg2 + pytest-cov-stub + pytest-mock + pytestCheckHook + requests ] ++ dramatiq.optional-dependencies.rabbitmq; @@ -62,23 +61,13 @@ buildPythonPackage { python3 ./example.py db upgrade ''; - pytestFlags = [ - "-x" - ]; - - disabledTestPaths = [ - "tests/func/" - "tests/unit" - ]; - - pythonImportsCheck = [ "flask_dramatiq" ]; - - # Does HTTP requests to localhost disabledTests = [ "test_fast" "test_other" ]; + pythonImportsCheck = [ "flask_dramatiq" ]; + meta = with lib; { description = "Adds Dramatiq support to your Flask application"; homepage = "https://gitlab.com/bersace/flask-dramatiq"; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index bd594d8b2f8a3..8b7f991f279ba 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -5,28 +5,37 @@ flask, prometheus-client, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "prometheus-flask-exporter"; - version = "0.22.4"; - format = "setuptools"; + version = "0.23.2"; + pyproject = true; src = fetchFromGitHub { owner = "rycus86"; repo = "prometheus_flask_exporter"; - rev = version; - hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8="; + tag = version; + hash = "sha256-fWCIthtBiPJwn/Mbbwdv2+1cr9nlpUsPE2mDkaSsfpM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask prometheus-client ]; nativeCheckInputs = [ pytestCheckHook ]; + enabledTestPaths = [ "tests/" ]; + disabledTests = [ + # AssertionError + "test_group_by_lambda_is_not_supported" + ]; + meta = with lib; { description = "Prometheus exporter for Flask applications"; homepage = "https://github.com/rycus86/prometheus_flask_exporter";