From 286a5af4598b0f2c389bacdb1518c266603d9a68 Mon Sep 17 00:00:00 2001 From: marius david Date: Mon, 7 Nov 2022 13:39:32 +0100 Subject: [PATCH] python3Packages.skytemple-files: 1.3.9 -> 1.4.7 --- .../skytemple-files/default.nix | 64 +++++++++++++++++-- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 226cc5295e7f..b850f694dcf8 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,16 +1,40 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript -, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, dungeon-eos +, explorerscript +, ndspy +, pillow +, setuptools +, skytemple-rust +, tilequant +, pyyaml +, pmdsky-debug-py +, typing-extensions +, pythonOlder +, # optional dependancies for SpriteCollab + aiohttp +, lru-dict +, graphql-core +, gql +, armips +# tests +, pytestCheckHook +, parameterized +, xmldiff }: buildPythonPackage rec { pname = "skytemple-files"; - version = "1.3.9"; + version = "1.4.7"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0="; + hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; fetchSubmodules = true; }; @@ -21,9 +45,37 @@ buildPythonPackage rec { buildInputs = [ armips ]; - propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; + propagatedBuildInputs = [ + appdirs + dungeon-eos + explorerscript + ndspy + pillow + setuptools + skytemple-rust + tilequant + pyyaml + pmdsky-debug-py + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + spritecollab = [ + aiohttp + gql + graphql-core + lru-dict + ] ++ gql.optional-dependencies.aiohttp; + }; + + checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab; + pytestFlagsArray = "test/"; + disabledTestPaths = [ + "test/skytemple_files_test/common/spritecollab/sc_online_test.py" + "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test + ]; - doCheck = false; # requires Pokémon Mystery Dungeon ROM pythonImportsCheck = [ "skytemple_files" ]; meta = with lib; {