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" ]; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/python-digitalocean/default.nix similarity index 50% rename from pkgs/development/python-modules/digitalocean/default.nix rename to pkgs/development/python-modules/python-digitalocean/default.nix index 3d756312deda..c0ab09542d95 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/python-digitalocean/default.nix @@ -1,39 +1,39 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPy3k -, jsonpickle -, mock -, pytest -, pytestCheckHook -, requests -, responses +{ + lib, + buildPythonPackage, + fetchFromGitHub, + jsonpickle, + 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 = '' @@ -41,14 +41,18 @@ buildPythonPackage rec { ''; # Test tries to access the network - disabledTests = ["TestFirewall"]; + disabledTests = [ "TestFirewall" ]; pythonImportsCheck = [ "digitalocean" ]; 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 ]; + maintainers = with maintainers; [ + kiwi + teh + ]; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 57b4b921de41..33b56ccb134a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -949,7 +949,7 @@ "digital_loggers" = ps: with ps; [ ]; "digital_ocean" = ps: with ps; [ - digital-ocean + python-digitalocean ]; "directv" = ps: with ps; [ directv diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00573f5cc226..40351281d5c5 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 ffe32b232cd1..2e41466ecbd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2973,8 +2973,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 { };