Unverified Commit 514ea593 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #322241 from fabaff/pykakasi-bump

python311Packages.pykakasi: 2.2.1 -> 2.3.0
parents 02b4430d a111f322
Loading
Loading
Loading
Loading
+14 −18
Original line number Diff line number Diff line
@@ -2,43 +2,37 @@
  lib,
  buildPythonPackage,
  deprecated,
  fetchFromGitHub,
  importlib-metadata,
  fetchFromGitea,
  importlib-resources,
  jaconv,
  py-cpuinfo,
  pytest-benchmark,
  pytestCheckHook,
  pythonOlder,
  setuptools,
  setuptools-scm,
}:

buildPythonPackage rec {
  pname = "pykakasi";
  version = "2.2.1";
  version = "2.3.0";
  pyproject = true;

  disabled = pythonOlder "3.6";
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "miurahr";
    repo = "pykakasi";
    rev = "refs/tags/v${version}";
    hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM==";
    hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail ', "klepto"' ""
  '';

  build-system = [ setuptools-scm ];

  dependencies = [
    jaconv
    deprecated
    setuptools
  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
  ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];

  nativeCheckInputs = [
    py-cpuinfo
@@ -51,16 +45,18 @@ buildPythonPackage rec {
    "test_benchmark"
    "pytest_benchmark_update_machine_info"
    "pytest_benchmark_update_json"
    # Assertion error
    "test_aozora"
  ];

  pythonImportsCheck = [ "pykakasi" ];

  meta = with lib; {
    description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman";
    mainProgram = "kakasi";
    homepage = "https://github.com/miurahr/pykakasi";
    changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}";
    license = licenses.mit;
    homepage = "https://codeberg.org/miurahr/pykakasi";
    changelog = "https://codeberg.org/miurahr/pykakasi/src/tag/v${version}/CHANGELOG.rst";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ fab ];
    mainProgram = "kakasi";
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@

buildPythonPackage rec {
  pname = "syncedlyrics";
  version = "0.10.1";
  version = "1.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "rtcq";
    repo = "syncedlyrics";
    rev = "refs/tags/v${version}";
    hash = "sha256-jqd68Npt7qq9aMWO3AVR4JRAs9avO4x9u+MC/brU1Cw=";
    hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk=";
  };

  build-system = [
+26 −28
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@
, ffmpeg
}:

let
  python = python3;
in python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
  pname = "spotdl";
  version = "4.2.5";
  pyproject = true;
@@ -18,40 +16,40 @@ in python.pkgs.buildPythonApplication rec {
    hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI=";
  };

  build-system = with python.pkgs; [
    poetry-core
    pythonRelaxDepsHook
  ];
  build-system = with python3.pkgs; [ poetry-core ];

  nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];

  pythonRelaxDeps = true;

  dependencies = with python.pkgs; [
    spotipy
    ytmusicapi
    pytube
    yt-dlp
    mutagen
    rich
  dependencies = with python3.pkgs; [
    bandcamp-api
    beautifulsoup4
    requests
    rapidfuzz
    python-slugify
    uvicorn
    pydantic
    fastapi
    mutagen
    platformdirs
    pydantic
    pykakasi
    syncedlyrics
    python-slugify
    pytube
    rapidfuzz
    requests
    rich
    setuptools
    soundcloud-v2
    bandcamp-api
    spotipy
    syncedlyrics
    uvicorn
    yt-dlp
    ytmusicapi
  ] ++ python-slugify.optional-dependencies.unidecode;

  nativeCheckInputs = with python.pkgs; [
    pytestCheckHook
    pytest-mock
    pytest-vcr
  nativeCheckInputs = with python3.pkgs; [
    pyfakefs
    pytest-mock
    pytest-subprocess
    pytest-vcr
    pytestCheckHook
  ];

  preCheck = ''
@@ -59,7 +57,7 @@ in python.pkgs.buildPythonApplication rec {
  '';

  disabledTestPaths = [
    # require networking
    # Tests require networking
    "tests/test_init.py"
    "tests/test_matching.py"
    "tests/providers/lyrics"
@@ -71,7 +69,7 @@ in python.pkgs.buildPythonApplication rec {
  ];

  disabledTests = [
    # require networking
    # Test require networking
    "test_convert"
    "test_download_ffmpeg"
    "test_download_song"
@@ -88,10 +86,10 @@ in python.pkgs.buildPythonApplication rec {

  meta = with lib; {
    description = "Download your Spotify playlists and songs along with album art and metadata";
    mainProgram = "spotdl";
    homepage = "https://github.com/spotDL/spotify-downloader";
    changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ dotlambda ];
    mainProgram = "spotdl";
  };
}