From 1a44a1ccd501c865e28dfbbdf03a5d20ad48cdcc Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 11 Oct 2023 12:27:50 +0900 Subject: [PATCH 1/2] python311Packages.pysmartdl: rename from pySmartDL --- pkgs/applications/video/anime-downloader/default.nix | 2 +- .../python-modules/{pySmartDL => pysmartdl}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pySmartDL => pysmartdl}/default.nix (96%) diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix index 04833eb4e82a..235c5c58f381 100644 --- a/pkgs/applications/video/anime-downloader/default.nix +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { fuzzywuzzy jsbeautifier pycryptodome - pySmartDL + pysmartdl pyqt5 requests requests-cache diff --git a/pkgs/development/python-modules/pySmartDL/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix similarity index 96% rename from pkgs/development/python-modules/pySmartDL/default.nix rename to pkgs/development/python-modules/pysmartdl/default.nix index cfad2238fbd0..f192f1cdd8fa 100644 --- a/pkgs/development/python-modules/pySmartDL/default.nix +++ b/pkgs/development/python-modules/pysmartdl/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - pname = "pySmartDL"; + pname = "pysmartdl"; version = "1.3.4"; src = fetchFromGitHub ({ owner = "iTaybb"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a791b8ccd86c..2e3c7cacffeb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -305,6 +305,7 @@ mapAliases ({ pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysmart-smartx = pysmart; # added 2021-10-22 + pySmartDL = pysmartdl; # added 2023-10-11 pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 PyStemmer = pystemmer; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e845f54927d..7f0e4f89ceec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10860,7 +10860,7 @@ self: super: with self; { pysmartapp = callPackage ../development/python-modules/pysmartapp { }; - pySmartDL = callPackage ../development/python-modules/pySmartDL { }; + pysmartdl = callPackage ../development/python-modules/pysmartdl { }; pysmartthings = callPackage ../development/python-modules/pysmartthings { }; From ba4578ecd4bd73ae746b53feff3d03c042ef7c01 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 11 Oct 2023 12:35:10 +0900 Subject: [PATCH 2/2] python311Packages.pysmartdl: refactor --- .../python-modules/pysmartdl/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pysmartdl/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix index f192f1cdd8fa..b5c052bdfaa7 100644 --- a/pkgs/development/python-modules/pysmartdl/default.nix +++ b/pkgs/development/python-modules/pysmartdl/default.nix @@ -1,25 +1,53 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools +, pytestCheckHook }: buildPythonPackage rec { pname = "pysmartdl"; version = "1.3.4"; - src = fetchFromGitHub ({ - owner = "iTaybb"; - repo = pname; - rev = "b93df794e1e60017c42d9520ac097b6fd38c2e8b"; - hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; - }); + pyproject = true; - doCheck = false; + src = fetchFromGitHub { + owner = "iTaybb"; + repo = "pySmartDL"; + rev = "refs/tags/v${version}"; + hash = "sha256-Etyv3xCB1cGozWDsskygwcTHJfC+V5hvqBNQAF8SIMM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # touch the network + "test_basic_auth" + "test_custom_headers" + "test_download" + "test_hash" + "test_mirrors" + "test_pause_unpause" + "test_speed_limiting" + "test_stop" + "test_timeout" + "test_unicode" + ]; + + pythonImportsCheck = [ + "pySmartDL" + ]; meta = with lib; { homepage = "https://github.com/iTaybb/pySmartDL"; description = "A Smart Download Manager for Python"; + changelog = "https://github.com/iTaybb/pySmartDL/blob/${src.rev}/ChangeLog.txt"; license = licenses.unlicense; - platforms = platforms.linux; maintainers = with maintainers; [ ]; }; }