From d575718cc35456aab00fd6ea25c5f6a1038f9c2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:36:43 +0100 Subject: [PATCH 1/4] python311Packages.datadog: add changelog to meta --- pkgs/development/python-modules/datadog/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 6a258cf73036..af48a042714b 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; + hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; postPatch = '' @@ -60,7 +60,9 @@ buildPythonPackage rec { meta = with lib; { description = "The Datadog Python library"; - license = licenses.bsd3; homepage = "https://github.com/DataDog/datadogpy"; + changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 734f322686694ee0a43ece28954394c3b355ed98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:41:45 +0100 Subject: [PATCH 2/4] python311Packages.datadog: disable on unsupported Python releases --- .../python-modules/datadog/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index af48a042714b..223bdff816a8 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,18 +1,15 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, hatchling -, decorator -, requests -, typing ? null -, configparser , click +, fetchPypi , freezegun +, hatchling , mock -, pytestCheckHook , pytest-vcr +, pytestCheckHook , python-dateutil +, pythonOlder +, requests , vcrpy }: @@ -21,22 +18,20 @@ buildPythonPackage rec { version = "0.44.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; - postPatch = '' - find . -name '*.pyc' -exec rm {} \; - ''; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ decorator requests ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.0") configparser; + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ click @@ -56,7 +51,9 @@ buildPythonPackage rec { "test_default_settings_set" ]; - pythonImportsCheck = [ "datadog" ]; + pythonImportsCheck = [ + "datadog" + ]; meta = with lib; { description = "The Datadog Python library"; From 145d1f379db37559a09870fc1d28537dc0651062 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:52:20 +0100 Subject: [PATCH 3/4] python311Packages.datadog: disable failing tests on Python 3.11 --- pkgs/development/python-modules/datadog/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 223bdff816a8..d3592d76a8f0 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -8,6 +8,7 @@ , pytest-vcr , pytestCheckHook , python-dateutil +, pythonAtLeast , pythonOlder , requests , vcrpy @@ -49,6 +50,9 @@ buildPythonPackage rec { disabledTests = [ "test_default_settings_set" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/DataDog/datadogpy/issues/746 + "TestDogshell" ]; pythonImportsCheck = [ From d6dd12a2c95d2865e78e34ec447400b55abc9407 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 18:42:45 +0100 Subject: [PATCH 4/4] python311Packages.gradient_statsd: add missing inputs - use nixpkgs-fmt - disable on unsupported Python releases - normalize pname --- .../gradient_statsd/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index e4d7127236e0..d7c5c258ab5e 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,39 +1,51 @@ { lib -, fetchPypi , buildPythonPackage +, certifi , chardet -, configparser , datadog +, decorator +, fetchPypi +, idna , requests -, python +, urllib3 +, pythonOlder }: buildPythonPackage rec { - pname = "gradient_statsd"; + pname = "gradient-statsd"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; + pname = "gradient_statsd"; + inherit version; + hash = "sha256-iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; }; propagatedBuildInputs = [ + certifi chardet datadog + decorator + idna requests - ] - ++ lib.optional python.isPy2 configparser; + urllib3 + ]; - pythonImportsCheck = [ "gradient_statsd" ]; + pythonImportsCheck = [ + "gradient_statsd" + ]; # Pypi does not contain tests doCheck = false; meta = with lib; { description = "Wrapper around the DogStatsd client"; - homepage = "https://paperspace.com"; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://paperspace.com"; + license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.unix; }; }