Commit fd759d7a authored by Doron Behar's avatar Doron Behar
Browse files

python3.pkgs.beets: 2.5.1 -> 2.6.1

parent 482a2831
Loading
Loading
Loading
Loading
+0 −45
Original line number Diff line number Diff line
diff --git i/beets/ui/commands.py w/beets/ui/commands.py
index ad4f7821..5077191d 100755
--- i/beets/ui/commands.py
+++ w/beets/ui/commands.py
@@ -2381,22 +2381,6 @@ default_commands.append(config_cmd)
 def print_completion(*args):
     for line in completion_script(default_commands + plugins.commands()):
         print_(line, end="")
-    if not any(os.path.isfile(syspath(p)) for p in BASH_COMPLETION_PATHS):
-        log.warning(
-            "Warning: Unable to find the bash-completion package. "
-            "Command line completion might not work."
-        )
-
-
-BASH_COMPLETION_PATHS = [
-    b"/etc/bash_completion",
-    b"/usr/share/bash-completion/bash_completion",
-    b"/usr/local/share/bash-completion/bash_completion",
-    # SmartOS
-    b"/opt/local/share/bash-completion/bash_completion",
-    # Homebrew (before bash-completion2)
-    b"/usr/local/etc/bash_completion",
-]
 
 
 def completion_script(commands):
diff --git i/test/test_ui.py w/test/test_ui.py
index cae86148..faf266a8 100644
--- i/test/test_ui.py
+++ w/test/test_ui.py
@@ -1434,12 +1434,7 @@ class CompletionTest(_common.TestCase, TestHelper):
         )
 
         # Load bash_completion library.
-        for path in commands.BASH_COMPLETION_PATHS:
-            if os.path.exists(syspath(path)):
-                bash_completion = path
-                break
-        else:
-            self.skipTest("bash-completion script not found")
+        self.skipTest("bash-completion script not found")
         try:
             with open(util.syspath(bash_completion), "rb") as f:
                 tester.stdin.writelines(f)
+26 −26
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@
  buildPythonPackage,
  pythonAtLeast,
  fetchFromGitHub,
  fetchpatch,

  # build-system
  poetry-core,
@@ -41,10 +42,12 @@
  mediafile,
  munkres,
  musicbrainzngs,
  packaging,
  platformdirs,
  pyyaml,
  unidecode,
  reflink,
  requests-ratelimiter,
  typing-extensions,
  lap,

@@ -53,6 +56,7 @@
  sphinxHook,
  sphinx-design,
  sphinx-copybutton,
  sphinx-toolbox,
  pydata-sphinx-theme,

  # buildInputs
@@ -80,6 +84,7 @@
  requests,
  requests-oauthlib,
  resampy,
  titlecase,
  soco,

  # configurations
@@ -92,11 +97,13 @@
  # tests
  pytestCheckHook,
  pytest-cov-stub,
  pytest-flask,
  mock,
  rarfile,
  responses,
  requests-mock,
  pillow,
  tomli,
  writableTmpDirAsHomeHook,

  # preCheck
@@ -112,20 +119,26 @@

buildPythonPackage (finalAttrs: {
  pname = "beets";
  version = "2.5.1";
  version = "2.6.1";
  src = fetchFromGitHub {
    owner = "beetbox";
    repo = "beets";
    tag = "v${finalAttrs.version}";
    hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA=";
    hash = "sha256-TJFno1Hm3swG0qNDjWcVG0YE6zoRTumKqmEyrFGDh7Q=";
  };
  pyproject = true;
  # Waiting for https://github.com/beetbox/beets/pull/6267
  disabled = pythonAtLeast "3.14";

  patches = [
    # Bash completion fix for Nix
    ./bash-completion-always-print.patch
    # Fixes https://github.com/beetbox/beets/issues/6335
    (fetchpatch {
      url = "https://github.com/beetbox/beets/commit/07d3e05a9113668d94a1ab3604ee42e76c641b07.patch";
      excludes = [
        "docs/changelog.rst"
      ];
      hash = "sha256-+OJLGeByTIuUL0XpneHU5Jzxiq8FSujPPT5Oha0IJEA=";
    })
  ]
  ++ extraPatches;

@@ -141,6 +154,7 @@ buildPythonPackage (finalAttrs: {
    mediafile
    munkres
    musicbrainzngs
    packaging
    platformdirs
    pyyaml
    unidecode
@@ -148,6 +162,7 @@ buildPythonPackage (finalAttrs: {
    # add too much to the closure. See:
    # https://github.com/NixOS/nixpkgs/issues/437308
    reflink
    requests-ratelimiter
    typing-extensions
    lap
  ]
@@ -160,6 +175,7 @@ buildPythonPackage (finalAttrs: {
    sphinxHook
    sphinx-design
    sphinx-copybutton
    sphinx-toolbox
    pydata-sphinx-theme
  ]
  ++ extraNativeBuildInputs;
@@ -200,11 +216,13 @@ buildPythonPackage (finalAttrs: {
  nativeCheckInputs = [
    pytestCheckHook
    pytest-cov-stub
    pytest-flask
    mock
    rarfile
    responses
    requests-mock
    pillow
    tomli
    writableTmpDirAsHomeHook
  ]
  ++ finalAttrs.finalPackage.passthru.plugins.wrapperBins;
@@ -213,30 +231,12 @@ buildPythonPackage (finalAttrs: {

  disabledTestPaths =
    finalAttrs.finalPackage.passthru.plugins.disabledTestPaths
    ++ [
      # touches network
      "test/plugins/test_aura.py"
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # Flaky: several tests fail randomly with:
      # if not self._poll(timeout):
      #   raise Empty
      #   _queue.Empty
      "test/plugins/test_bpd.py"
    ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
    ];
  disabledTests = extraDisabledTests ++ [
    # touches network
@@ -349,11 +349,11 @@ buildPythonPackage (finalAttrs: {
        fromfilename.testPaths = [ ];
        ftintitle = { };
        fuzzy.testPaths = [ ];
        gmusic.testPaths = [ ];
        hook = { };
        ihate = { };
        importadded = { };
        importfeeds = { };
        importsource = { };
        info = { };
        inline.testPaths = [ ];
        ipfs = { };
@@ -368,9 +368,7 @@ buildPythonPackage (finalAttrs: {
          testPaths = [ ];
        };
        limit = { };
        listenbrainz = {
          testPaths = [ ];
        };
        listenbrainz = { };
        loadext = {
          propagatedBuildInputs = [ requests ];
          testPaths = [ ];
@@ -383,6 +381,7 @@ buildPythonPackage (finalAttrs: {
        mbcollection.testPaths = [ ];
        mbsubmit = { };
        mbsync = { };
        mbpseudo = { };
        metasync.testPaths = [ ];
        missing.testPaths = [ ];
        mpdstats.propagatedBuildInputs = [ mpd2 ];
@@ -420,6 +419,7 @@ buildPythonPackage (finalAttrs: {
          testPaths = [ ];
        };
        the = { };
        titlecase.propagatedBuildInputs = [ titlecase ];
        thumbnails = {
          propagatedBuildInputs = [
            pillow