diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 10f150a3ccb6..f247edf6e2aa 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -1,6 +1,8 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -15,10 +17,16 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools + patches = [ + # updates for python 3.12 (not currently included in a release) + (fetchpatch { + url = "https://github.com/smacke/ffsubsync/commit/de75bdbfe846b3376f8c0bcfe2e5e5db82d7ff20.patch"; + hash = "sha256-JN7F9H9G8HK2aLOlm/Ec+GsWnU+65f1P658nq8FbAjo="; + }) ]; + nativeBuildInputs = with python3.pkgs; [ setuptools ]; + propagatedBuildInputs = with python3.pkgs; [ auditok charset-normalizer @@ -36,13 +44,9 @@ python3.pkgs.buildPythonApplication rec { webrtcvad ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ - "ffsubsync" - ]; + pythonImportsCheck = [ "ffsubsync" ]; meta = with lib; { homepage = "https://github.com/smacke/ffsubsync"; diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index 47c2abb01ed2..5d969858c00f 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -2,24 +2,27 @@ lib, fetchPypi, buildPythonPackage, + setuptools, }: buildPythonPackage rec { pname = "enzyme"; - version = "0.4.1"; - format = "setuptools"; + version = "0.5.2"; + pyproject = true; # Tests rely on files obtained over the network doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; + hash = "sha256-fPd5FI2eZusoOGA+rOFAxTw878i4/l1NWgOl+11Xs8E="; }; + nativeBuildInputs = [ setuptools ]; + meta = with lib; { homepage = "https://github.com/Diaoul/enzyme"; - license = licenses.asl20; + license = licenses.mit; description = "Python video metadata parser"; }; } diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index 71fbf56b77c2..e03a87fffda0 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pysubs2"; - version = "1.6.1"; + version = "1.7.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tkarabela"; repo = pname; rev = version; - hash = "sha256-0bW9aB6ERRQK3psqeU0Siyi/8drEGisAp8UtTfOKlp0="; + hash = "sha256-PrpN+w/gCi7S9OmD6kbbvL9VlZEfy1DbehFTwjxsibA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index d34a49f46ff1..23347af0ff45 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,95 +1,89 @@ { lib, - appdirs, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + babelfish, beautifulsoup4, - buildPythonPackage, chardet, click, + click-option-group, dogpile-cache, enzyme, - fetchFromGitHub, guessit, - pysrt, - pytestCheckHook, - pythonOlder, - pytz, + srt, + pysubs2, rarfile, requests, - six, + platformdirs, stevedore, + tomli, + + pytestCheckHook, + pytest-cov, + pytest-xdist, + mypy, sympy, vcrpy, }: buildPythonPackage rec { pname = "subliminal"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Diaoul"; - repo = pname; + repo = "subliminal"; rev = "refs/tags/${version}"; - hash = "sha256-P4gVxKKCGKS3MC4F3yTAaOSv36TtdoYfrf61tBHg8VY="; + hash = "sha256-g7gg2qdLKl7bg/nNXRWN9wZaNShOOc38sVASZrIycMU="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --pep8 --flakes" "" - ''; - propagatedBuildInputs = [ - appdirs babelfish beautifulsoup4 chardet click + click-option-group dogpile-cache enzyme guessit - pysrt - pytz + srt + pysubs2 rarfile requests - six + platformdirs stevedore + tomli ]; nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-xdist + mypy sympy vcrpy - pytestCheckHook ]; pythonImportsCheck = [ "subliminal" ]; disabledTests = [ - # Tests rewuire network access - "test_refine_video_metadata" + # Tests require network access + "test_refine" "test_scan" "test_hash" - "test_provider_pool_list_subtitles" - "test_async_provider_pool_list_subtitles" - "test_list_subtitles" - "test_download_bad_subtitle" - # Not implemented - "test_save_subtitles" ]; - disabledTestPaths = [ - # AttributeError: module 'rarfile' has no attribute 'custom_check' - "tests/test_legendastv.py" - ]; - - meta = with lib; { + meta = { description = "Python library to search and download subtitles"; homepage = "https://github.com/Diaoul/subliminal"; changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; # Too many tests fail ever since a certain python-updates merge, see: # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests # alltogether may produce a not completly failing executable, but that