diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 4b50ff3e7ea0..a9329c34212d 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -32,9 +32,11 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook ]; - # Can be removed in later versions - # https://gitlab.com/sublime-music/sublime-music/-/issues/343 - pythonRelaxDeps = [ "python-mpv" ]; + # Can be removed in later versions (probably > 0.11.16) + pythonRelaxDeps = [ + "deepdiff" + "python-mpv" + ]; buildInputs = [ gtk3 diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index c0519332342e..368e95c2a1a0 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -8,50 +8,56 @@ , numpy , pytestCheckHook , pyyaml +, toml , pythonOlder }: buildPythonPackage rec { pname = "deepdiff"; - version = "5.8.2"; + version = "6.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = "v${version}"; - hash = "sha256-7eagu6lef5bc/4KU3y067LFOGtH6whda1ocBuRHS/kI="; + rev = "refs/tags/${version}"; + hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; propagatedBuildInputs = [ - click ordered-set ]; + passthru.optional-dependencies = { + cli = [ + clevercsv + click + pyyaml + toml + ]; + }; + + checkInputs = [ + jsonpickle + numpy + pytestCheckHook + ] ++ passthru.optional-dependencies.cli; + pythonImportsCheck = [ "deepdiff" ]; - checkInputs = [ - clevercsv - jsonpickle - numpy - pytestCheckHook - pyyaml - ]; - meta = with lib; { description = "Deep Difference and Search of any Python object/data"; homepage = "https://github.com/seperman/deepdiff"; + changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 5c56150e8f53..e84374e4f744 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/natekspencer/pylitterbot/issues/73 + substituteInPlace pyproject.toml \ + --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' + ''; + pytestFlagsArray = [ "--asyncio-mode=legacy" ];