From 7fd404603e3b7d4cdac2f91e3b43c0200e39ef20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 18:34:31 +0200 Subject: [PATCH 1/5] python312Packages.digital-ocean: refactor --- .../python-modules/digitalocean/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 3d756312deda..6f8f38fe959c 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,39 +1,40 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , jsonpickle -, mock -, pytest , pytestCheckHook +, pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "python-digitalocean"; version = "1.17.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "koalalorenzo"; - repo = pname; - rev = "v${version}"; - sha256 = "1c50ka4y712rr551gq3kdfw7fgfxr4w837sww6yy683yz7m1d1h8"; + repo = "python-digitalocean"; + rev = "refs/tags/v${version}"; + hash = "sha256-CIYW6vl+IOO94VyfgTjJ3T13uGtz4BdKyVmE44maoLA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ jsonpickle requests ]; - dontUseSetuptoolsCheck = true; - nativeCheckInputs = [ - pytest pytestCheckHook responses - ] ++ lib.optionals (!isPy3k) [ - mock ]; preCheck = '' @@ -48,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API to manage Digital Ocean Droplets and Images"; homepage = "https://github.com/koalalorenzo/python-digitalocean"; + changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}"; license = with licenses; [ lgpl3Only ]; maintainers = with maintainers; [ kiwi teh ]; }; From b416c3227cd05f9a9963b73a6b3f3c2f19926959 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 18:35:52 +0200 Subject: [PATCH 2/5] python312Packages.digital-ocean: format with nixfmt --- .../python-modules/digitalocean/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 6f8f38fe959c..c0ab09542d95 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, jsonpickle -, pytestCheckHook -, pythonOlder -, requests -, responses -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + jsonpickle, + pytestCheckHook, + pythonOlder, + requests, + responses, + setuptools, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-CIYW6vl+IOO94VyfgTjJ3T13uGtz4BdKyVmE44maoLA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ jsonpickle @@ -42,7 +41,7 @@ buildPythonPackage rec { ''; # Test tries to access the network - disabledTests = ["TestFirewall"]; + disabledTests = [ "TestFirewall" ]; pythonImportsCheck = [ "digitalocean" ]; @@ -51,6 +50,9 @@ buildPythonPackage rec { homepage = "https://github.com/koalalorenzo/python-digitalocean"; changelog = "https://github.com/koalalorenzo/python-digitalocean/releases/tag/v${version}"; license = with licenses; [ lgpl3Only ]; - maintainers = with maintainers; [ kiwi teh ]; + maintainers = with maintainers; [ + kiwi + teh + ]; }; } From 82dfc5fa5fa72b3e620bb7eb307c6e557cd1fac6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 21:33:36 +0200 Subject: [PATCH 3/5] python312Packages.python-digitalocean: rename from digital-ocean --- .../{digitalocean => python-digitalocean}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{digitalocean => python-digitalocean}/default.nix (100%) diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix similarity index 100% rename from pkgs/development/python-modules/digitalocean/default.nix rename to pkgs/development/python-modules/python-digitalocean/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d6f6e358a7b9..4a7557681409 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -106,6 +106,7 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 distutils_extra = distutils-extra; # added 2023-10-12 + digital-ocean = python-digitalocean; # addad 2024-04-12 djangorestframework-jwt = drf-jwt; # added 2021-07-20 django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9a6001945e9..e1b2ce55eb8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2971,8 +2971,6 @@ self: super: with self; { diffusers = callPackage ../development/python-modules/diffusers { }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; - digi-xbee = callPackage ../development/python-modules/digi-xbee { }; dill = callPackage ../development/python-modules/dill { }; @@ -12195,6 +12193,8 @@ self: super: with self; { python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + python-digitalocean = callPackage ../development/python-modules/python-digitalocean { }; + python-docx = callPackage ../development/python-modules/python-docx { }; python-doi = callPackage ../development/python-modules/python-doi { }; From d744c7d85a699e28d7cca4c3f3aba4b91800560c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 21:00:30 +0200 Subject: [PATCH 4/5] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4db1bebad17c..2fabc1c07e9d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -948,7 +948,7 @@ "digital_loggers" = ps: with ps; [ ]; "digital_ocean" = ps: with ps; [ - digital-ocean + python-digitalocean ]; "directv" = ps: with ps; [ directv From 91787e50c18badc93c55b929f2791480766ecb96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 21:38:04 +0200 Subject: [PATCH 5/5] nixops-digitalocean: rename python-digitalocean --- .../cluster/nixops/plugins/nixops-digitalocean.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index e35b4cd07f38..f3f62e940729 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -4,7 +4,8 @@ , unstableGitUpdater , poetry-core , nixops -, digital-ocean +, python-digitalocean +, pythonOlder }: buildPythonPackage { @@ -12,6 +13,8 @@ buildPythonPackage { version = "unstable-2022-08-14"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "nix-community"; repo = "nixops-digitalocean"; @@ -34,7 +37,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - digital-ocean + python-digitalocean ]; pythonImportsCheck = [ "nixops_digitalocean" ];